From cfe198ee85f3c5ee41f4221f49b73dd492b42fdc Mon Sep 17 00:00:00 2001
From: Collin Williams <96917990+bluedragon1221@users.noreply.github.com>
Date: Tue, 8 Jul 2025 10:54:48 -0500
Subject: move dconf to system

---
 modules/desktop/home/default.nix                   |  3 -
 .../desktop/home/environments/gnome/default.nix    | 67 ---------------------
 modules/desktop/home/programs/blackbox.nix         | 30 ----------
 modules/desktop/system/default.nix                 |  1 +
 modules/desktop/system/environments/gnome.nix      | 69 ++++++++++++++++++++--
 modules/desktop/system/programs/blackbox.nix       | 31 ++++++++++
 6 files changed, 95 insertions(+), 106 deletions(-)
 delete mode 100644 modules/desktop/home/environments/gnome/default.nix
 delete mode 100644 modules/desktop/home/programs/blackbox.nix
 create mode 100644 modules/desktop/system/programs/blackbox.nix

(limited to 'modules')

diff --git a/modules/desktop/home/default.nix b/modules/desktop/home/default.nix
index cab01fe..be5e97f 100644
--- a/modules/desktop/home/default.nix
+++ b/modules/desktop/home/default.nix
@@ -1,8 +1,5 @@
 {
   imports = [
-    ./environments/gnome
     ./gtk
-
-    ./programs/blackbox.nix
   ];
 }
diff --git a/modules/desktop/home/environments/gnome/default.nix b/modules/desktop/home/environments/gnome/default.nix
deleted file mode 100644
index 9b248ea..0000000
--- a/modules/desktop/home/environments/gnome/default.nix
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-  pkgs,
-  config,
-  lib,
-  ...
-}: let
-  cfg = config.collinux.desktop.gnome;
-in
-  lib.mkIf cfg.enable {
-    home.packages = with pkgs.gnomeExtensions; [
-      blur-my-shell
-      dash-to-dock
-    ];
-
-    dconf = {
-      enable = true;
-      settings = {
-        "org/gnome/mutter" = {
-          workspaces-only-on-primary = false;
-        };
-        "org/gnome/shell/app-switcher" = {
-          current-workspace-only = true;
-        };
-
-        # Idle settings
-        "org/gnome/desktop/session" = {
-          idle-delay = 0;
-        };
-        "org/gnome/settings-daemon/plugins/power" = {
-          sleep-inactive-ac-type = "nothing";
-        };
-
-        # Keybindings
-        "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0" = {
-          binding = "<Super>Return";
-          command = "blackbox";
-          name = "Terminal";
-        };
-        "org/gnome/settings-daemon/plugins/media-keys" = {
-          custom-keybindings = [
-            "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/"
-          ];
-        };
-
-        # Background
-        "org/gnome/desktop/background" = rec {
-          picture-uri = "file://${pkgs.gnome-backgrounds}/share/backgrounds/gnome/blobs-d.svg";
-          picture-uri-dark = picture-uri;
-        };
-
-        # Extensions
-        "org/gnome/shell" = {
-          disable-user-extensions = false;
-          enabled-extensions = with pkgs.gnomeExtensions; [
-            blur-my-shell.extensionUuid
-            dash-to-dock.extensionUuid
-          ];
-        };
-
-        "org/gnome/shell/extensions/dash-to-dock" = {
-          dash-max-icon-size = 48;
-          show-trash = false;
-          show-mounts = false;
-        };
-      };
-    };
-  }
diff --git a/modules/desktop/home/programs/blackbox.nix b/modules/desktop/home/programs/blackbox.nix
deleted file mode 100644
index c2d9520..0000000
--- a/modules/desktop/home/programs/blackbox.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}: let
-  cfg = config.collinux.desktop.programs.blackbox;
-in
-  lib.mkIf cfg.enable {
-    home.packages = [pkgs.blackbox-terminal];
-
-    dconf = {
-      enable = true;
-      settings = {
-        "com/raggesilver/BlackBox" = {
-          context-aware-header-bar = true;
-          fill-tabs = true;
-          notify-process-completion = true;
-          opacity = 100;
-          pixel-scrolling = true;
-          pretty = true;
-          show-scrollbars = false;
-          terminal-padding = "(10, 10, 10, 10)";
-
-          floating-controls = false;
-          show-headerbar = true;
-        };
-      };
-    };
-  }
diff --git a/modules/desktop/system/default.nix b/modules/desktop/system/default.nix
index 8ebe9b0..efc39bc 100644
--- a/modules/desktop/system/default.nix
+++ b/modules/desktop/system/default.nix
@@ -5,6 +5,7 @@
 
     ./programs/firefox.nix
     ./programs/foot.nix
