From 2f5395dc64e7607fbaeca4cc85461ab3ad7c0c3a Mon Sep 17 00:00:00 2001
From: Jo <jo@thevoid.cafe>
Date: Wed, 14 May 2025 08:07:40 +0200
Subject: [PATCH 1/3] =?UTF-8?q?=E2=9C=A8=20Add=20home=20packages=20for=20u?=
 =?UTF-8?q?ser=20`jo`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 homes/x86_64-linux/jo/default.nix | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/homes/x86_64-linux/jo/default.nix b/homes/x86_64-linux/jo/default.nix
index 39536ca..fa5d00e 100644
--- a/homes/x86_64-linux/jo/default.nix
+++ b/homes/x86_64-linux/jo/default.nix
@@ -4,8 +4,28 @@
   };
 
   home.packages = with pkgs; [
-    zed-editor
+    ## GENERAL
+    youtube-music
+    discord
+    ghostty
+    teams-for-linux
+    enpass
+
+    ## WEB
     firefox
+    ungoogled-chromium
+
+    ## EDITORS
+    nano
+    zed-editor
+    apostrophe
+    jetbrains.phpstorm
+    arduino-ide
+    obsidian
+
+    ## RUNTIMES and CLIs for development
+    bun
+    git
   ];
 
   home.stateVersion = "25.05";

From 01b12730125a94c729b48c2e7ff99543ea976db6 Mon Sep 17 00:00:00 2001
From: Jo <jo@thevoid.cafe>
Date: Wed, 14 May 2025 08:25:10 +0200
Subject: [PATCH 2/3] =?UTF-8?q?=E2=9C=A8=20Merge=20palette=20option=20into?=
 =?UTF-8?q?=20main=20Catppuccin=20home=20module=20config?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/home/themes/catppuccin/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/home/themes/catppuccin/default.nix b/modules/home/themes/catppuccin/default.nix
index 7e49943..11b0ccf 100644
--- a/modules/home/themes/catppuccin/default.nix
+++ b/modules/home/themes/catppuccin/default.nix
@@ -1,6 +1,7 @@
 {
   lib,
   self,
+  pkgs,
   config,
   osConfig,
   namespace,
@@ -9,12 +10,15 @@
   inherit (lib) mkEnableOption types mkIf;
   inherit (self.lib) mkOpt;
 
+  palette = (pkgs.lib.importJSON (config.catppuccin.sources.palette + "/palette.json")).${config.catppuccin.flavor}.colors;
+
   cfg = config.${namespace}.themes.catppuccin;
 in {
   options.${namespace}.themes.catppuccin = {
     enable = mkEnableOption "the Catppuccin theme, globally.";
     accent = mkOpt types.str "blue" "The accent colour to use.";
     flavor = mkOpt types.str "macchiato" "The flavor to use.";
+    palette = mkOpt (lib.types.attrsOf lib.types.raw) palette "a reference to the current active Catppuccin palette.";
   };
 
   config = mkIf cfg.enable {
@@ -28,6 +32,8 @@ in {
       cursors.flavor = cfg.flavor;
     };
 
-    ${namespace}.themes.catppuccin.gtk.enable = mkIf osConfig.${namespace}.desktop.gnome.enable true;
+    ${namespace}.themes.catppuccin = {
+      gtk.enable = mkIf osConfig.${namespace}.desktop.gnome.enable true;
+    };
   };
 }

From 6dc0e02a928fa33ef66bf045afd567e6c552f17f Mon Sep 17 00:00:00 2001
From: Jo <jo@thevoid.cafe>
Date: Wed, 14 May 2025 08:25:41 +0200
Subject: [PATCH 3/3] =?UTF-8?q?=E2=9C=A8=20Add=20user=20activation=20scrip?=
 =?UTF-8?q?t,=20which=20removes=20home=20manager=20backup=20files?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/home/themes/catppuccin/palette/default.nix | 14 --------------
 modules/nixos/services/home-manager/default.nix    | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 14 deletions(-)
 delete mode 100644 modules/home/themes/catppuccin/palette/default.nix
 create mode 100644 modules/nixos/services/home-manager/default.nix

diff --git a/modules/home/themes/catppuccin/palette/default.nix b/modules/home/themes/catppuccin/palette/default.nix
deleted file mode 100644
index 6fdff23..0000000
--- a/modules/home/themes/catppuccin/palette/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  namespace,
-  ...
-}: let
-  inherit (lib) mkOption mkIf;
-  palette = (pkgs.lib.importJSON (config.catppuccin.sources.palette + "/palette.json")).${config.catppuccin.flavor}.colors;
-in {
-  options.${namespace}.themes.catppuccin.palette = mkOption {type = lib.types.attrsOf lib.types.raw;};
-
-  config.${namespace}.themes.catppuccin.palette = mkIf config.${namespace}.themes.catppuccin.enable palette;
-}
diff --git a/modules/nixos/services/home-manager/default.nix b/modules/nixos/services/home-manager/default.nix
new file mode 100644
index 0000000..017f26a
--- /dev/null
+++ b/modules/nixos/services/home-manager/default.nix
@@ -0,0 +1,14 @@
+{...}: {
+  # Todo: rewrite as recursive operation, based on ${namespace}.users
+  system.userActivationScripts = {
+    removeConflictingHomeManagerBackups = {
+      text = ''
+        rm -f /home/jo/.gtkrc-2.0.homeManagerBackupFileExtension
+        rm -f /home/jo/.config/gtk-3.0/gtk.css.homeManagerBackupFileExtension
+        rm -f /home/jo/.config/gtk-4.0/gtk.css.homeManagerBackupFileExtension
+      '';
+    };
+  };
+
+  home-manager.backupFileExtension = "homeManagerBackupFileExtension";
+}