diff options
| -rw-r--r-- | nixos/common.nix | 12 | ||||
| -rw-r--r-- | nixos/kde.nix | 6 | ||||
| -rw-r--r-- | nixpkgs/common.nix | 4 |
3 files changed, 15 insertions, 7 deletions
diff --git a/nixos/common.nix b/nixos/common.nix index 067326f..e7d3581 100644 --- a/nixos/common.nix +++ b/nixos/common.nix @@ -158,13 +158,13 @@ in true; # Open ports in the firewall for Source Dedicated Server }; - # Some programs need SUID wrappers, can be configured further or are - # started in user sessions. programs.mtr.enable = true; - programs.gnupg.agent = { - enable = true; - #enableSSHSupport = true; - }; + + # redundant with home-manager config + # programs.gnupg.agent = { + # enable = true; + # enableSSHSupport = false; + # }; # List services that you want to enable: diff --git a/nixos/kde.nix b/nixos/kde.nix index 8ca19bb..d4b86e9 100644 --- a/nixos/kde.nix +++ b/nixos/kde.nix @@ -2,5 +2,9 @@ services.xserver.displayManager.sddm.enable = true; services.xserver.desktopManager.plasma5.enable = true; - environment.systemPackages = with pkgs.libsForQt5; [ kgpg ark pkgs.libreoffice-qt ]; + environment.systemPackages = with pkgs.libsForQt5; [ + kgpg + ark + pkgs.libreoffice-qt + ]; } diff --git a/nixpkgs/common.nix b/nixpkgs/common.nix index 6256187..570ef7b 100644 --- a/nixpkgs/common.nix +++ b/nixpkgs/common.nix @@ -45,6 +45,10 @@ 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; |