diff --git a/dotfiles/flake.lock b/dotfiles/flake.lock
index da533233..8fe3fd9a 100644
--- a/dotfiles/flake.lock
+++ b/dotfiles/flake.lock
@@ -147,7 +147,43 @@
         "type": "github"
       }
     },
+    "deploy-rs": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "nixpkgs": "nixpkgs",
+        "utils": "utils"
+      },
+      "locked": {
+        "lastModified": 1727447169,
+        "narHash": "sha256-3KyjMPUKHkiWhwR91J1YchF6zb6gvckCAY1jOE+ne0U=",
+        "owner": "serokell",
+        "repo": "deploy-rs",
+        "rev": "aa07eb05537d4cd025e2310397a6adcedfe72c76",
+        "type": "github"
+      },
+      "original": {
+        "owner": "serokell",
+        "repo": "deploy-rs",
+        "type": "github"
+      }
+    },
     "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_2": {
       "locked": {
         "lastModified": 1696426674,
         "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
@@ -161,7 +197,7 @@
         "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
       }
     },
-    "flake-compat_2": {
+    "flake-compat_3": {
       "flake": false,
       "locked": {
         "lastModified": 1650374568,
@@ -177,7 +213,7 @@
         "type": "github"
       }
     },
-    "flake-compat_3": {
+    "flake-compat_4": {
       "flake": false,
       "locked": {
         "lastModified": 1673956053,
@@ -194,15 +230,12 @@
       }
     },
     "flake-utils": {
-      "inputs": {
-        "systems": "systems_2"
-      },
       "locked": {
-        "lastModified": 1694529238,
-        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+        "lastModified": 1659877975,
+        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
         "type": "github"
       },
       "original": {
@@ -213,7 +246,7 @@
     },
     "flake-utils-plus": {
       "inputs": {
-        "flake-utils": "flake-utils"
+        "flake-utils": "flake-utils_2"
       },
       "locked": {
         "lastModified": 1696331477,
@@ -230,6 +263,24 @@
       }
     },
     "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_3"
+      },
+      "locked": {
+        "lastModified": 1694529238,
+        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_3": {
       "inputs": {
         "systems": [
           "stylix",
@@ -364,7 +415,7 @@
         "nixpkgs": [
           "nixpkgs-unstable"
         ],
-        "systems": "systems",
+        "systems": "systems_2",
         "xdph": "xdph"
       },
       "locked": {
@@ -502,9 +553,28 @@
         "type": "github"
       }
     },
+    "nixgl": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "lastModified": 1713543440,
+        "narHash": "sha256-lnzZQYG0+EXl/6NkGpyIz+FEOc/DSEG57AP1VsdeNrM=",
+        "owner": "nix-community",
+        "repo": "nixGL",
+        "rev": "310f8e49a149e4c9ea52f1adf70cdc768ec53f8a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixGL",
+        "type": "github"
+      }
+    },
     "nixos-conf-editor": {
       "inputs": {
-        "flake-compat": "flake-compat",
+        "flake-compat": "flake-compat_2",
         "nixpkgs": [
           "nixpkgs"
         ],
@@ -526,16 +596,32 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1726320982,
-        "narHash": "sha256-RuVXUwcYwaUeks6h3OLrEmg14z9aFXdWppTWPMTwdQw=",
+        "lastModified": 1702272962,
+        "narHash": "sha256-D+zHwkwPc6oYQ4G3A1HuadopqRwUY/JkMwHz1YF7j4Q=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8f7492cce28977fbf8bd12c72af08b1f6c7c3e49",
+        "rev": "e97b3e4186bcadf0ef1b6be22b8558eab1cdeb5d",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-24.05",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-stable": {
+      "locked": {
+        "lastModified": 1729973466,
+        "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "release-24.05",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -556,6 +642,37 @@
         "type": "github"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1660551188,
+        "narHash": "sha256-a1LARMMYQ8DPx1BgoI/UN4bXe12hhZkCNqdxNi6uS0g=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "441dc5d512153039f19ef198e662e4f3dbb9fd65",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1726320982,
+        "narHash": "sha256-RuVXUwcYwaUeks6h3OLrEmg14z9aFXdWppTWPMTwdQw=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "8f7492cce28977fbf8bd12c72af08b1f6c7c3e49",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-24.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "plasma-manager": {
       "inputs": {
         "home-manager": [
@@ -581,19 +698,22 @@
     },
     "root": {
       "inputs": {
+        "deploy-rs": "deploy-rs",
         "home-manager": "home-manager",
         "hyprland": "hyprland",
         "nix-flatpak": "nix-flatpak",
+        "nixgl": "nixgl",
         "nixos-conf-editor": "nixos-conf-editor",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_3",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "plasma-manager": "plasma-manager",
+        "sops-nix": "sops-nix",
         "stylix": "stylix"
       }
     },
     "snowfall-lib": {
       "inputs": {
-        "flake-compat": "flake-compat_2",
+        "flake-compat": "flake-compat_3",
         "flake-utils-plus": "flake-utils-plus",
         "nixpkgs": [
           "nixos-conf-editor",
@@ -614,6 +734,27 @@
         "type": "github"
       }
     },
+    "sops-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": "nixpkgs-stable"
+      },
+      "locked": {
+        "lastModified": 1729999681,
+        "narHash": "sha256-qm0uCtM9bg97LeJTKQ8dqV/FvqRN+ompyW4GIJruLuw=",
+        "owner": "Mic92",
+        "repo": "sops-nix",
+        "rev": "1666d16426abe79af5c47b7c0efa82fd31bf4c56",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Mic92",
+        "repo": "sops-nix",
+        "type": "github"
+      }
+    },
     "stylix": {
       "inputs": {
         "base16": "base16",
@@ -623,14 +764,14 @@
         "base16-kitty": "base16-kitty",
         "base16-tmux": "base16-tmux",
         "base16-vim": "base16-vim",
-        "flake-compat": "flake-compat_3",
-        "flake-utils": "flake-utils_2",
+        "flake-compat": "flake-compat_4",
+        "flake-utils": "flake-utils_3",
         "gnome-shell": "gnome-shell",
         "home-manager": "home-manager_2",
         "nixpkgs": [
           "nixpkgs"
         ],
-        "systems": "systems_3"
+        "systems": "systems_4"
       },
       "locked": {
         "lastModified": 1726170940,
@@ -647,21 +788,6 @@
       }
     },
     "systems": {
-      "locked": {
-        "lastModified": 1689347949,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "type": "github"
-      }
-    },
-    "systems_2": {
       "locked": {
         "lastModified": 1681028828,
         "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -676,6 +802,21 @@
         "type": "github"
       }
     },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1689347949,
+        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "type": "github"
+      }
+    },
     "systems_3": {
       "locked": {
         "lastModified": 1681028828,
@@ -691,6 +832,39 @@
         "type": "github"
       }
     },
+    "systems_4": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1701680307,
+        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "xdph": {
       "inputs": {
         "hyprland-protocols": "hyprland-protocols",
diff --git a/dotfiles/flake.nix b/dotfiles/flake.nix
index 93cb4c7e..88b6b499 100644
--- a/dotfiles/flake.nix
+++ b/dotfiles/flake.nix
@@ -30,21 +30,7 @@
       url = "github:Mic92/sops-nix"; 
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    deploy-rs.url = "github:serokell/deploy-rs";
-    vars = {
-      "joey-laptop" = {
-        username = "joey";
-        hostname = "joey-laptop";
-        theme = "gruvbox-warm";
-        wm = "hyprland";
-      };
-      "joey-desktop" = {
-        realname = "Joey Hafner";
-        username = "joey";
-        hostname = "joey-desktop";
-        email = "joey@jafner.net";
-      };
-    };
+    deploy-rs.url = "github:serokell/deploy-rs"; 
   };
   outputs = inputs@{ 
     nixpkgs, 
@@ -55,6 +41,20 @@
     ... 
   }:
   let
+    vars = {
+      user = {
+        username = "joey";
+        realname = "Joey Hafner";
+        email = "joey@jafner.net";
+      };
+      laptop = {
+        hostname = "joey-laptop";
+        theme = "gruvbox-warm";
+      };
+      desktop = {
+        hostname = "joey-desktop";
+      };
+    }; 
     system = "x86_64-linux";
     lib = nixpkgs.lib;
     pkgs = import inputs.nixpkgs {
@@ -69,39 +69,37 @@
     };
   in {
     nixosConfigurations = {
-      joey-laptop = lib.nixosSystem {        
+      laptop = lib.nixosSystem {        
         modules = [ 
-          ./nixos/joey-laptop/configuration.nix 
+          ./nixos/laptop/configuration.nix 
           inputs.hyprland.nixosModules.default
           inputs.stylix.nixosModules.stylix
           inputs.nix-flatpak.nixosModules.nix-flatpak
         ];
         inherit system;
         specialArgs = { 
-          inherit pkgs;
-          inherit pkgs-unstable; 
-          inherit inputs; 
+          inherit pkgs pkgs-unstable inputs;
+          inherit vars; 
         };
       };
     };
     homeConfigurations = {
-      "joey-laptop" = home-manager.lib.homeManagerConfiguration {
+      laptop = home-manager.lib.homeManagerConfiguration {
         modules = [ 
-          ./home-manager/joey-laptop/home.nix 
+          ./home-manager/laptop/home.nix 
           inputs.stylix.homeManagerModules.stylix 
           inputs.plasma-manager.homeManagerModules.plasma-manager
           inputs.nix-flatpak.homeManagerModules.nix-flatpak
         ];
         inherit pkgs; 
         extraSpecialArgs = { 
-          inherit pkgs;
-          inherit pkgs-unstable; 
-          inherit inputs; 
+          inherit pkgs pkgs-unstable inputs; 
+          inherit vars;
         };
       };
-      "joey-desktop" = home-manager.lib.homeManagerConfiguration {
+      desktop = home-manager.lib.homeManagerConfiguration {
         modules = [ 
-          ./home-manager/joey-desktop/home.nix 
+          ./home-manager/desktop/home.nix 
           inputs.sops-nix.homeManagerModules.sops
           inputs.stylix.homeManagerModules.stylix
           inputs.nix-flatpak.homeManagerModules.nix-flatpak
@@ -109,9 +107,8 @@
         ];
         inherit pkgs;
         extraSpecialArgs = { 
-          inherit pkgs;
-          inherit pkgs-unstable;
-          inherit inputs; 
+          inherit pkgs pkgs-unstable inputs; 
+          inherit vars;
         };
       };
     };
diff --git a/dotfiles/home-manager/joey-desktop/.sops.yaml b/dotfiles/home-manager/desktop/.sops.yaml
similarity index 100%
rename from dotfiles/home-manager/joey-desktop/.sops.yaml
rename to dotfiles/home-manager/desktop/.sops.yaml
diff --git a/dotfiles/home-manager/joey-desktop/continue-config.json b/dotfiles/home-manager/desktop/continue-config.json
similarity index 100%
rename from dotfiles/home-manager/joey-desktop/continue-config.json
rename to dotfiles/home-manager/desktop/continue-config.json
diff --git a/dotfiles/home-manager/joey-desktop/devops.nix b/dotfiles/home-manager/desktop/devops.nix
similarity index 100%
rename from dotfiles/home-manager/joey-desktop/devops.nix
rename to dotfiles/home-manager/desktop/devops.nix
diff --git a/dotfiles/home-manager/joey-desktop/flake.lock b/dotfiles/home-manager/desktop/flake.lock
similarity index 100%
rename from dotfiles/home-manager/joey-desktop/flake.lock
rename to dotfiles/home-manager/desktop/flake.lock
diff --git a/dotfiles/home-manager/joey-desktop/flake.nix b/dotfiles/home-manager/desktop/flake.nix
similarity index 100%
rename from dotfiles/home-manager/joey-desktop/flake.nix
rename to dotfiles/home-manager/desktop/flake.nix
diff --git a/dotfiles/home-manager/joey-desktop/home.nix b/dotfiles/home-manager/desktop/home.nix
similarity index 100%
rename from dotfiles/home-manager/joey-desktop/home.nix
rename to dotfiles/home-manager/desktop/home.nix
diff --git a/dotfiles/home-manager/joey-desktop/plasma-manager.nix b/dotfiles/home-manager/desktop/plasma-manager.nix
similarity index 100%
rename from dotfiles/home-manager/joey-desktop/plasma-manager.nix
rename to dotfiles/home-manager/desktop/plasma-manager.nix
diff --git a/dotfiles/home-manager/joey-desktop/plasma6.jpg b/dotfiles/home-manager/desktop/plasma6.jpg
similarity index 100%
rename from dotfiles/home-manager/joey-desktop/plasma6.jpg
rename to dotfiles/home-manager/desktop/plasma6.jpg
diff --git a/dotfiles/home-manager/joey-desktop/profiles b/dotfiles/home-manager/desktop/profiles
similarity index 100%
rename from dotfiles/home-manager/joey-desktop/profiles
rename to dotfiles/home-manager/desktop/profiles
diff --git a/dotfiles/home-manager/joey-desktop/python.nix b/dotfiles/home-manager/desktop/python.nix
similarity index 100%
rename from dotfiles/home-manager/joey-desktop/python.nix
rename to dotfiles/home-manager/desktop/python.nix
diff --git a/dotfiles/home-manager/joey-desktop/scripts.nix b/dotfiles/home-manager/desktop/scripts.nix
similarity index 100%
rename from dotfiles/home-manager/joey-desktop/scripts.nix
rename to dotfiles/home-manager/desktop/scripts.nix
diff --git a/dotfiles/home-manager/joey-desktop/unstable.nix b/dotfiles/home-manager/desktop/unstable.nix
similarity index 100%
rename from dotfiles/home-manager/joey-desktop/unstable.nix
rename to dotfiles/home-manager/desktop/unstable.nix
diff --git a/dotfiles/home-manager/joey-laptop/app/git/git.nix b/dotfiles/home-manager/joey-laptop/app/git/git.nix
deleted file mode 100644
index 3331bfd6..00000000
--- a/dotfiles/home-manager/joey-laptop/app/git/git.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ ... }:
-{
-  ## Git
-  programs.git = {
-    enable = true;
-    userName = "Joey Hafner";
-    userEmail = "joey@jafner.net";
-    extraConfig = { 
-      core.sshCommand = "ssh -i /home/joey/.ssh/joey@joey-laptop"; 
-    };
-    delta.enable = true;
-    delta.options = {
-      side-by-side = true;
-    };
-  };
-}
\ No newline at end of file
diff --git a/dotfiles/home-manager/joey-laptop/home.nix b/dotfiles/home-manager/joey-laptop/home.nix
deleted file mode 100644
index 8dd0c25b..00000000
--- a/dotfiles/home-manager/joey-laptop/home.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ inputs, ... }:
-
-{
-  home.stateVersion = "24.05";
-  imports = [ ./users/${inputs.homeConf.username}.nix ];
-}
\ No newline at end of file
diff --git a/dotfiles/home-manager/joey-laptop/users/joey.nix b/dotfiles/home-manager/joey-laptop/users/joey.nix
deleted file mode 100644
index 834d98a7..00000000
--- a/dotfiles/home-manager/joey-laptop/users/joey.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ pkgs, ... }:
-
-{
-  home.username = "joey";
-  home.homeDirectory = "/home/joey";
-
-  imports = [ 
-    ../style.nix
-    ../app/browser/zen.nix
-    ../app/flatpak/flatpak.nix
-    ../app/git/git.nix
-    ../app/games/games.nix
-    ../app/media/media.nix
-    ../app/messaging/discord.nix 
-    ../app/obs-studio/obs-studio.nix
-    ../app/bitwarden/bitwarden.nix
-    ../app/sh/sh.nix # Consider splitting out to "terminal", "shell", and "cmd" or similar
-    ../app/vscode/vscode.nix # Consider using a generalized "IDE" or "Editor" folder.
-    ../wm/hyprland/wm.nix
-  ];
-  
-  # Desktop apps
-  home.packages = with pkgs; [
-    git
-    kdePackages.kdeconnect-kde
-  ];
-  programs.home-manager = {
-    enable = true;
-  };
-}
-
diff --git a/dotfiles/home-manager/joey-laptop/app/bitwarden/bitwarden.nix b/dotfiles/home-manager/laptop/app/bitwarden/bitwarden.nix
similarity index 100%
rename from dotfiles/home-manager/joey-laptop/app/bitwarden/bitwarden.nix
rename to dotfiles/home-manager/laptop/app/bitwarden/bitwarden.nix
diff --git a/dotfiles/home-manager/joey-laptop/app/browser/zen.nix b/dotfiles/home-manager/laptop/app/browser/zen.nix
similarity index 100%
rename from dotfiles/home-manager/joey-laptop/app/browser/zen.nix
rename to dotfiles/home-manager/laptop/app/browser/zen.nix
diff --git a/dotfiles/home-manager/joey-laptop/app/flatpak/flatpak.nix b/dotfiles/home-manager/laptop/app/flatpak/flatpak.nix
similarity index 100%
rename from dotfiles/home-manager/joey-laptop/app/flatpak/flatpak.nix
rename to dotfiles/home-manager/laptop/app/flatpak/flatpak.nix
diff --git a/dotfiles/home-manager/joey-laptop/app/games/games.nix b/dotfiles/home-manager/laptop/app/games/games.nix
similarity index 100%
rename from dotfiles/home-manager/joey-laptop/app/games/games.nix
rename to dotfiles/home-manager/laptop/app/games/games.nix
diff --git a/dotfiles/home-manager/laptop/app/git/git.nix b/dotfiles/home-manager/laptop/app/git/git.nix
new file mode 100644
index 00000000..dc167ec2
--- /dev/null
+++ b/dotfiles/home-manager/laptop/app/git/git.nix
@@ -0,0 +1,16 @@
+{ vars, ... }:
+{
+  ## Git
+  programs.git = {
+    enable = true;
+    userName = "${vars.user.realname}";
+    userEmail = "${vars.user.email}";
+    extraConfig = { 
+      core.sshCommand = "ssh -i /home/joey/.ssh/${vars.user.username}@${vars.laptop.hostname}"; 
+    };
+    delta.enable = true;
+    delta.options = {
+      side-by-side = true;
+    };
+  };
+}
diff --git a/dotfiles/home-manager/joey-laptop/app/kubectl/kubectl.nix b/dotfiles/home-manager/laptop/app/kubectl/kubectl.nix
similarity index 100%
rename from dotfiles/home-manager/joey-laptop/app/kubectl/kubectl.nix
rename to dotfiles/home-manager/laptop/app/kubectl/kubectl.nix
diff --git a/dotfiles/home-manager/joey-laptop/app/media/media.nix b/dotfiles/home-manager/laptop/app/media/media.nix
similarity index 100%
rename from dotfiles/home-manager/joey-laptop/app/media/media.nix
rename to dotfiles/home-manager/laptop/app/media/media.nix
diff --git a/dotfiles/home-manager/joey-laptop/app/messaging/discord.nix b/dotfiles/home-manager/laptop/app/messaging/discord.nix
similarity index 100%
rename from dotfiles/home-manager/joey-laptop/app/messaging/discord.nix
rename to dotfiles/home-manager/laptop/app/messaging/discord.nix
diff --git a/dotfiles/home-manager/joey-laptop/app/obs-studio/obs-studio.nix b/dotfiles/home-manager/laptop/app/obs-studio/obs-studio.nix
similarity index 100%
rename from dotfiles/home-manager/joey-laptop/app/obs-studio/obs-studio.nix
rename to dotfiles/home-manager/laptop/app/obs-studio/obs-studio.nix
diff --git a/dotfiles/home-manager/joey-laptop/app/plasma-manager/plasma-manager.nix b/dotfiles/home-manager/laptop/app/plasma-manager/plasma-manager.nix
similarity index 100%
rename from dotfiles/home-manager/joey-laptop/app/plasma-manager/plasma-manager.nix
rename to dotfiles/home-manager/laptop/app/plasma-manager/plasma-manager.nix
diff --git a/dotfiles/home-manager/joey-laptop/app/sh/sh.nix b/dotfiles/home-manager/laptop/app/sh/sh.nix
similarity index 100%
rename from dotfiles/home-manager/joey-laptop/app/sh/sh.nix
rename to dotfiles/home-manager/laptop/app/sh/sh.nix
diff --git a/dotfiles/home-manager/joey-laptop/app/vscode/vscode.nix b/dotfiles/home-manager/laptop/app/vscode/vscode.nix
similarity index 100%
rename from dotfiles/home-manager/joey-laptop/app/vscode/vscode.nix
rename to dotfiles/home-manager/laptop/app/vscode/vscode.nix
diff --git a/dotfiles/home-manager/laptop/home.nix b/dotfiles/home-manager/laptop/home.nix
new file mode 100644
index 00000000..2cd88a65
--- /dev/null
+++ b/dotfiles/home-manager/laptop/home.nix
@@ -0,0 +1,31 @@
+{ pkgs, vars, ... }:
+
+{
+  home.stateVersion = "24.05";
+  home.username = "${vars.user.username}";
+  home.homeDirectory = "/home/${vars.user.username}";
+
+  imports = [ 
+    ./style.nix
+    ./app/browser/zen.nix
+    ./app/flatpak/flatpak.nix
+    ./app/git/git.nix
+    ./app/games/games.nix
+    ./app/media/media.nix
+    ./app/messaging/discord.nix 
+    ./app/obs-studio/obs-studio.nix
+    ./app/bitwarden/bitwarden.nix
+    ./app/sh/sh.nix # Consider splitting out to "terminal", "shell", and "cmd" or similar
+    ./app/vscode/vscode.nix # Consider using a generalized "IDE" or "Editor" folder.
+    ./wm/hyprland/wm.nix
+  ];
+  
+  # Desktop apps
+  home.packages = with pkgs; [
+    git
+    kdePackages.kdeconnect-kde
+  ];
+  programs.home-manager = {
+    enable = true;
+  };
+}
diff --git a/dotfiles/home-manager/joey-laptop/style.nix b/dotfiles/home-manager/laptop/style.nix
similarity index 90%
rename from dotfiles/home-manager/joey-laptop/style.nix
rename to dotfiles/home-manager/laptop/style.nix
index 0088f1dc..1081e8d0 100644
--- a/dotfiles/home-manager/joey-laptop/style.nix
+++ b/dotfiles/home-manager/laptop/style.nix
@@ -1,8 +1,8 @@
-{ pkgs, userSettings, ... }:
+{ pkgs, vars, ... }:
 {
   home.packages = with pkgs; [ base16-schemes ];
   ## Stylix 
-  imports = [ ./themes/${userSettings.theme}/theme.nix ];
+  imports = [ ./themes/${vars.laptop.theme}/theme.nix ];
   stylix = {
     enable = true;
     autoEnable = true;
diff --git a/dotfiles/home-manager/joey-laptop/themes/cooper/theme.nix b/dotfiles/home-manager/laptop/themes/cooper/theme.nix
similarity index 100%
rename from dotfiles/home-manager/joey-laptop/themes/cooper/theme.nix
rename to dotfiles/home-manager/laptop/themes/cooper/theme.nix
diff --git a/dotfiles/home-manager/joey-laptop/themes/cooper/wallpaper.png b/dotfiles/home-manager/laptop/themes/cooper/wallpaper.png
similarity index 100%
rename from dotfiles/home-manager/joey-laptop/themes/cooper/wallpaper.png
rename to dotfiles/home-manager/laptop/themes/cooper/wallpaper.png
diff --git a/dotfiles/home-manager/joey-laptop/themes/gruvbox-cool/theme.nix b/dotfiles/home-manager/laptop/themes/gruvbox-cool/theme.nix
similarity index 100%
rename from dotfiles/home-manager/joey-laptop/themes/gruvbox-cool/theme.nix
rename to dotfiles/home-manager/laptop/themes/gruvbox-cool/theme.nix
diff --git a/dotfiles/home-manager/joey-laptop/themes/gruvbox-warm/theme.nix b/dotfiles/home-manager/laptop/themes/gruvbox-warm/theme.nix
similarity index 100%
rename from dotfiles/home-manager/joey-laptop/themes/gruvbox-warm/theme.nix
rename to dotfiles/home-manager/laptop/themes/gruvbox-warm/theme.nix
diff --git a/dotfiles/home-manager/joey-laptop/themes/material-blue/theme.nix b/dotfiles/home-manager/laptop/themes/material-blue/theme.nix
similarity index 100%
rename from dotfiles/home-manager/joey-laptop/themes/material-blue/theme.nix
rename to dotfiles/home-manager/laptop/themes/material-blue/theme.nix
diff --git a/dotfiles/home-manager/joey-laptop/themes/material-blue/wallpaper.jpg b/dotfiles/home-manager/laptop/themes/material-blue/wallpaper.jpg
similarity index 100%
rename from dotfiles/home-manager/joey-laptop/themes/material-blue/wallpaper.jpg
rename to dotfiles/home-manager/laptop/themes/material-blue/wallpaper.jpg
diff --git a/dotfiles/home-manager/joey-laptop/themes/material-red/theme.nix b/dotfiles/home-manager/laptop/themes/material-red/theme.nix
similarity index 100%
rename from dotfiles/home-manager/joey-laptop/themes/material-red/theme.nix
rename to dotfiles/home-manager/laptop/themes/material-red/theme.nix
diff --git a/dotfiles/home-manager/joey-laptop/themes/material-red/wallpaper.jpg b/dotfiles/home-manager/laptop/themes/material-red/wallpaper.jpg
similarity index 100%
rename from dotfiles/home-manager/joey-laptop/themes/material-red/wallpaper.jpg
rename to dotfiles/home-manager/laptop/themes/material-red/wallpaper.jpg
diff --git a/dotfiles/home-manager/joey-laptop/themes/nature-blue/theme.nix b/dotfiles/home-manager/laptop/themes/nature-blue/theme.nix
similarity index 100%
rename from dotfiles/home-manager/joey-laptop/themes/nature-blue/theme.nix
rename to dotfiles/home-manager/laptop/themes/nature-blue/theme.nix
diff --git a/dotfiles/home-manager/joey-laptop/themes/nature-blue/wallpaper.jpg b/dotfiles/home-manager/laptop/themes/nature-blue/wallpaper.jpg
similarity index 100%
rename from dotfiles/home-manager/joey-laptop/themes/nature-blue/wallpaper.jpg
rename to dotfiles/home-manager/laptop/themes/nature-blue/wallpaper.jpg
diff --git a/dotfiles/home-manager/joey-laptop/themes/nature-green/theme.nix b/dotfiles/home-manager/laptop/themes/nature-green/theme.nix
similarity index 100%
rename from dotfiles/home-manager/joey-laptop/themes/nature-green/theme.nix
rename to dotfiles/home-manager/laptop/themes/nature-green/theme.nix
diff --git a/dotfiles/home-manager/joey-laptop/themes/nature-green/wallpaper.jpg b/dotfiles/home-manager/laptop/themes/nature-green/wallpaper.jpg
similarity index 100%
rename from dotfiles/home-manager/joey-laptop/themes/nature-green/wallpaper.jpg
rename to dotfiles/home-manager/laptop/themes/nature-green/wallpaper.jpg
diff --git a/dotfiles/home-manager/joey-laptop/themes/nature-red/theme.nix b/dotfiles/home-manager/laptop/themes/nature-red/theme.nix
similarity index 100%
rename from dotfiles/home-manager/joey-laptop/themes/nature-red/theme.nix
rename to dotfiles/home-manager/laptop/themes/nature-red/theme.nix
diff --git a/dotfiles/home-manager/joey-laptop/themes/nature-red/wallpaper.jpg b/dotfiles/home-manager/laptop/themes/nature-red/wallpaper.jpg
similarity index 100%
rename from dotfiles/home-manager/joey-laptop/themes/nature-red/wallpaper.jpg
rename to dotfiles/home-manager/laptop/themes/nature-red/wallpaper.jpg
diff --git a/dotfiles/home-manager/joey-laptop/themes/temple/theme.nix b/dotfiles/home-manager/laptop/themes/temple/theme.nix
similarity index 100%
rename from dotfiles/home-manager/joey-laptop/themes/temple/theme.nix
rename to dotfiles/home-manager/laptop/themes/temple/theme.nix
diff --git a/dotfiles/home-manager/joey-laptop/themes/temple/wallpaper.png b/dotfiles/home-manager/laptop/themes/temple/wallpaper.png
similarity index 100%
rename from dotfiles/home-manager/joey-laptop/themes/temple/wallpaper.png
rename to dotfiles/home-manager/laptop/themes/temple/wallpaper.png
diff --git a/dotfiles/home-manager/joey-laptop/wm/hyprland/hyprland.nix b/dotfiles/home-manager/laptop/wm/hyprland/hyprland.nix
similarity index 100%
rename from dotfiles/home-manager/joey-laptop/wm/hyprland/hyprland.nix
rename to dotfiles/home-manager/laptop/wm/hyprland/hyprland.nix
diff --git a/dotfiles/home-manager/joey-laptop/wm/hyprland/waybar-ml4w.css b/dotfiles/home-manager/laptop/wm/hyprland/waybar-ml4w.css
similarity index 100%
rename from dotfiles/home-manager/joey-laptop/wm/hyprland/waybar-ml4w.css
rename to dotfiles/home-manager/laptop/wm/hyprland/waybar-ml4w.css
diff --git a/dotfiles/home-manager/joey-laptop/wm/hyprland/waybar.css b/dotfiles/home-manager/laptop/wm/hyprland/waybar.css
similarity index 100%
rename from dotfiles/home-manager/joey-laptop/wm/hyprland/waybar.css
rename to dotfiles/home-manager/laptop/wm/hyprland/waybar.css
diff --git a/dotfiles/home-manager/joey-laptop/wm/hyprland/waybar.nix b/dotfiles/home-manager/laptop/wm/hyprland/waybar.nix
similarity index 100%
rename from dotfiles/home-manager/joey-laptop/wm/hyprland/waybar.nix
rename to dotfiles/home-manager/laptop/wm/hyprland/waybar.nix
diff --git a/dotfiles/home-manager/joey-laptop/wm/hyprland/wm.nix b/dotfiles/home-manager/laptop/wm/hyprland/wm.nix
similarity index 100%
rename from dotfiles/home-manager/joey-laptop/wm/hyprland/wm.nix
rename to dotfiles/home-manager/laptop/wm/hyprland/wm.nix
diff --git a/dotfiles/home-manager/joey-laptop/wm/hyprland/wofi.nix b/dotfiles/home-manager/laptop/wm/hyprland/wofi.nix
similarity index 100%
rename from dotfiles/home-manager/joey-laptop/wm/hyprland/wofi.nix
rename to dotfiles/home-manager/laptop/wm/hyprland/wofi.nix
diff --git a/dotfiles/nixos/joey-laptop/configuration.nix b/dotfiles/nixos/laptop/configuration.nix
similarity index 75%
rename from dotfiles/nixos/joey-laptop/configuration.nix
rename to dotfiles/nixos/laptop/configuration.nix
index a021d56e..8464cddb 100644
--- a/dotfiles/nixos/joey-laptop/configuration.nix
+++ b/dotfiles/nixos/laptop/configuration.nix
@@ -1,8 +1,8 @@
-{ pkgs, inputs, ... }:
+{ pkgs, vars, ... }:
 {
   imports = [
     ./hardware-configuration.nix
-    ./wm/${inputs.vars."joey-laptop".wm}/desktopEnvironment.nix
+    ./wm/${vars.laptop.wm}/desktopEnvironment.nix
     ./system.nix
     ./security.nix
     ./flatpak.nix
@@ -13,10 +13,10 @@
   
   # Configure user
   programs.zsh.enable = true;
-  users.users.${inputs.vars."joey-laptop".username} = {
+  users.users.${vars.user.username} = {
     isNormalUser = true;
     shell = pkgs.zsh;
-    description = "${inputs.vars."joey-laptop".username}";
+    description = "${vars.user.username}";
     extraGroups = [ "networkmanager" "wheel" ];
     openssh.authorizedKeys.keys = let
       authorizedKeys = pkgs.fetchurl {
diff --git a/dotfiles/nixos/joey-laptop/flatpak.nix b/dotfiles/nixos/laptop/flatpak.nix
similarity index 100%
rename from dotfiles/nixos/joey-laptop/flatpak.nix
rename to dotfiles/nixos/laptop/flatpak.nix
diff --git a/dotfiles/nixos/joey-laptop/fonts.nix b/dotfiles/nixos/laptop/fonts.nix
similarity index 100%
rename from dotfiles/nixos/joey-laptop/fonts.nix
rename to dotfiles/nixos/laptop/fonts.nix
diff --git a/dotfiles/nixos/joey-laptop/hardware-configuration.nix b/dotfiles/nixos/laptop/hardware-configuration.nix
similarity index 100%
rename from dotfiles/nixos/joey-laptop/hardware-configuration.nix
rename to dotfiles/nixos/laptop/hardware-configuration.nix
diff --git a/dotfiles/nixos/joey-laptop/locale.nix b/dotfiles/nixos/laptop/locale.nix
similarity index 100%
rename from dotfiles/nixos/joey-laptop/locale.nix
rename to dotfiles/nixos/laptop/locale.nix
diff --git a/dotfiles/nixos/joey-laptop/security.nix b/dotfiles/nixos/laptop/security.nix
similarity index 100%
rename from dotfiles/nixos/joey-laptop/security.nix
rename to dotfiles/nixos/laptop/security.nix
diff --git a/dotfiles/nixos/joey-laptop/steam.nix b/dotfiles/nixos/laptop/steam.nix
similarity index 100%
rename from dotfiles/nixos/joey-laptop/steam.nix
rename to dotfiles/nixos/laptop/steam.nix
diff --git a/dotfiles/nixos/joey-laptop/system.nix b/dotfiles/nixos/laptop/system.nix
similarity index 92%
rename from dotfiles/nixos/joey-laptop/system.nix
rename to dotfiles/nixos/laptop/system.nix
index 577bbeaf..006d608d 100644
--- a/dotfiles/nixos/joey-laptop/system.nix
+++ b/dotfiles/nixos/laptop/system.nix
@@ -1,4 +1,4 @@
-{ pkgs, inputs, ... }:
+{ pkgs, vars, ... }:
 {
   # Configure system packages
   environment.systemPackages = with pkgs; [
@@ -21,7 +21,7 @@
   boot.loader.efi.canTouchEfiVariables = true;
 
   # Configure networking
-  networking.hostName = "${inputs.vars."joey-laptop".hostname}";
+  networking.hostName = "${vars.laptop.hostname}";
   networking.networkmanager.enable = true;
 
   # Disable systemd's getty and autovt on tty1
diff --git a/dotfiles/nixos/joey-laptop/wm/hyprland/desktopEnvironment.nix b/dotfiles/nixos/laptop/wm/hyprland/desktopEnvironment.nix
similarity index 85%
rename from dotfiles/nixos/joey-laptop/wm/hyprland/desktopEnvironment.nix
rename to dotfiles/nixos/laptop/wm/hyprland/desktopEnvironment.nix
index 91f8301c..8a59c64a 100644
--- a/dotfiles/nixos/joey-laptop/wm/hyprland/desktopEnvironment.nix
+++ b/dotfiles/nixos/laptop/wm/hyprland/desktopEnvironment.nix
@@ -1,4 +1,4 @@
-{ pkgs, inputs, ... }:
+{ pkgs, vars, ... }:
 {
   environment.systemPackages = with pkgs; [
    mako libnotify
@@ -18,7 +18,7 @@
   services.displayManager = {
     autoLogin = {
       enable = true;
-      user = "${inputs.vars."joey-laptop".username}";
+      user = "${vars.user.username}";
     };
     sddm = {
       enable = true;
diff --git a/dotfiles/nixos/joey-laptop/wm/plasma/desktopEnvironment.nix b/dotfiles/nixos/laptop/wm/plasma/desktopEnvironment.nix
similarity index 86%
rename from dotfiles/nixos/joey-laptop/wm/plasma/desktopEnvironment.nix
rename to dotfiles/nixos/laptop/wm/plasma/desktopEnvironment.nix
index 9cc7562c..792156aa 100644
--- a/dotfiles/nixos/joey-laptop/wm/plasma/desktopEnvironment.nix
+++ b/dotfiles/nixos/laptop/wm/plasma/desktopEnvironment.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, inputs, ... }:
+{ pkgs, lib, vars, ... }:
 
 {
   # Configure displayManager
@@ -6,7 +6,7 @@
   services.displayManager = {
     enable = true;
     autoLogin.enable = true;
-    autoLogin.user = "${inputs.vars."joey-laptop".username}";
+    autoLogin.user = "${vars.user.username}";
     sddm = {
       enable = true;
       autoNumlock = true;