From d44b7ebdaa83690176b0acca1a4b7313fc7f0dce Mon Sep 17 00:00:00 2001
From: Dennis Schoepf <me@dnsc.io>
Date: Tue, 3 Mar 2026 22:08:29 +0100
Subject: [PATCH] updates home manager config

---
 modules/home-manager/default.nix       | 25 +++++++++++++++++
 modules/hosts/dnsc-air/default.nix     | 38 --------------------------
 modules/hosts/dnsc-machine/default.nix |  1 +
 modules/shell/default.nix              |  1 -
 4 files changed, 26 insertions(+), 39 deletions(-)
 create mode 100644 modules/home-manager/default.nix
 delete mode 100644 modules/hosts/dnsc-air/default.nix

diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
new file mode 100644
index 0000000..385eace
--- /dev/null
+++ b/modules/home-manager/default.nix
@@ -0,0 +1,25 @@
+{ inputs, config, ... }:
+let
+  username = config.flake.globalConfig.username;
+  hmConfig = {
+    useGlobalPkgs = true;
+    useUserPackages = true;
+    backupFileExtension = "backup";
+    users.${username}.home.stateVersion = "24.11";
+  };
+in
+{
+  flake.modules.nixos.home-manager =
+    { ... }:
+    {
+      imports = [ inputs.home-manager.nixosModules.home-manager ];
+      home-manager = hmConfig;
+    };
+
+  flake.modules.darwin.home-manager =
+    { ... }:
+    {
+      imports = [ inputs.home-manager.darwinModules.home-manager ];
+      home-manager = hmConfig;
+    };
+}
diff --git a/modules/hosts/dnsc-air/default.nix b/modules/hosts/dnsc-air/default.nix
deleted file mode 100644
index 2f2c661..0000000
--- a/modules/hosts/dnsc-air/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  inputs,
-  config,
-  ...
-}:
-let
-  hostname = "dnsc-air";
-  username = config.flake.globalConfig.username;
-in
-{
-  flake.darwinConfigurations.dnsc-air = inputs.nix-darwin.lib.darwinSystem {
-    system = "aarch64-darwin";
-    specialArgs = { inherit inputs; };
-    modules = [
-      inputs.home-manager.darwinModules.home-manager
-      config.flake.modules.darwin.base
-      {
-        networking.hostName = "${hostname}";
-        networking.computerName = "${hostname}";
-        users.users.${username}.home = "/Users/${username}";
-        nix.enable = false;
-        nix.settings.experimental-features = [
-          "nix-command"
-          "flakes"
-        ];
-
-        home-manager = {
-          useGlobalPkgs = true;
-          backupFileExtension = "backup";
-          users.${username} = {
-            imports = [ config.flake.modules.homeManager.neovim ];
-            home.stateVersion = "24.11";
-          };
-        };
-      }
-    ];
-  };
-}
diff --git a/modules/hosts/dnsc-machine/default.nix b/modules/hosts/dnsc-machine/default.nix
index 79c9133..0a714cc 100644
--- a/modules/hosts/dnsc-machine/default.nix
+++ b/modules/hosts/dnsc-machine/default.nix
@@ -7,6 +7,7 @@ in
     system = "x86_64-linux";
     modules = with config.flake.modules.nixos; [
       # Modules
+      home-manager
       base
       shell
 
diff --git a/modules/shell/default.nix b/modules/shell/default.nix
index 90287a1..a734158 100644
--- a/modules/shell/default.nix
+++ b/modules/shell/default.nix
@@ -31,7 +31,6 @@
       programs.fish = {
         enable = true;
         functions = {
-          ff = "bash ${./ff.bash}";
           fish_greeting = "fortune -a";
           localip = "ifconfig | grep \"inet \" | grep -v 127.0.0.1 | awk '{print $2}' | head -n 1";
           publicip = "curl -4 ifconfig.me";