From b4c39e64cde3fdc204e07c56ed856cdc76322b68 Mon Sep 17 00:00:00 2001
From: Nikolaos Karaolidis <nick@karaolidis.com>
Date: Thu, 25 Jul 2024 16:36:26 +0100
Subject: [PATCH] Clean up home directory

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
---
 .../user/configs/console/zsh/default.nix      |  9 ++-
 hosts/common/user/configs/gui/gtk/default.nix | 15 ++++-
 .../user/configs/gui/obsidian/options.nix     | 58 +++++++------------
 3 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/hosts/common/user/configs/console/zsh/default.nix b/hosts/common/user/configs/console/zsh/default.nix
index 0590e05..8fc96f6 100644
--- a/hosts/common/user/configs/console/zsh/default.nix
+++ b/hosts/common/user/configs/console/zsh/default.nix
@@ -7,6 +7,8 @@ let
   hmConfig = config.home-manager.users.${username};
 in
 {
+  environment.sessionVariables.ZDOTDIR = "$HOME/.config/zsh";
+
   home-manager.users.${username} = {
     programs.zsh = {
       enable = true;
@@ -21,8 +23,9 @@ in
       syntaxHighlighting.enable = true;
     };
 
-    home.persistence."/persist${userConfig.home}".directories = [
-      "${hmConfig.xdg.relativeDataHome}/zsh"
-    ];
+    home = {
+      file.".zshenv".enable = false;
+      persistence."/persist${userConfig.home}".directories = [ "${hmConfig.xdg.relativeDataHome}/zsh" ];
+    };
   };
 }
diff --git a/hosts/common/user/configs/gui/gtk/default.nix b/hosts/common/user/configs/gui/gtk/default.nix
index 98ab183..af5969e 100644
--- a/hosts/common/user/configs/gui/gtk/default.nix
+++ b/hosts/common/user/configs/gui/gtk/default.nix
@@ -36,7 +36,20 @@ in
       gtk4.extraCss = "@import './theme.css';";
     };
 
-    home.pointerCursor.gtk.enable = true;
+    home = {
+      pointerCursor.gtk.enable = true;
+
+      file =
+        {
+          ".icons/default/index.theme".enable = false;
+        }
+        // builtins.listToAttrs (
+          builtins.map (name: {
+            name = ".icons/${name}";
+            value.enable = false;
+          }) (hmConfig.theme.icon.names ++ hmConfig.theme.cursor.names)
+        );
+    };
 
     programs.matugen.settings.templates = {
       gtk3 = {
diff --git a/hosts/common/user/configs/gui/obsidian/options.nix b/hosts/common/user/configs/gui/obsidian/options.nix
index 0d6a19c..c4c9f07 100644
--- a/hosts/common/user/configs/gui/obsidian/options.nix
+++ b/hosts/common/user/configs/gui/obsidian/options.nix
@@ -359,9 +359,7 @@ in
           let
             mkApp = vault: {
               name = "${vault.target}/.obsidian/app.json";
-              value = {
-                source = (pkgs.formats.json { }).generate "app.json" vault.settings.app;
-              };
+              value.source = (pkgs.formats.json { }).generate "app.json" vault.settings.app;
             };
 
             mkAppearance = vault: {
@@ -389,33 +387,27 @@ in
               [
                 {
                   name = "${vault.target}/.obsidian/core-plugins.json";
-                  value = {
-                    source = (pkgs.formats.json { }).generate "core-plugins.json" (
-                      builtins.map toName vault.settings.corePlugins
-                    );
-                  };
+                  value.source = (pkgs.formats.json { }).generate "core-plugins.json" (
+                    builtins.map toName vault.settings.corePlugins
+                  );
                 }
                 {
                   name = "${vault.target}/.obsidian/core-plugins-migration.json";
-                  value = {
-                    source = (pkgs.formats.json { }).generate "core-plugins-migration.json" (
-                      builtins.listToAttrs (
-                        builtins.map (name: {
-                          inherit name;
-                          value = builtins.any (
-                            plugin: name == (toName plugin) && isEnabled plugin
-                          ) vault.settings.corePlugins;
-                        }) corePlugins
-                      )
-                    );
-                  };
+                  value.source = (pkgs.formats.json { }).generate "core-plugins-migration.json" (
+                    builtins.listToAttrs (
+                      builtins.map (name: {
+                        inherit name;
+                        value = builtins.any (
+                          plugin: name == (toName plugin) && isEnabled plugin
+                        ) vault.settings.corePlugins;
+                      }) corePlugins
+                    )
+                  );
                 }
               ]
               ++ builtins.map (plugin: {
                 name = "${vault.target}/.obsidian/${plugin.name}.json";
-                value = {
-                  source = (pkgs.formats.json { }).generate "${plugin.name}.json" plugin.options;
-                };
+                value.source = (pkgs.formats.json { }).generate "${plugin.name}.json" plugin.options;
               }) (builtins.filter hasOptions vault.settings.corePlugins);
 
             mkCommunityPlugins =
@@ -423,11 +415,9 @@ in
               [
                 {
                   name = "${vault.target}/.obsidian/community-plugins.json";
-                  value = {
-                    source = (pkgs.formats.json { }).generate "community-plugins.json" (
-                      builtins.map getManifest (builtins.filter isEnabled vault.settings.communityPlugins)
-                    );
-                  };
+                  value.source = (pkgs.formats.json { }).generate "community-plugins.json" (
+                    builtins.map getManifest (builtins.filter isEnabled vault.settings.communityPlugins)
+                  );
                 }
               ]
               ++ builtins.map (plugin: {
@@ -439,9 +429,7 @@ in
               }) vault.settings.communityPlugins
               ++ builtins.map (plugin: {
                 name = "${vault.target}/.obsidian/plugins/${getManifest plugin}/data.json";
-                value = {
-                  source = (pkgs.formats.json { }).generate "data.json" plugin.options;
-                };
+                value.source = (pkgs.formats.json { }).generate "data.json" plugin.options;
               }) (builtins.filter hasOptions vault.settings.communityPlugins);
 
             mkCssSnippets =
@@ -459,16 +447,12 @@ in
               vault:
               builtins.map (theme: {
                 name = "${vault.target}/.obsidian/themes/${getManifest theme}";
-                value = {
-                  source = toPkg theme;
-                };
+                value.source = toPkg theme;
               }) vault.settings.themes;
 
             mkHotkeys = vault: {
               name = "${vault.target}/.obsidian/hotkeys.json";
-              value = {
-                source = (pkgs.formats.json { }).generate "hotkeys.json" vault.settings.hotkeys;
-              };
+              value.source = (pkgs.formats.json { }).generate "hotkeys.json" vault.settings.hotkeys;
             };
 
             mkExtraFiles =