+    ./programs/blackbox.nix
 
     ./components/fuzzel.nix
     ./components/dunst.nix
diff --git a/modules/desktop/system/environments/gnome.nix b/modules/desktop/system/environments/gnome.nix
index e4f6922..e298756 100644
--- a/modules/desktop/system/environments/gnome.nix
+++ b/modules/desktop/system/environments/gnome.nix
@@ -7,13 +7,11 @@
   cfg = config.collinux.desktop.gnome;
 in
   lib.mkIf cfg.enable {
-    services.xserver = {
-      displayManager.gdm = {
-        enable = true;
-        wayland = true;
-      };
-      desktopManager.gnome.enable = true;
+    services.displayManager.gdm = {
+      enable = true;
+      wayland = true;
     };
+    services.desktopManager.gnome.enable = true;
 
     environment.gnome.excludePackages = with pkgs; [
       orca
@@ -64,4 +62,63 @@ in
       yelp
       gnome-software
     ];
+
+    hjem.users."${config.collinux.user.name}".packages = with pkgs.gnomeExtensions; [blur-my-shell dash-to-dock];
+
+    programs.dconf = {
+      enable = true;
+      profiles.user.databases = [
+        {
+          settings = {
+            "org/gnome/mutter" = {
+              workspaces-only-on-primary = false;
+            };
+            "org/gnome/shell/app-switcher" = {
+              current-workspace-only = true;
+            };
+
+            # Idle settings
+            "org/gnome/desktop/session" = {
+              idle-delay = lib.gvariant.mkInt16 0;
+            };
+            "org/gnome/settings-daemon/plugins/power" = {
+              sleep-inactive-ac-type = "nothing";
+            };
+
+            # Keybindings
+            "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0" = {
+              binding = "<Super>Return";
+              command = "blackbox";
+              name = "Terminal";
+            };
+            "org/gnome/settings-daemon/plugins/media-keys" = {
+              custom-keybindings = [
+                "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/"
+              ];
+            };
+
+            # Background
+            "org/gnome/desktop/background" = rec {
+              picture-uri = "file://${pkgs.gnome-backgrounds}/share/backgrounds/gnome/blobs-d.svg";
+              picture-uri-dark = picture-uri;
+            };
+
+            # Extensions
+            "org/gnome/shell" = {
+              disable-user-extensions = false;
+              enabled-extensions = with pkgs.gnomeExtensions; [
+                blur-my-shell.extensionUuid
+                dash-to-dock.extensionUuid
+              ];
+            };
+
+            "org/gnome/shell/extensions/dash-to-dock" = {
+              dash-max-icon-size = lib.gvariant.mkInt16 48;
+              show-trash = false;
+              show-mounts = false;
+            };
+          };
+        }
+      ];
+    };
   }
diff --git a/modules/desktop/system/programs/blackbox.nix b/modules/desktop/system/programs/blackbox.nix
new file mode 100644
index 0000000..37567b5
--- /dev/null
+++ b/modules/desktop/system/programs/blackbox.nix
@@ -0,0 +1,31 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}: let
+  cfg = config.collinux.desktop.programs.blackbox;
+in
+  lib.mkIf cfg.enable {
+    programs.dconf.profiles.user.databases = [
+      {
+        settings = {
+          "com/raggesilver/BlackBox" = {
+            context-aware-header-bar = true;
+            fill-tabs = true;
+            notify-process-completion = true;
+            opacity = lib.gvariant.mkInt16 100;
+            pixel-scrolling = true;
+            pretty = true;
+            show-scrollbars = false;
+            terminal-padding = lib.gvariant.mkTuple (builtins.map lib.gvariant.mkInt16 [10 10 10 10]);
+
+            floating-controls = false;
+            show-headerbar = true;
+          };
+        };
+      }
+    ];
+
+    hjem.users."${config.collinux.user.name}".packages = [pkgs.blackbox-terminal];
+  }
-- 
cgit v1.3.1