diff options
| -rw-r--r-- | nixos/common.nix | 8 | ||||
| -rw-r--r-- | nixos/lindy.nix | 6 | ||||
| -rw-r--r-- | nixpkgs/common.nix | 4 | ||||
| -rw-r--r-- | nixpkgs/kusanagi.nix | 5 |
4 files changed, 11 insertions, 12 deletions
diff --git a/nixos/common.nix b/nixos/common.nix index e7d3581..87ae74c 100644 --- a/nixos/common.nix +++ b/nixos/common.nix @@ -160,14 +160,6 @@ in programs.mtr.enable = true; - # redundant with home-manager config - # programs.gnupg.agent = { - # enable = true; - # enableSSHSupport = false; - # }; - - # List services that you want to enable: - # Enable the OpenSSH daemon. # services.openssh.enable = true; diff --git a/nixos/lindy.nix b/nixos/lindy.nix index eb55cf2..2c07527 100644 --- a/nixos/lindy.nix +++ b/nixos/lindy.nix @@ -88,6 +88,12 @@ Kogami UUID=61534c91-df18-4c71-9244-54e677f5d4fa /root/kogami_key virtualisation.virtualbox.host.enable = true; users.users.lx.extraGroups = [ "docker" "vboxusers" ]; + # GnuPG agent at system level, if at home level conflicts with arch + programs.gnupg.agent = { + enable = true; + enableSSHSupport = false; + }; + environment.systemPackages = with pkgs; [ zfs docker-compose ]; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; diff --git a/nixpkgs/common.nix b/nixpkgs/common.nix index 570ef7b..6256187 100644 --- a/nixpkgs/common.nix +++ b/nixpkgs/common.nix @@ -45,10 +45,6 @@ videos = null; }; - services.gpg-agent.enable = true; - services.gpg-agent.enableSshSupport = false; - services.gpg-agent.pinentryFlavor = "qt"; - services.syncthing.enable = true; nixpkgs.config.allowUnfree = true; diff --git a/nixpkgs/kusanagi.nix b/nixpkgs/kusanagi.nix index 56d3dc4..2eb8900 100644 --- a/nixpkgs/kusanagi.nix +++ b/nixpkgs/kusanagi.nix @@ -3,5 +3,10 @@ home.homeDirectory = "/home/lx"; xdg.userDirs.download = "/home/lx/Downloads"; + + services.gpg-agent.enable = true; + services.gpg-agent.enableSshSupport = false; + services.gpg-agent.pinentryFlavor = "qt"; + services.gpg-agent.extraConfig = "no-allow-external-cache"; } |