From 161d78902ee583c898e6108af94a62fe3c5759d9 Mon Sep 17 00:00:00 2001
From: Vinzenz Schroeter <vinzenz.f.s@gmail.com>
Date: Thu, 2 Jan 2025 18:17:23 +0100
Subject: [PATCH] move some extensions from shared module to user module

---
 home/gnome-shared-dconf.nix |   4 --
 home/gnome.nix              |   5 --
 home/vinzenz/default.nix    | 116 +++++++++++++++++++-----------------
 home/vinzenz/gnome.nix      |  23 +++++++
 4 files changed, 83 insertions(+), 65 deletions(-)
 create mode 100644 home/vinzenz/gnome.nix

diff --git a/home/gnome-shared-dconf.nix b/home/gnome-shared-dconf.nix
index 32b7657..b9b3716 100644
--- a/home/gnome-shared-dconf.nix
+++ b/home/gnome-shared-dconf.nix
@@ -26,10 +26,6 @@
       "appindicatorsupport@rgcjonas.gmail.com"
       "workspace-indicator@gnome-shell-extensions.gcampax.github.com"
       "caffeine@patapon.info"
-      "GPaste@gnome-shell-extensions.gnome.org"
-      "gsconnect@andyholmes.github.io"
-      "solaar-extension@sidevesh"
-      "AlphabeticalAppGrid@stuarthayhurst"
     ];
   };
   "ca/desrt/dconf-editor" = {
diff --git a/home/gnome.nix b/home/gnome.nix
index 2b092b8..0310a7e 100644
--- a/home/gnome.nix
+++ b/home/gnome.nix
@@ -20,11 +20,6 @@
           ++ (with gnomeExtensions; [
             caffeine
             appindicator
-            gsconnect
-            # battery-health-charging
-            quick-settings-tweaker
-            solaar-extension
-            alphabetical-app-grid
           ]);
 
         dconf.settings = import ./gnome-shared-dconf.nix;
diff --git a/home/vinzenz/default.nix b/home/vinzenz/default.nix
index cac2a69..d2bca38 100644
--- a/home/vinzenz/default.nix
+++ b/home/vinzenz/default.nix
@@ -1,64 +1,68 @@
 inputs@{ pkgs, ... }:
 {
-  programs = {
-    home-manager.enable = true;
-    fzf.enable = true;
-    zsh = import ./zsh.nix inputs;
-    git = import ./git.nix;
-    vscode = import ./vscode.nix inputs;
-    ssh = import ./ssh.nix;
+  imports = [ ./gnome.nix ];
 
-    direnv = {
-      enable = true;
-      nix-direnv.enable = true;
+  config = {
+    programs = {
+      home-manager.enable = true;
+      fzf.enable = true;
+      zsh = import ./zsh.nix inputs;
+      git = import ./git.nix;
+      vscode = import ./vscode.nix inputs;
+      ssh = import ./ssh.nix;
+
+      direnv = {
+        enable = true;
+        nix-direnv.enable = true;
+      };
+
+      eza = {
+        enable = true;
+        git = true;
+        icons = "auto";
+        extraOptions = [
+          "--group-directories-first"
+          "--header"
+        ];
+      };
     };
 
-    eza = {
-      enable = true;
-      git = true;
-      icons = "auto";
-      extraOptions = [
-        "--group-directories-first"
-        "--header"
-      ];
+    editorconfig = import ./editorconfig.nix;
+
+    home.packages = with pkgs; [
+      keepassxc
+      insync
+
+      telegram-desktop
+      element-desktop
+
+      wireguard-tools
+      wirelesstools
+
+      alejandra # nix formatter
+
+      kdiff3
+      jetbrains-toolbox
+    ];
+
+    home.file."policy.json" = {
+      target = ".config/containers/policy.json";
+      text = ''
+        {
+            "default": [
+                {
+                    "type": "insecureAcceptAnything"
+                }
+            ],
+            "transports":
+                {
+                    "docker-daemon":
+                        {
+                            "": [{"type":"insecureAcceptAnything"}]
+                        }
+                }
+        }
+      '';
     };
   };
-
-  editorconfig = import ./editorconfig.nix;
-
-  home.packages = with pkgs; [
-    keepassxc
-    insync
-
-    telegram-desktop
-    element-desktop
-
-    wireguard-tools
-    wirelesstools
-
-    alejandra # nix formatter
-
-    kdiff3
-    jetbrains-toolbox
-  ];
-
-  home.file."policy.json" = {
-    target = ".config/containers/policy.json";
-    text = ''
-      {
-          "default": [
-              {
-                  "type": "insecureAcceptAnything"
-              }
-          ],
-          "transports":
-              {
-                  "docker-daemon":
-                      {
-                          "": [{"type":"insecureAcceptAnything"}]
-                      }
-              }
-      }
-    '';
-  };
 }
diff --git a/home/vinzenz/gnome.nix b/home/vinzenz/gnome.nix
new file mode 100644
index 0000000..4e70618
--- /dev/null
+++ b/home/vinzenz/gnome.nix
@@ -0,0 +1,23 @@
+inputs@{ pkgs, ... }:
+{
+  config = {
+    home.packages = with pkgs.gnomeExtensions; [
+      gsconnect
+      # battery-health-charging
+      quick-settings-tweaker
+      solaar-extension
+      alphabetical-app-grid
+    ];
+
+    dconf.settings = {
+      "org/gnome/shell" = {
+        enabled-extensions = [
+          "GPaste@gnome-shell-extensions.gnome.org"
+          "gsconnect@andyholmes.github.io"
+          "solaar-extension@sidevesh"
+          "AlphabeticalAppGrid@stuarthayhurst"
+        ];
+      };
+    };
+  };
+}