nix/hosts/alymac/default.nix

@@ -8,6 +8,7 @@ let
       libtool
       patchelf
       pcre
+      pinentry
       pkg-config
     ];
 
@@ -21,6 +22,7 @@ let
       ffmpeg
       fzf
       gh
+      # git # already managed by home-manager
       git-crypt
       gitui
       gnupg
@@ -28,6 +30,7 @@ let
       kubectl
       kubelogin-oidc
       mosh
+      neovim
       nixpkgs-fmt
       ripgrep
       sops
@@ -67,6 +70,8 @@ let
 
 in
 {
+  imports = [];
+
   # Absolutely proprietary.
   nixpkgs.config.allowUnfree = true;
 
@@ -90,18 +95,36 @@ in
   home-manager = {
     useGlobalPkgs = true;
     useUserPackages = true;
-    extraSpecialArgs =  { inherit dotfiles; };
     users.alyxia = { pkgs, ... }: {
-      imports = [ ./zsh.nix ./git.nix ./nvim.nix ];
-
       home = {
         packages = packageSets.everything;
+      };
 
-        file.".npmrc".text = ''
+      programs.zsh = {
-          prefix = ''${HOME}/.npm-packages
+        enable = true;
+        initExtra = ''
+          export GPG_TTY=$(tty)
+          source ${dotfiles}/zsh/zshrc
         '';
       };
 
+      programs.git = {
+        enable = true;
+        package = pkgs.gitAndTools.gitFull; # contains git send-email et al
+
+        userName = "Alyxia Sother";
+        userEmail = "alyxia@riseup.net";
+
+        signing = {
+          key = "01E16C4E775A37E4";
+          signByDefault = true;
+        };
+
+        delta.enable = true;
+      };
+
+      programs.gitui.enable = true;
+
       # DO NOT CHANGE UNLESS YOU ARE ABSOLUTELY SURE ALL STATE AFFECTED BY THIS
       # OPTION IS APPROPRIATELY MIGRATED!!!
       home.stateVersion = "23.05"; # did you read the comment?
@@ -128,7 +151,6 @@ in
       "croc"
       "ddev"
       "mkcert"
-      "pinentry-mac"
       "pkg-config"
       "sdl2"
     ];

nix/hosts/alymac/git.nix

@@ -1,20 +0,0 @@
-{ pkgs, dotfiles, ... }:
-
-{
-  programs.git = {
-    enable = true;
-    package = pkgs.gitAndTools.gitFull; # contains git send-email et al
-
-    userName = "Alyxia Sother";
-    userEmail = "alyxia@riseup.net";
-
-    signing = {
-      key = "01E16C4E775A37E4";
-      signByDefault = true;
-    };
-
-    delta.enable = true;
-  };
-
-  programs.gitui.enable = true;
-}

nix/hosts/alymac/nvim.nix

@@ -1,31 +0,0 @@
-{ pkgs, dotfiles, ... }:
-
-{
-  programs.neovim = {
-    enable = true;
-    package = pkgs.neovim-unwrapped;
-
-    extraConfig = "source ${dotfiles}/nvim/init.vim";
-
-    coc = {
-      enable = true;
-
-      settings = {
-        languageserver = {
-          nix = {
-            command = "nil";
-            filetypes = [ "nix" ];
-            rootPatterns = [ "flake.nix" ];
-            "settings.nil" = {
-              "formatting.command" = ["nixpkgs-fmt"];
-            };
-          };
-          "go.goPlsOptions" = {
-            completion = true;
-            completeUnimported = true;
-          };
-        };
-      };
-    };
-  };
-}

nix/hosts/alymac/zsh.nix

@@ -1,13 +0,0 @@
-{ dotfiles, ... }:
-
-{
-  programs.zsh = {
-    enable = true;
-    initExtra = ''
-      export GPG_TTY=$(tty)
-      source ${dotfiles}/zsh/zshrc
-
-      export PATH="$PATH:$HOME/.npm-packages/bin"
-    '';
-  };
-}