refactor: make legacy darwinConfigurations running well

devShells.nix

@@ -4,7 +4,7 @@
 { self, ... }:
 
 {
-  perSystem = { pkgs, ... }:
+  perSystem = { pkgs, config, ... }:
     {
       pre-commit.check.enable = true;
       pre-commit.devShell = self.devShells.default;
@@ -23,7 +23,11 @@
 
 
       devShells = {
-        default = pkgs.mkShell { };
+        default = pkgs.mkShell {
+          shellHook = ''
+            ${config.pre-commit.installationScript}
+          '';
+        };
         #
         #
         #    $ nix develop github:r17x/nixpkgs#node18

flake.nix

@@ -13,7 +13,6 @@
       ./overlays
       ./modules/parts
       ./hosts
-      ./users
     ];
   };
 
@@ -53,6 +52,9 @@
     # utilities
     precommit.url = "github:cachix/pre-commit-hooks.nix";
     precommit.inputs.nixpkgs.follows = "nixpkgs";
+    # dvt
+    dvt.url = "github:efishery/dvt";
+    dvt.inputs.nixpkgs.follows = "nixpkgs";
 
     # vimPlugins from flake inputs
     # prefix "vimPlugins_"

home/shells.nix

@@ -110,7 +110,7 @@ in
 {
   home = with pkgs;{
     sessionVariables = {
-      OPENAI_API_KEY = "$(cat ${config.sops.secrets.openai_api_key.path})";
+      # OPENAI_API_KEY = "$(cat ${config.sops.secrets.openai_api_key.path})";
     };
 
     inherit shellAliases;

hosts/default.nix

@@ -1,40 +1,99 @@
-{ ... }:
+{ self, withSystem, inputs, ... }:
 
 let
-  sharedModules = [
-    ../shared/darwin/gpg.nix
-    ../shared/darwin/homebrew.nix
-    ../shared/darwin/network.nix
-    ../shared/darwin/packages.nix
-    ../shared/darwin/system.nix
-  ];
+  inherit (inputs.nixpkgs.lib) attrValues;
+
+  mkDarwin = name: { system ? "aarch64-darwin", user ? self.users.default, stateVersion ? 4, homeManagerStateVersion ? "23.05", modules ? [ ] }: withSystem system (ctx:
+    inputs.darwin.lib.darwinSystem {
+      inherit inputs;
+      inherit (ctx) system;
+
+      modules = attrValues self.commonModules
+        ++ attrValues self.darwinModules
+        ++ [
+        # Composed home-manager configuration.
+        inputs.home.darwinModules.home-manager
+        ({ pkgs, ... }: {
+          inherit (ctx) nix;
+          _module.args = ctx.extraModuleArgs;
+          nixpkgs = removeAttrs ctx.nixpkgs [ "hostPlatform" ];
+          system.stateVersion = stateVersion;
+          users.primaryUser = user;
+          networking.hostName = name;
+          networking.computerName = name;
+          environment.systemPackages = ctx.basePackagesFor pkgs;
+          # `home-manager` config
+          users.users.${user.username} = {
+            home = "/Users/${user.username}";
+            shell = pkgs.fish;
+          };
+          home-manager.useGlobalPkgs = true;
+          home-manager.useUserPackages = true;
+          home-manager.users.${user.username} = {
+            imports = attrValues self.homeManagerModules ++ [ inputs.sops.homeManagerModule ];
+            home.stateVersion = homeManagerStateVersion;
+            home.user-info = user;
+            home.packages = [ pkgs.sops ];
+            sops.gnupg.home = "~/.gnupg";
+            sops.gnupg.sshKeyPaths = [ ];
+            sops.defaultSopsFile = ../secrets/secret.yaml;
+            # git diff integrations
+            programs.git.extraConfig.diff.sopsdiffer.textconv = "sops -d";
+          };
+        })
+      ] ++ modules;
+    }
+  );
+
+  mkDarwinConfigurations = configurations: builtins.mapAttrs (name: opt: mkDarwin name opt) configurations;
 in
 
 {
-  # nix-darwin configurations
-  parts.darwinConfigurations = {
-    # Apple M1
-    eR17x = {
-      system = "aarch64-darwin";
-      stateVersion = 4;
-      modules = sharedModules;
+  flake.users = {
+    default = rec {
+      username = "r17";
+      fullName = "Rin";
+      email = "hi@rin.rocks";
+      nixConfigDirectory = "/Users/${username}/.config/nixpkgs";
+      within = {
+        neovim.enable = true;
+        gpg.enable = true;
+        pass.enable = true;
+      };
     };
   };
-
-  # NixOS configurations
-  # parts.nixosConfigurations = {
-  #  linuxBased = {
-  #    system = "x86_64-linux";
-  #    stateVersion = "23.05";
-
-  #    modules = [];
-  #  };
-  #  wsl2 = {
-  #    system = "x86_64-linux";
-  #    stateVersion = "22.05"; # only change this if you know what you are doing.
-  #    wsl = true;
-
-  #    modules = [ ];
-  #  };
-  #};
+  flake.commonModules = {
+    system-shells = import ../shared/shells.nix;
+    users-primaryUser = import ../shared/user.nix;
+    programs-nix-index = import ../shared/nix-index.nix;
+  };
+  flake.darwinModules = {
+    system-darwin = import ../shared/darwin/system.nix;
+    system-darwin-packages = import ../shared/darwin/packages.nix;
+    system-darwin-gpg = import ../shared/darwin/gpg.nix;
+    system-darwin-window-manager = import ../shared/darwin/mouseless.nix;
+    system-darwin-homebrew = import ../shared/darwin/homebrew.nix;
+    system-darwin-network = import ../shared/darwin/network.nix;
+  };
+  # `home-manager` modules
+  flake.homeManagerModules = {
+    r17-alacritty = import ../home/alacritty.nix;
+    r17-activation = import ../home/activation.nix;
+    r17-packages = import ../home/packages.nix;
+    r17-shell = import ../home/shells.nix;
+    r17-git = import ../home/git.nix;
+    r17-tmux = import ../home/tmux.nix;
+    r17-neovim = import ../home/neovim.nix;
+    gpg = import ../home/gpg.nix;
+    pass = import ../home/pass.nix;
+    home-user-info = { lib, ... }: {
+      options.home.user-info =
+        (self.commonModules.users-primaryUser { inherit lib; }).options.users.primaryUser;
+    };
+  };
+  # nix-darwin configurations
+  flake.darwinConfigurations = mkDarwinConfigurations {
+    eR17 = { };
+    eR17x = { };
+  };
 }

lib/mkFlake2VimPlugin.nix

@@ -5,7 +5,7 @@ inputs:
 }:
 
 let
-  builder = src: pkgs.vimUtils.buildVimPluginFrom2Nix rec {
+  builder = src: pkgs.vimUtils.buildVimPlugin rec {
     inherit src;
     pname = src.name;
     version = src.lastModifiedDate;

modules/parts/default.nix

@@ -1,10 +1,7 @@
 { self, inputs, ... }:
 
 {
-  imports = [
-    ./home.nix
-    ./darwin.nix
-  ];
+  imports = [ ];
 
   perSystem = { lib, pkgs, system, inputs', ... }: {
     formatter = inputs.nixpkgs-fmt.defaultPackage.${system};
@@ -29,9 +26,7 @@
 
         hostPlatform = system;
 
-        overlays = lib.mkForce [
-          self.overlays.default
-        ];
+        overlays = lib.mkForce [ self.overlays.default ];
       };
 
       # Extra arguments passed to the module system for nix-darwin, NixOS, and home-manager