merge: host config cleanup

hosts/matej-nixos/configuration.nix

@@ -19,8 +19,6 @@ in
     inputs.self.nixosModules.openssh
     inputs.self.nixosModules.desktop
     inputs.self.nixosModules.printing
-    inputs.self.nixosModules.zsh
-    inputs.self.nixosModules.gnupg
   ];
 
   # Modules
@@ -28,8 +26,6 @@ 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,8 +16,6 @@
     inputs.self.nixosModules.openssh
     inputs.self.nixosModules.desktop
     inputs.self.nixosModules.printing
-    inputs.self.nixosModules.zsh
-    inputs.self.nixosModules.gnupg
   ];
 
   # Modules
@@ -25,8 +23,6 @@
   openssh.enable = true;
   desktop.enable = true;
   printing.enable = true;
-  zsh.enable = true;
-  gnupg.enable = true;
   sway.enable = true;
 
   # Stylix theming

lib/mkHost.nix

@@ -43,7 +43,6 @@ 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

@@ -1,20 +0,0 @@
-{
-  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

@@ -1,19 +0,0 @@
-{
-  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,7 +74,6 @@ in
     pkgs.mdformat
 
     # security
-    pkgs.gnupg
     pkgs.pass
   ];
 
@@ -85,6 +84,17 @@ 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,7 +1,6 @@
 {
   lib,
   config,
-  pkgs,
   ...
 }:
 let
@@ -12,7 +11,6 @@ in
     uid = 1000;
     isNormalUser = true;
     home = "/home/matej";
-    shell = pkgs.zsh;
     extraGroups = [
       "wheel"
       "docker"