From a899f33fda9f304671d921b3f4916fcf61d4f6c0 Mon Sep 17 00:00:00 2001
From: GHOSCHT <31184695+GHOSCHT@users.noreply.github.com>
Date: Sat, 11 Nov 2023 15:33:30 +0100
Subject: [PATCH] Add secret management

---
 hosts/configuration.nix           |  2 +-
 hosts/desktop/default.nix         | 13 ++++++-------
 modules/secrets/gnome-keyring.nix | 11 +++++++++++
 modules/secrets/gpg.nix           | 20 ++++++++++++++++++++
 4 files changed, 38 insertions(+), 8 deletions(-)
 create mode 100644 modules/secrets/gnome-keyring.nix
 create mode 100644 modules/secrets/gpg.nix

diff --git a/hosts/configuration.nix b/hosts/configuration.nix
index 0ffa11a..2b4fa1f 100644
--- a/hosts/configuration.nix
+++ b/hosts/configuration.nix
@@ -27,7 +27,7 @@
   # Enable the X11 windowing system.
   # services.xserver.enable = true;
 
-  programs.ssh.startAgent = true;
+  # programs.ssh.startAgent = true;
 
   # Enable the KDE Plasma Desktop Environment.
   services.xserver.displayManager.sddm.enable = true;
diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix
index 849ae70..9c6625a 100644
--- a/hosts/desktop/default.nix
+++ b/hosts/desktop/default.nix
@@ -14,6 +14,8 @@
     ../../modules/virtualization/docker.nix
     ../../modules/virtualization/qemu.nix
     ../../modules/programs/games.nix
+    ../../modules/secrets/gnome-keyring.nix
+    ../../modules/secrets/gpg.nix
     # ../../modules/services/easyeffects.nix
   ];
 
@@ -39,16 +41,13 @@
       extraBackends = [unstable.utsushi];
     };
   };
-
   services.udev.packages = [unstable.utsushi];
 
-  # hyprland.enable = true;
-  kde.enable = true;
+  # Desktops
+  hyprland.enable = false;
+  kde.enable = false;
   awesome.enable = true;
-  # home-manager.users.${vars.user} = {
-  #   services.kdeconnect.enable = true;
-  # };
-  nixpkgs.config.librewolf.enablePlasmaBrowserIntegration = true;
+
   programs.kdeconnect.enable = true;
   environment = {
     systemPackages = with pkgs;
diff --git a/modules/secrets/gnome-keyring.nix b/modules/secrets/gnome-keyring.nix
new file mode 100644
index 0000000..701b31f
--- /dev/null
+++ b/modules/secrets/gnome-keyring.nix
@@ -0,0 +1,11 @@
+{
+  config,
+  lib,
+  pkgs,
+  vars,
+  ...
+}: {
+  security.pam.services.${vars.user}.enableGnomeKeyring = true;
+  services.gnome.gnome-keyring.enable = true;
+  programs.seahorse.enable = true;
+}
diff --git a/modules/secrets/gpg.nix b/modules/secrets/gpg.nix
new file mode 100644
index 0000000..d1eedf3
--- /dev/null
+++ b/modules/secrets/gpg.nix
@@ -0,0 +1,20 @@
+{
+  config,
+  lib,
+  pkgs,
+  vars,
+  ...
+}: {
+  home-manager.users.${vars.user} = {
+    programs.gpg = {
+      enable = true;
+    };
+    services.gpg-agent = {
+      enable = true;
+      enableSshSupport = true;
+      enableFishIntegration = true;
+      enableZshIntegration = true;
+      pinentryFlavor = "gnome3";
+    };
+  };
+}