From a3809f02f2a023f96225636857070890f13edfe8 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Thu, 12 Sep 2024 09:17:57 +0100
Subject: [PATCH] Switch back to using passSecretService

---
 system/default.nix           | 1 +
 system/desktop.nix           | 1 -
 system/home/shell/git.nix    | 2 +-
 system/home/sway/default.nix | 1 -
 4 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/system/default.nix b/system/default.nix
index 281ca8cb..afa1698c 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -197,6 +197,7 @@
     };
   };
   services = {
+    passSecretService.enable = true;
     upower.enable = true;
     power-profiles-daemon.enable = true;
     system76-scheduler = {
diff --git a/system/desktop.nix b/system/desktop.nix
index 526c1ee9..d3bac15e 100644
--- a/system/desktop.nix
+++ b/system/desktop.nix
@@ -37,7 +37,6 @@
   };
   gtk.iconCache.enable = true;
   services = {
-    gnome.gnome-keyring.enable = true;
     flatpak.enable = true;
     printing.enable = true;
     pipewire = {
diff --git a/system/home/shell/git.nix b/system/home/shell/git.nix
index a462f258..32c1d426 100644
--- a/system/home/shell/git.nix
+++ b/system/home/shell/git.nix
@@ -25,7 +25,7 @@
           hyprlinks = true;
           navigate = true;
           side-by-side = true;
-          syntax-theme = with config.programs; lib.mkIf bat.enable bat.config.theme;
+          syntax-theme = lib.mkIf config.programs.bat.enable config.programs.bat.config.theme;
         };
       };
       attributes = [
diff --git a/system/home/sway/default.nix b/system/home/sway/default.nix
index dbdee8f0..48e6d28f 100644
--- a/system/home/sway/default.nix
+++ b/system/home/sway/default.nix
@@ -22,7 +22,6 @@ in
     ../wlogout/default.nix
   ];
   home.packages = with pkgs; [
-    gnome.seahorse
     ffmpeg
     evince
     grim