3 files changed, 53 insertions, 59 deletions
diff --git a/users/seth/desktop/default.nix b/users/seth/desktop/default.nix
index 3e6b68e..3bd83be 100644
--- a/users/seth/desktop/default.nix
+++ b/users/seth/desktop/default.nix
@@ -1,23 +1,8 @@
-{
-  pkgs,
-  desktop,
-  ...
-}: {
-  imports =
-    [
-      ../programs/mangohud.nix
-      ../programs/firefox.nix
-    ]
-    ++ (
-      if (desktop == "gnome")
-      then [./gnome.nix]
-      else []
-    )
-    ++ (
-      if (desktop == "plasma")
-      then [./plasma.nix]
-      else []
-    );
+{pkgs, ...}: {
+  imports = [
+    ../programs/mangohud.nix
+    ../programs/firefox.nix
+  ];
 
   home.packages = with pkgs; [
     chromium
diff --git a/users/seth/desktop/gnome.nix b/users/seth/desktop/gnome/default.nix
index 8564a5e..5dc0030 100644
--- a/users/seth/desktop/gnome.nix
+++ b/users/seth/desktop/gnome/default.nix
@@ -1,4 +1,7 @@
 {pkgs, ...}: {
+  imports = [
+    ../.
+  ];
   home.packages = with pkgs;
     [adw-gtk3]
     ++ (with pkgs.gnomeExtensions; [
@@ -8,45 +11,48 @@
       gradience
     ]);
 
-  dconf.settings = {
-    "org/gnome/shell" = {
-      disable-user-extensions = false;
-      enabled-extensions = [
-        "[email protected]"
-        "[email protected]"
-      ];
-      favorite-apps = [
-        "firefox.desktop"
-        "org.gnome.Nautilus.desktop"
-        "discord-canary.desktop"
-      ];
-    };
-    "org/gnome/desktop/interface" = {
-      color-scheme = "prefer-dark";
-      font-antialiasing = ''rgba'';
-      font-name = ''Noto Sans 11'';
-      document-font-name = ''Noto Sans 11'';
-      monospace-font-name = ''FiraCode Nerd Font 10'';
-    };
-    "org/gnome/desktop/peripherals/mouse" = {
-      accel-profile = ''flat'';
-    };
-    "org/gnome/desktop/wm/preferences" = {
-      titlebar-font = ''Noto Sans Bold 11'';
-    };
-    "org/gnome/desktop/wm/keybindings" = {
-      switch-windows = ["<Alt>Tab"];
-      switch-windows-backward = ["<Shift><Alt>Tab"];
-    };
-    "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0" = {
-      name = "blackbox";
-      command = "blackbox";
-      binding = "<Control><Alt>t";
-    };
-    "com/raggesilver/BlackBox" = {
-      font = ''FiraCode Nerd Font 12'';
-      theme-dark = ''Catppuccin-Mocha'';
-      remember-window-size = true;
+  dconf = {
+    enable = true;
+    settings = {
+      "org/gnome/shell" = {
+        disable-user-extensions = false;
+        enabled-extensions = [
+          "[email protected]"
+          "[email protected]"
+        ];
+        favorite-apps = [
+          "firefox.desktop"
+          "org.gnome.Nautilus.desktop"
+          "discord-canary.desktop"
+        ];
+      };
+      "org/gnome/desktop/interface" = {
+        color-scheme = "prefer-dark";
+        font-antialiasing = ''rgba'';
+        font-name = ''Noto Sans 11'';
+        document-font-name = ''Noto Sans 11'';
+        monospace-font-name = ''FiraCode Nerd Font 10'';
+      };
+      "org/gnome/desktop/peripherals/mouse" = {
+        accel-profile = ''flat'';
+      };
+      "org/gnome/desktop/wm/preferences" = {
+        titlebar-font = ''Noto Sans Bold 11'';
+      };
+      "org/gnome/desktop/wm/keybindings" = {
+        switch-windows = ["<Alt>Tab"];
+        switch-windows-backward = ["<Shift><Alt>Tab"];
+      };
+      "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0" = {
+        name = "blackbox";
+        command = "blackbox";
+        binding = "<Control><Alt>t";
+      };
+      "com/raggesilver/BlackBox" = {
+        font = ''FiraCode Nerd Font 12'';
+        theme-dark = ''Catppuccin-Mocha'';
+        remember-window-size = true;
+      };
     };
   };
 
diff --git a/users/seth/desktop/plasma.nix b/users/seth/desktop/plasma/default.nix
index 29cb574..24e26a7 100644
--- a/users/seth/desktop/plasma.nix
+++ b/users/seth/desktop/plasma/default.nix
@@ -1,4 +1,7 @@
 {pkgs, ...}: {
+  imports = [
+    ../.
+  ];
   home.packages = with pkgs; [
     catppuccin-cursors
     catppuccin-kde