From b5c273e072fd7911cb45131a5d23378151d2a2d0 Mon Sep 17 00:00:00 2001
From: Martin Berg Alstad <git@martials.no>
Date: Sun, 6 Apr 2025 12:55:05 +0200
Subject: [PATCH] :sparkles: Just recipe to update single flake, moved some
 home configs

---
 README.md                |  8 +++++++-
 home-manager/btop.nix    |  2 ++
 home-manager/default.nix | 19 +++----------------
 home-manager/gpg.nix     |  9 +++++++++
 home-manager/gtk.nix     | 10 +++++++---
 justfile                 |  6 +++++-
 6 files changed, 33 insertions(+), 21 deletions(-)
 create mode 100644 home-manager/gpg.nix

diff --git a/README.md b/README.md
index e27012c..90098e9 100644
--- a/README.md
+++ b/README.md
@@ -57,5 +57,11 @@ Update and switch
 - Will update the flakes and nix-channel, then switch if there are no errors
 
 ```Shell
-  just update
+  just update-all
+```
+
+To update a single flake and rebuild
+
+```Shell
+  just update zen-browser
 ```
diff --git a/home-manager/btop.nix b/home-manager/btop.nix
index 244856c..bae5289 100644
--- a/home-manager/btop.nix
+++ b/home-manager/btop.nix
@@ -5,4 +5,6 @@
     enable = true;
     flavor = theme.flavor;
   };
+
+  programs.btop.enable = true;
 }
diff --git a/home-manager/default.nix b/home-manager/default.nix
index a1aa283..71172c5 100644
--- a/home-manager/default.nix
+++ b/home-manager/default.nix
@@ -1,5 +1,4 @@
 {
-  pkgs,
   inputs,
   common,
   ...
@@ -20,6 +19,7 @@ in
     ./fish.nix
     ./freetube.nix
     ./gtk.nix
+    ./gpg.nix
     ./kitty.nix
     ./media
     ./nextcloud.nix
@@ -31,8 +31,6 @@ in
     ./zen
   ];
 
-  dconf.enable = true;
-
   home = {
     username = username;
     homeDirectory = dir.home;
@@ -47,17 +45,6 @@ in
     stateVersion = common.system.version;
   };
 
-  programs = {
-    btop.enable = true;
-
-    # Let Home Manager install and manage itself.
-    home-manager.enable = true;
-  };
-
-  services = {
-    gpg-agent = {
-      enable = true;
-      pinentryPackage = pkgs.pinentry-curses;
-    };
-  };
+  # Let Home Manager install and manage itself.
+  programs.home-manager.enable = true;
 }
diff --git a/home-manager/gpg.nix b/home-manager/gpg.nix
new file mode 100644
index 0000000..1d2038c
--- /dev/null
+++ b/home-manager/gpg.nix
@@ -0,0 +1,9 @@
+{ pkgs, ... }:
+
+{
+  services.gpg-agent = {
+    enable = true;
+    enableFishIntegration = true;
+    pinentryPackage = pkgs.pinentry-curses;
+  };
+}
diff --git a/home-manager/gtk.nix b/home-manager/gtk.nix
index ac7876a..d59b3ec 100644
--- a/home-manager/gtk.nix
+++ b/home-manager/gtk.nix
@@ -1,15 +1,19 @@
 { theme, ... }:
 
 {
+  # TODO deprecated, remove
   catppuccin.gtk = {
     enable = true;
     flavor = theme.flavor;
     icon.enable = true;
   };
 
-  dconf.settings = {
-    # Prefer dark mode for all GTK apps
-    "org/gnome/desktop/interface".color-scheme = "prefer-dark";
+  dconf = {
+    enable = true;
+    settings = {
+      # Prefer dark mode for all GTK apps
+      "org/gnome/desktop/interface".color-scheme = "prefer-dark";
+    };
   };
 
   gtk.enable = true;
diff --git a/justfile b/justfile
index b4c4848..a654adf 100644
--- a/justfile
+++ b/justfile
@@ -17,12 +17,16 @@ switch *FLAGS:
 switch-now *FLAGS:
     nh os switch . {{FLAGS}}
 
-update:
+update-all:
     nix-channel --update
     nix flake update
 
     just switch
 
+update PKG:
+    nix flake update {{PKG}}
+    just switch
+
 # Encrypt all files in the repo using git-crypt
 lock:
     git-crypt lock