chore: organize dotfiles stowed by home-manager

hosts/thegeneralist-central/configuration.nix

@@ -18,11 +18,14 @@
     in [ thegeneralist ];
   };
 
+  programs.home-manager.enable = true;
   home-manager = {
     backupFileExtension = "home.bak";
     extraSpecialArgs = { inherit inputs; };
-    users = {
+    users.thegeneralist.home = {
-      thegeneralist = import (self + /modules/home);
+      username = "thegeneralist";
+      homeDirectory = "/home/thegeneralist";
+      stateVersion = "25.11";
     };
   };
 

hosts/thegeneralist/configuration.nix

@@ -18,11 +18,14 @@
     in [ thegeneralist ];
   };
 
+  programs.home-manager.enable = true;
   home-manager = {
     backupFileExtension = "home.bak";
     extraSpecialArgs = { inherit inputs; };
-    users = {
+    users.thegeneralist.home = {
-      thegeneralist = import (self + /modules/home);
+      username = "thegeneralist";
+      homeDirectory = "/home/thegeneralist";
+      stateVersion = "25.11";
     };
   };
 

modules/common/neovim.nix

@@ -27,13 +27,13 @@ in {
 
     home.file = {
       ".config/nvim" = {
-        source = ../home/dotfiles/nvim;
+        source = ../dotfiles/nvim;
         force = true;
         recursive = true;
       };
     } // optionalAttrs config.onLinux {
       ".config/i3status" = {
-        source = ../home/dotfiles/i3status;
+        source = ../dotfiles/i3status;
         force = true;
         recursive = true;
       };

modules/common/packages.nix

@@ -12,6 +12,25 @@ in {
       gcc
       gnumake
       automake
+
+      zip
+      xz
+      unzip
+
+      mtr
+      iperf3
+      dnsutils
+      ldns
+      nmap
+
+      file
+      which
+      tree
+      gnupg
+      btop
+
+      pciutils
+      usbutils
     ;
   };
 }

modules/home/default.nix

@@ -1,52 +0,0 @@
-{ config, options, pkgs, inputs, lib, ... }: {
-  home.username = "thegeneralist";
-  home.homeDirectory = if options.onLinux then "/home/thegeneralist" else "/Users/thegeneralist";
-
-  home.packages = with pkgs; [
-    zip
-    xz
-    unzip
-
-    mtr
-    iperf3
-    dnsutils
-    ldns
-    nmap
-
-    file
-    which
-    tree
-    gnupg
-    btop
-
-    pciutils
-    usbutils
-
-    # # It is sometimes useful to fine-tune packages, for example, by applying
-    # # overrides. You can do that directly here, just don't forget the
-    # # parentheses. Maybe you want to install Nerd Fonts with a limited number of
-    # # fonts?
-    # (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; })
-
-    # # You can also create simple shell scripts directly inside your
-    # # configuration. For example, this adds a command 'my-hello' to your
-    # # environment:
-    # (pkgs.writeShellScriptBin "my-hello" ''
-    #   echo "Hello, ${config.home.username}!"
-    # '')
-  ];
-
-  # Home Manager can also manage your environment variables through
-  # 'home.sessionVariables'. These will be explicitly sourced when using a
-  # shell provided by Home Manager. If you don't want to manage your shell
-  # through Home Manager then you have to manually source 'hm-session-vars.sh'
-  # located at either
-  #  ~/.nix-profile/etc/profile.d/hm-session-vars.sh
-  # or
-  #  ~/.local/state/nix/profiles/profile/etc/profile.d/hm-session-vars.sh
-  # or
-  #  /etc/profiles/per-user/thegeneralist/etc/profile.d/hm-session-vars.sh
-
-  home.stateVersion = "24.11";
-  programs.home-manager.enable = true;
-}

modules/linux/xserver.nix

@@ -28,7 +28,7 @@ in {
     windowManager.i3 = optionalAttrs (!config.isServer) {
       enable = true;
       package = pkgs.i3;
-      configFile = ../home/dotfiles/i3/config;
+      configFile = ../dotfiles/i3/config;
 
       extraPackages = with pkgs; [
         i3