diff --git a/home.nix b/home.nix
index 80919ab..21e8469 100644
--- a/home.nix
+++ b/home.nix
@@ -3,7 +3,7 @@
 {
   home.username = "l-wyatt";
   home.homeDirectory = "/home/l-wyatt";
-  home.stateVersion = "25.05"; # Don't change after first setup
+  home.stateVersion = "25.11"; # Don't change after first setup
 
   # Packages for this user
   home.packages = with pkgs; [
@@ -18,6 +18,9 @@
     freerdp  
     bitwarden-desktop
     bitwarden-cli
+    lunarvim
+    minicom
+    kicad
   ];
 
   # --------------------------
@@ -27,6 +30,10 @@
   wayland.windowManager.hyprland = {
     enable = true;
     settings = {
+
+      exec-once = [
+        "hyprpaper"
+      ];
       "$mod" = "SUPER";
       bind = [
         "$mod, Q, exec, konsole"
@@ -49,26 +56,20 @@
     '';
     force = true;
   };
- # Run hyprpaper to set wallpaper
-  wayland.windowManager.hyprland.settings = {
-    exec-once = [
-      "hyprpaper"
-    ];
-  };
 
 
   # Enable Zsh and configure it
-  home.file.".zshrc".force = true;
   programs.zsh = {
     enable = true;
     oh-my-zsh.enable = true;
     oh-my-zsh.theme = "agnoster";
     initContent = ''
+      export SHELL=$(which zsh)
       alias nix-shell='nix-shell --run $SHELL'
       nix() {
         if [[ $1 == "develop" ]]; then
           shift
-            command nix develop -c $SHELL "$@"
+            command nix develop "$@" -c $SHELL
           else
             command nix "$@"
         fi
@@ -87,11 +88,14 @@
   # Manage your git configuration declaratively
   programs.git = {
     enable = true;
-    userName = "0xWheatyz";
-    userEmail = "wyatt@leeworks.dev";
-    extraConfig = {
+    settings = {
+      user = {
+        name = "0xWheatyz";
+        email = "wyatt@leeworks.dev";
+      };
       init.defaultBranch = "master";
       push.autoSetupRemote = "true";
+      alias.lg = "log --graph --pretty=format:'%C(yellow)%h%Creset -%C(red)%d%Creset %s %Cgreen(%cr)%Creset %C(bold blue)<%an>%Creset' --abbrev-commit";
     };
   };
   
@@ -134,8 +138,14 @@
 
   programs.ssh = {
     enable = true;
+    enableDefaultConfig = false;
     matchBlocks = {
-      "vps" = {
+      "*" = {
+        controlMaster = "auto";
+        controlPersist = "1m";
+        controlPath = "~/.ssh/cm-%r@%h:%p";
+      };
+       "vps" = {
         hostname = "45.79.198.105";
         user = "wyatt";
         port = 22;
@@ -152,6 +162,7 @@
         hostname = "10.0.0.20";
         port = 22;
         user = "l-wyatt";
+        proxyJump = "_JumpHost";
       };
       "git" = {
         hostname = "10.0.0.9";
@@ -167,9 +178,6 @@
 #        ControlPath /tmp/cm-%r@%h:%p
 #      '';
 
-  controlMaster = "auto";
-  controlPersist = "1m";
-  controlPath = "~/.ssh/cm-%r@%h:%p";
   };
 
 }