dvvl

options/default.nix

@@ -1,8 +1,11 @@
-{ lib, ... }:
+{ ... }:
 {
   imports = [
     ./programs.nix
     ./file.nix
+    ./environment.nix
+    ./programs.nix
+    ./hardware.nix
   ];
 
   options.device = {
@@ -12,5 +15,11 @@
       default = "desktop";
       description = "Flake name for quick rebuild";
     };
+
+    cursors = lib.mkOption {
+      type = lib.types.str;
+      default = "aemeath";
+      description = "Cursor theme to use for the desktop";
+    };
   };
 }

options/desktop/default.nix

@@ -1,18 +0,0 @@
-{ lib, ... }:
-{
-  imports = [
-    ../common/default.nix
-
-    ./environment.nix
-    ./programs.nix
-    ./hardware.nix
-  ];
-
-  options.device = {
-    cursors = lib.mkOption {
-      type = lib.types.str;
-      default = "aemeath";
-      description = "Cursor theme to use for the desktop";
-    };
-  };
-}

options/desktop/programs.nix

@@ -1,18 +0,0 @@
-{ lib, ... }: {
-    options.device.programs = {
-        terminal = lib.mkOption {
-            type = lib.types.str;
-            default = "ghostty";
-            description = "Terminal";
-        };
-
-        nixcord.enable = lib.mkEnableOption "nixcord";
-        tmux.enable = lib.mkEnableOption "tmux";
-        starship.enable = lib.mkEnableOption "starship";
-        fastfetch.enable = lib.mkEnableOption "fastfetch";
-        steam.enable = lib.mkEnableOption "steam";
-        
-        obs-studio.enable = lib.mkEnableOption "Obs Studio";
-        cider-2.enable = lib.mkEnableOption "Cider 2";
-    };
-}

options/programs.nix

@@ -1,5 +1,22 @@
 { lib, pkgs, ... }:
 {
+  options.device.programs = {
+    terminal = lib.mkOption {
+      type = lib.types.str;
+      default = "ghostty";
+      description = "Terminal";
+    };
+
+    nixcord.enable = lib.mkEnableOption "nixcord";
+    tmux.enable = lib.mkEnableOption "tmux";
+    starship.enable = lib.mkEnableOption "starship";
+    fastfetch.enable = lib.mkEnableOption "fastfetch";
+    steam.enable = lib.mkEnableOption "steam";
+
+    obs-studio.enable = lib.mkEnableOption "Obs Studio";
+    cider-2.enable = lib.mkEnableOption "Cider 2";
+  };
+
   options.programs = {
     wget = {
       enable = lib.mkEnableOption "wget";

options/server/default.nix

@@ -1,5 +0,0 @@
-{ ... }:
-{
-  imports = [ ../common/default.nix ];
-  options.device = { };
-}