rfactoring working now

hosts/vali/temperance/configuration.nix

@@ -46,11 +46,12 @@
           kitty.enable = true;
         };
       };
+      sound.enable = true;
     };
     usrEnv = {
-      desktop.hyprland.enable = true;
+      desktops.hyprland.enable = true;
       programs = {
-        launchers.anyrun.enable = true;
+        launchers.anyrun.enable = false;
         media = {
           beets.enable = true;
           mpv.enable = true;
@@ -58,13 +59,20 @@
         };
       };
       services = {
-        mpd.enable = true;
+        media.mpd = {
+          enable = true;
+          musicDirectory = "/home/${config.modules.other.system.username}/Nextcloud/Media/Music";
+        };
       };
       style = {
         stylix = {
           enable = true;
           scheme = "${pkgs.base16-schemes}/share/themes/tomorrow-night.yaml";
-          cursor.size = 28;
+          cursor = {
+            size = 28;
+            package = pkgs.bibata-cursors;
+            name = "Bibata-Modern-Classic";
+          };
           fontsizes = {
             terminal = 18;
             popups = 14;
@@ -93,19 +101,8 @@
       nh.enable = true;
       waybar.enable = true;
     };
-    editors = {
-      emacs.enable = true;
-      helix.enable = true;
-      kakoune.enable = true;
-      neovim.enable = true;
-    };
     services = {
-      pipewire.enable = true;
       dunst.enable = true;
-      mpd = {
-        enable = true;
-        musicDirectory = "/home/${config.modules.other.system.username}/Nextcloud/Media/Music";
-      };
     };
     theming = {
       quickshell.enable = true;

modules/cli/beets.nix

@@ -5,7 +5,7 @@
 }: let
   cfg = config.modules.usrEnv.programs.media.beets;
   inherit (config.modules.other.system) username;
-  inherit (config.modules.services.mpd) musicDirectory;
+  inherit (config.modules.usrEnv.services.media.mpd) musicDirectory;
   inherit (lib) mkIf;
 in {
   config = mkIf cfg.enable {

modules/default.nix

@@ -1 +1,13 @@
-_: {imports = [./cli ./gui ./tui ./other ./services ./editors ./wms ./styling];}
+_: {
+  imports = [
+    ./cli
+    ./gui
+    ./tui
+    ./other
+    ./services
+    ./editors
+    ./wms
+    ./styling
+    ./options
+  ];
+}

modules/editors/nvf/default.nix

@@ -28,12 +28,12 @@ in {
     environment.systemPackages = with pkgs; [
       typstyle
     ];
-    imports = concatLists [
-      # neovim-flake home-manager module
-      [nvf.nixosModules.default]
-      # construct this entire directory as a module
-      # which means all default.nix files will be imported automtically
-      (mkNeovimModule {path = ./.;})
-    ];
   };
+  imports = concatLists [
+    # neovim-flake home-manager module
+    [nvf.nixosModules.default]
+    # construct this entire directory as a module
+    # which means all default.nix files will be imported automtically
+    (mkNeovimModule {path = ./.;})
+  ];
 }

modules/editors/nvf/settings.nix

@@ -12,7 +12,7 @@
   inherit (lib.attrsets) genAttrs;
   inherit (lib) mkIf mkEnableOption;
 
-  cfg = config.modules.editors.neovim;
+  cfg = config.modules.system.programs.editors.neovim;
   nvf = inputs.neovim-flake;
   inherit (nvf.lib.nvim.dag) entryBefore entryAnywhere;
 
@@ -24,7 +24,6 @@
       path = toString finalPath;
     };
 in {
-  options.modules.editors.neovim.enable = mkEnableOption "neovim";
   config = mkIf cfg.enable {
     programs.neovim-flake = {
       enable = true;

modules/options/default.nix

@@ -0,0 +1,3 @@
+_: {
+  imports = [./style/module.nix ./system/module.nix ./usrEnv/module.nix];
+}

modules/options/usrEnv/module.nix

@@ -0,0 +1,8 @@
+_: {
+  imports = [
+    ./desktop.nix
+    ./programs/media.nix
+    ./programs/launchers.nix
+    ./services/default.nix
+  ];
+}

modules/services/mpd.nix

@@ -37,7 +37,7 @@ in {
       '';
     };
     home-manager.users.${username} = {
-      home.Packages = with pkgs; [mpc-cli];
+      home.packages = with pkgs; [mpc-cli];
       services = {
         mpd-mpris = {
           enable = true;

modules/styling/stylix.nix

@@ -5,7 +5,7 @@
   lib,
   ...
 }: let
-  cfg = config.modules.theming.stylix;
+  cfg = config.modules.usrEnv.style.stylix;
   inherit (config.modules.usrEnv.style.stylix) scheme image cursor fontsizes;
   inherit (lib) mkIf;
 in {

modules/tui/ncmpcpp.nix

@@ -7,7 +7,7 @@
 with lib; let
   cfg = config.modules.usrEnv.programs.media.ncmpcpp;
   inherit (config.modules.other.system) username;
-  inherit (config.modules.services.mpd) musicDirectory;
+  inherit (config.modules.usrEnv.services.media.mpd) musicDirectory;
 in {
   config = mkIf cfg.enable {
     home-manager.users.${username} = {