Update structure

home-manager/fish/default.nix

@@ -4,6 +4,7 @@
     enable = true;
     interactiveShellInit = ''
       set -g fish_greeting ""
+      set -gx SSH_AUTH_SOCK "$XDG_RUNTIME_DIR/ssh-agent"
     '';
   };
 

hosts/arcadia/default.nix

@@ -0,0 +1,11 @@
+inputs:
+let
+  mkHost = import ../mkHost.nix inputs;
+in
+mkHost {
+  system = "x86_64-linux";
+  hostname = "Arcadia";
+  username = "hare";
+  systemModules = [ ./nixos.nix ];
+  homeModule = [ ./home-manager.nix ];
+}

hosts/arcadia/home-manager.nix

@@ -43,7 +43,6 @@
     gimp
     inkscape
     obsidian
-    # davinci-resolve
     kdePackages.filelight
     inputs.zen-browser.packages."${stdenv.hostPlatform.system}".default
     (deno.overrideAttrs (oldAttrs: {
@@ -62,6 +61,8 @@
     vinegar
 
     antigravity
+
+    davinci-resolve
   ];
   services.easyeffects = {
     enable = true;

hosts/default.nix

@@ -1,95 +1,9 @@
 inputs:
-let
-  mkHost =
-    {
-      system,
-      hostname,
-      username,
-      systemModules,
-      homeModule,
-    }:
-    {
-      nixos = inputs.nixpkgs.lib.nixosSystem {
-        modules = systemModules ++ [
-          {
-            users.users.${username} = {
-              isNormalUser = true;
-              description = "";
-              extraGroups = [
-                "networkmanager"
-                "wheel"
-              ];
-            };
-          }
-        ];
-        inherit system;
-        specialArgs = {
-          inherit inputs hostname username;
-        };
-      };
-      home-manager = inputs.home-manager.lib.homeManagerConfiguration {
-        pkgs = import inputs.nixpkgs {
-          inherit system;
-          config.allowUnfree = true;
-        };
-        extraSpecialArgs = {
-          inherit inputs hostname username;
-        };
-        modules = [
-          {
-            home = {
-              inherit username;
-              homeDirectory = "/home/${username}";
-            };
-            programs.home-manager.enable = true;
-          }
-          (import ../system/home-manager)
-        ]
-        ++ homeModule;
-      };
-    };
-in
 rec {
   hosts = {
-    arcadia =
+    arcadia = import ./arcadia inputs;
-      let
+    x1carbon = import ./x1carbon inputs;
-        inputs.nixpkgs = import inputs.nixpkgs {
+    fungus = import ./fungus inputs;
-          config.rocmSupport = true;
-        };
-      in
-      mkHost {
-        system = "x86_64-linux";
-        hostname = "Arcadia";
-        username = "hare";
-        systemModules = [
-          ./arcadia/nixos.nix
-        ];
-        homeModule = [
-          ./arcadia/home-manager.nix
-        ];
-      };
-    x1carbon = mkHost {
-      system = "x86_64-linux";
-      hostname = "x1carbon";
-      username = "hare";
-      systemModules = [
-        ./x1carbon/nixos.nix
-      ];
-      homeModule = [
-        ./x1carbon/home-manager.nix
-      ];
-    };
-    fungus = mkHost {
-      system = "x86_64-linux";
-      hostname = "Fungus";
-      username = "hare";
-      systemModules = [
-        ./fungus/nixos.nix
-      ];
-      homeModule = [
-        ./fungus/home-manager.nix
-      ];
-    };
   };
   nixos = builtins.mapAttrs (_: host: host.nixos) hosts;
   home-manager = builtins.mapAttrs (_: host: host.home-manager) hosts;

hosts/fungus/default.nix

@@ -0,0 +1,11 @@
+inputs:
+let
+  mkHost = import ../mkHost.nix inputs;
+in
+mkHost {
+  system = "x86_64-linux";
+  hostname = "Fungus";
+  username = "hare";
+  systemModules = [ ./nixos.nix ];
+  homeModule = [ ./home-manager.nix ];
+}

hosts/mkHost.nix

@@ -0,0 +1,48 @@
+inputs:
+{
+  system,
+  hostname,
+  username,
+  systemModules,
+  homeModule,
+}:
+{
+  nixos = inputs.nixpkgs.lib.nixosSystem {
+    modules = systemModules ++ [
+      {
+        users.users.${username} = {
+          isNormalUser = true;
+          description = "";
+          extraGroups = [
+            "networkmanager"
+            "wheel"
+          ];
+        };
+      }
+    ];
+    inherit system;
+    specialArgs = {
+      inherit inputs hostname username;
+    };
+  };
+  home-manager = inputs.home-manager.lib.homeManagerConfiguration {
+    pkgs = import inputs.nixpkgs {
+      inherit system;
+      config.allowUnfree = true;
+    };
+    extraSpecialArgs = {
+      inherit inputs hostname username;
+    };
+    modules = [
+      {
+        home = {
+          inherit username;
+          homeDirectory = "/home/${username}";
+        };
+        programs.home-manager.enable = true;
+      }
+      (import ../system/home-manager)
+    ]
+    ++ homeModule;
+  };
+}

hosts/x1carbon/default.nix

@@ -0,0 +1,11 @@
+inputs:
+let
+  mkHost = import ../mkHost.nix inputs;
+in
+mkHost {
+  system = "x86_64-linux";
+  hostname = "x1carbon";
+  username = "hare";
+  systemModules = [ ./nixos.nix ];
+  homeModule = [ ./home-manager.nix ];
+}

hosts/x1carbon/nixos.nix

@@ -31,12 +31,13 @@ in
 
     fzf
     ghq
+
+    android-tools
   ];
   environment.sessionVariables.NIXOS_OZONE_WL = "1";
 
   users.users.${username} = {
     extraGroups = [
-      "adbusers"
       "docker"
     ];
     shell = pkgs.fish;
@@ -45,7 +46,6 @@ in
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIW2Yrqwi4YjIrdI8mygX5pTHDPmrUgbmpZ4WxoTqORi keihi@Vostro-LapTop"
     ];
   };
-  programs.adb.enable = true;
   programs.nix-ld.enable = true;
   programs.light.enable = true;
 

programs/ssh.nix

@@ -1,4 +1,6 @@
 {
+  programs.ssh.startAgent = true;
+
   services.openssh = {
     enable = true;
     ports = [ 22 ];