From e1513e49cbff04898e1a8784887abe11f472f923 Mon Sep 17 00:00:00 2001
From: Adithya Nair <adtya@adtya.xyz>
Date: Tue, 4 Apr 2023 09:10:12 +0530
Subject: [PATCH] refactor

---
 system/default.nix  | 1 -
 system/gtk.nix      | 7 -------
 system/packages.nix | 3 ++-
 system/services.nix | 4 ++++
 4 files changed, 6 insertions(+), 9 deletions(-)
 delete mode 100644 system/gtk.nix

diff --git a/system/default.nix b/system/default.nix
index 7dff2d0..cf6f714 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -4,7 +4,6 @@
 , ...
 }: {
   imports = [
-    ./gtk.nix
     ./hardware.nix
     ./packages.nix
     ./persistence.nix
diff --git a/system/gtk.nix b/system/gtk.nix
deleted file mode 100644
index d0ed69c..0000000
--- a/system/gtk.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ ... }: {
-  programs.dconf.enable = true;
-  programs.seahorse.enable = true;
-  services.gnome.gnome-keyring.enable = true;
-  security.pam.services.passwd.enableGnomeKeyring = true;
-  security.pam.services.login.enableGnomeKeyring = true;
-}
diff --git a/system/packages.nix b/system/packages.nix
index 1586897..82a244b 100644
--- a/system/packages.nix
+++ b/system/packages.nix
@@ -14,6 +14,7 @@
 
   hardware.gpgSmartcards.enable = true;
   programs = {
+  dconf.enable = true;
     git.enable = true;
     gnupg.agent = {
       enable = true;
@@ -27,9 +28,9 @@
       viAlias = true;
       vimAlias = true;
     };
+  seahorse.enable = true;
     xwayland.enable = true;
     zsh.enable = true;
   };
   environment.pathsToLink = [ "/share/zsh" ];
-  security.pam.services.swaylock = { };
 }
diff --git a/system/services.nix b/system/services.nix
index 8c3a835..eeea204 100644
--- a/system/services.nix
+++ b/system/services.nix
@@ -8,6 +8,7 @@
     };
     fstrim.enable = true;
     fwupd.enable = true;
+    gnome.gnome-keyring.enable = true;
     gvfs.enable = true;
     lvm.dmeventd.enable = true;
     pcscd.enable = true;
@@ -23,4 +24,7 @@
     udev.packages = [ pkgs.yubikey-personalization ];
     udisks2.enable = true;
   };
+  security.pam.services.passwd.enableGnomeKeyring = true;
+  security.pam.services.login.enableGnomeKeyring = true;
+  security.pam.services.swaylock = { };
 }