♻️ refactor home-manager / dotfiles to use chezmoi

nix/modules/base/common.nix

@@ -1,13 +1,6 @@
-{ pkgs, ... }:
+_:
 
 {
-  environment.systemPackages = with pkgs; [
-    dogdns
-    htop
-    inetutils
-    vim
-  ];
-
   nix = {
     extraOptions = ''
       experimental-features = nix-command flakes
@@ -30,10 +23,5 @@
     };
   };
 
-  programs = {
-    zsh = {
-      enable = true;
-      promptInit = "";
-    };
-  };
+  programs.zsh.enable = true;
 }

nix/modules/base/darwin.nix

@@ -1,6 +1,6 @@
-{ pkgs, dotfiles, ... }: {
+{ ... }: {
 
-  imports = [ ./common.nix ];
+  imports = [ ./common.nix ../../users ];
 
   nix = {
     configureBuildUsers = true;
@@ -42,16 +42,5 @@
     };
   };
 
-  home-manager = {
-    useGlobalPkgs = true;
-    useUserPackages = true;
-    users.walkah = import "${dotfiles}/home.nix";
-  };
-
-  users.users.walkah = {
-    home = "/Users/walkah";
-    shell = pkgs.zsh;
-  };
-
   system.stateVersion = 4;
 }

nix/modules/base/nixos.nix

@@ -1,6 +1,12 @@
-{ config, ... }: {
+{ config, pkgs, ... }: {
 
-  imports = [ ./common.nix ../monitoring ];
+  imports = [ ./common.nix ../monitoring ../../users ];
+
+  environment.systemPackages = with pkgs; [
+    htop
+    inetutils
+    vim
+  ];
 
   nix = {
     gc = {

nix/modules/dev/default.nix

@@ -32,8 +32,5 @@
     nixd
     nixf
     nixpkgs-fmt
-
-    # My stuff
-    workon
   ];
 }