Split common and tardis specific home-manager modules

flake.nix

@@ -15,30 +15,30 @@
   outputs = inputs@{ nixpkgs, kutu, home-manager, spicetify-nix, ... }:
   let
     system = "x86_64-linux";
+    commonModules = [
+      ./hosts/common.nix
+      home-manager.nixosModules.home-manager
+      {
+        home-manager.users.me = import ./home/common.nix;
+        home-manager.extraSpecialArgs = { inherit inputs; };
+      }
+    ];
   in {
     nixosConfigurations = {
       syedm = nixpkgs.lib.nixosSystem {
         inherit system;
         specialArgs = { inherit inputs; };
-        modules = [
+        modules = commonModules ++ [
-          ./hosts/common.nix
           ./hosts/syedm
-          home-manager.nixosModules.home-manager
-          { home-manager.users.me = import ./home; }
         ];
       };
 
       tardis = nixpkgs.lib.nixosSystem {
         inherit system;
         specialArgs = { inherit inputs; };
-        modules = [
+        modules = commonModules ++ [
-          ./hosts/common.nix
           ./hosts/tardis
-          home-manager.nixosModules.home-manager
+          { home-manager.users.me = import ./home/tardis.nix; }
-          {
-            home-manager.users.me = import ./home;
-            home-manager.extraSpecialArgs = { inherit inputs; };
-          }
         ];
       };
     };

home/common.nix

@@ -0,0 +1,36 @@
+{ pkgs, ... }:
+
+{
+  imports = [
+    ./btop
+    ./eza
+    ./fastfetch
+    ./fish
+    ./gitui
+    ./nvim
+    ./yazi
+  ];
+
+  nixpkgs.config.allowUnfree = true;
+
+  home.username = "me";
+  home.homeDirectory = "/home/me";
+
+  programs.git = {
+    enable = true;
+
+    settings.user.name = "Syed Daanish";
+    settings.user.email = "me@syedm.dev";
+
+    signing = {
+      format = "openpgp";
+      key = "9988BF5D83DCEC880D69A3DA4786C50E6037E76A";
+      signByDefault = true;
+      signer = "${pkgs.writeShellScriptBin "gpg-secrets" ''
+        exec ${pkgs.gnupg}/bin/gpg --homedir /run/secrets/gpg "$@"
+      ''}/bin/gpg-secrets";
+    };
+  };
+
+  home.stateVersion = "26.05";
+}

home/tardis.nix

@@ -7,41 +7,13 @@ in
   imports = [
     inputs.spicetify-nix.homeManagerModules.spicetify
     ./battery
-    ./btop
     ./dunst
-    ./eza
-    ./fastfetch
-    ./fish
-    ./gitui
     ./kitty
     ./kutu
-    ./nvim
     ./picom
     ./rofi
-    ./yazi
   ];
 
-  nixpkgs.config.allowUnfree = true;
-
-  home.username = "me";
-  home.homeDirectory = "/home/me";
-
-  programs.git = {
-    enable = true;
-
-    settings.user.name = "Syed Daanish";
-    settings.user.email = "me@syedm.dev";
-
-    signing = {
-      format = "openpgp";
-      key = "9988BF5D83DCEC880D69A3DA4786C50E6037E76A";
-      signByDefault = true;
-      signer = "${pkgs.writeShellScriptBin "gpg-secrets" ''
-        exec ${pkgs.gnupg}/bin/gpg --homedir /run/secrets/gpg "$@"
-      ''}/bin/gpg-secrets";
-    };
-  };
-
   xsession = {
     enable = true;
     windowManager.command = "kutu.rb";
@@ -62,6 +34,4 @@ in
      theme = spicePkgs.themes.catppuccin;
      colorScheme = "mocha";
    };
-
-  home.stateVersion = "26.05";
 }