diff --git a/configuration.nix b/configuration.nix
index 9f056e0..42dd429 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -6,14 +6,15 @@
       ./hardware-configuration.nix
     ];
 
-  boot.loader.grub.enable = true;
-  boot.loader.grub.device = "/dev/sda";
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
 
   nix.settings.experimental-features = ["nix-command" "flakes" ];
 
   networking.hostName = "nixos"; # Define your hostname.
 
   users.users.yadunut = {
+    shell = pkgs.zsh;
     isNormalUser = true;
     extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
     packages = with pkgs; [
@@ -34,9 +35,12 @@
   age.secrets.tailscale.file = ./secrets/tailscale.age;
 
 
+  programs.zsh.enable = true;
   # List services that you want to enable:
 
   # Enable the OpenSSH daemon.
+
+  services.qemuGuest.enable = true;
   services.openssh.enable = true;
   services.tailscale = {
     enable = true;
diff --git a/hardware-configuration.nix b/hardware-configuration.nix
index 8c470b9..ab4b411 100644
--- a/hardware-configuration.nix
+++ b/hardware-configuration.nix
@@ -8,18 +8,23 @@
     [ (modulesPath + "/profiles/qemu-guest.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
+  boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/9b9bda9c-372d-426d-9ad9-6fa9e54962cf";
+    { device = "/dev/disk/by-uuid/12b222f4-bd4b-4f52-9402-c99057a39382";
       fsType = "ext4";
     };
 
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/0625-632C";
+      fsType = "vfat";
+    };
+
   swapDevices =
-    [ { device = "/dev/disk/by-uuid/b759bc68-44db-46f1-9fa6-6580d0cf9243"; }
+    [ { device = "/dev/disk/by-uuid/d56b2565-66f8-4f22-a078-8b0e4c9bb019"; }
     ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
@@ -27,7 +32,7 @@
   # still possible to use this option, but it's recommended to use it in conjunction
   # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.ens18.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp6s18.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
 }
diff --git a/home.nix b/home.nix
index 787e526..702f32c 100644
--- a/home.nix
+++ b/home.nix
@@ -7,8 +7,25 @@
   ripgrep
   ];
 
+  programs.zsh.enable = true;
+  programs.zoxide.enable = true;
+  programs.zoxide.enableZshIntegration = true;
   programs.starship.enable = true;
   programs.home-manager.enable = true;
+  programs.lazygit.enable = true;
+
+  programs.git = {
+    enable = true;
+    userName = "Yadunand Prem";
+    userEmail = "yadunand@yadunut.com";
+    delta.enable = true;
+    lfs.enable = true;
+    extraConfig = {
+      commit.gpgsign = true;
+      gpg.format = "ssh";
+      user.signingkey = "~/.ssh/id_ed25519.pub";
+    };
+  };
 
   home.stateVersion = "23.11";
 }
diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index aaef073..c59ef09 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -1,5 +1,5 @@
 let 
-  system1 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDmQbdvFi1p8L5urBigTMuyD9yW0UbAPVKGzz2apANlc root@nixos";
+  system1 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJHMBVrt8ORitBVmkDSf78zli0M2+ggQtdnPEywqaaKA root@nixos";
   systems = [ system1 ];
 in
 {
diff --git a/secrets/tailscale.age b/secrets/tailscale.age
index 9db5970..883805c 100644
--- a/secrets/tailscale.age
+++ b/secrets/tailscale.age
@@ -1,6 +1,6 @@
 age-encryption.org/v1
--> ssh-ed25519 wA3DxQ pH3kp+eYDfsbTO2lak1nzQgPfRW+QBGZi5PspFmITUg
-qA12EUb5CH1o1mLEwm9IB6b0ClWIVYdbUIjR94JiJJ0
---- /gpZXEr0EYb0NujegrjHBfVuXezwAkD9D8t1YzmmO3Y
-@�d�F�q���E��9,�GD�a��=��:�Sg����%�I�R<�)��G��
-��q�
���/|�_�0�2��yJ�C(�
\ No newline at end of file
+-> ssh-ed25519 nJwr4w a0KnyPjtuDKbefPQEYsV2Bc30wPC5BEtaXDHLkpRB0s
+zAfZwlNfvV7uQfyFDrTHZQSf3veDp51Lh2jq1Epymco
+--- O+U3STvylpUOMwoQpq2xL+OmAKoslnAYvA9aHSi/4DU
+�.��:�f8�A��rk{���L�O��tM����S�/���T�Ͼ~I��/��s��$��/\�j
+
ݼ!D 9�
��
\ No newline at end of file