merge: host config cleanup

hosts/matej-nixos/configuration.nix

@@ -19,6 +19,8 @@ in
     inputs.self.nixosModules.openssh
     inputs.self.nixosModules.desktop
     inputs.self.nixosModules.printing
+    inputs.self.nixosModules.zsh
+    inputs.self.nixosModules.gnupg
   ];
 
   # Modules
@@ -26,6 +28,8 @@ in
   openssh.enable = true;
   desktop.enable = true;
   printing.enable = true;
+  zsh.enable = true;
+  gnupg.enable = true;
 
   sway = {
     enable = true;

hosts/matej-tower/configuration.nix

@@ -16,6 +16,8 @@
     inputs.self.nixosModules.openssh
     inputs.self.nixosModules.desktop
     inputs.self.nixosModules.printing
+    inputs.self.nixosModules.zsh
+    inputs.self.nixosModules.gnupg
   ];
 
   # Modules
@@ -23,6 +25,8 @@
   openssh.enable = true;
   desktop.enable = true;
   printing.enable = true;
+  zsh.enable = true;
+  gnupg.enable = true;
   sway.enable = true;
 
   # Stylix theming

lib/mkHost.nix

@@ -43,6 +43,7 @@ nixpkgs.lib.nixosSystem {
     {
       home-manager.useGlobalPkgs = true;
       home-manager.useUserPackages = true;
+      home-manager.backupFileExtension = "backup";
       home-manager.users = userHMConfigs;
       home-manager.extraSpecialArgs = { inherit inputs; };
     }

modules/nixos/gnupg.nix

@@ -0,0 +1,20 @@
+{
+  lib,
+  config,
+  ...
+}:
+{
+  options = {
+    gnupg = {
+      enable = lib.mkEnableOption "GnuPG agent with SSH support";
+    };
+  };
+
+  config = lib.mkIf config.gnupg.enable {
+    programs.gnupg.agent = {
+      enable = true;
+      enableSSHSupport = true;
+      enableExtraSocket = true;
+    };
+  };
+}

modules/nixos/zsh.nix

@@ -0,0 +1,19 @@
+{
+  lib,
+  config,
+  ...
+}:
+{
+  options = {
+    zsh = {
+      enable = lib.mkEnableOption "zsh with ZDOTDIR in ~/.config/zsh";
+    };
+  };
+
+  config = lib.mkIf config.zsh.enable {
+    programs.zsh.enable = true;
+    environment.etc."zshenv".text = ''
+      export ZDOTDIR=$HOME/.config/zsh
+    '';
+  };
+}

users/matej/home-manager.nix

@@ -74,6 +74,7 @@ in
     pkgs.mdformat
 
     # security
+    pkgs.gnupg
     pkgs.pass
   ];
 
@@ -84,17 +85,6 @@ in
     nix-direnv.enable = true;
   };
 
-  programs.zsh = {
-    enable = true;
-    dotDir = "${config.xdg.configHome}/zsh";
-  };
-
-  services.gpg-agent = {
-    enable = true;
-    enableSshSupport = true;
-    enableExtraSocket = true;
-  };
-
   stylix.targets.neovim.enable = false;
   programs.neovim = {
     enable = true;

users/matej/nixos.nix

@@ -1,6 +1,7 @@
 {
   lib,
   config,
+  pkgs,
   ...
 }:
 let
@@ -11,6 +12,7 @@ in
     uid = 1000;
     isNormalUser = true;
     home = "/home/matej";
+    shell = pkgs.zsh;
     extraGroups = [
       "wheel"
       "docker"