some refactoring

home/modules/browsers/chromium/default.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.browsers.chromium;
+  cfg = config.userModules.browsers.chromium;
 in {
   options = {
-    modules.browsers.chromium.enable = mkEnableOption "Enables chromium";
+    userModules.browsers.chromium.enable = mkEnableOption "Enables chromium";
   };
   config = mkIf cfg.enable {
     programs.chromium = {

home/modules/browsers/firefox/default.nix

@@ -6,13 +6,13 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.browsers.firefox;
+  cfg = config.userModules.browsers.firefox;
 in {
   imports = [
     inputs.nur.hmModules.nur
   ];
   options = {
-    modules.browsers.firefox.enable = mkEnableOption "Enables firefox";
+    userModules.browsers.firefox.enable = mkEnableOption "Enables firefox";
   };
   config = mkIf cfg.enable {
     programs.firefox = {

home/modules/comm/discord/default.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.comm.discord;
+  cfg = config.userModules.comm.discord;
 in {
   options = {
-    modules.comm.discord.enable = mkEnableOption "Enables discord";
+    userModules.comm.discord.enable = mkEnableOption "Enables discord";
   };
   config = mkIf cfg.enable {
     home.packages = with pkgs; [vesktop];

home/modules/default.nix

@@ -1,36 +1,36 @@
-{userModules, ...}: {
+{umodPath, ...}: {
   imports = [
-    "${userModules}/browsers/chromium"
+    "${umodPath}/browsers/chromium"
-    "${userModules}/browsers/firefox"
+    "${umodPath}/browsers/firefox"
-    "${userModules}/comm/discord"
+    "${umodPath}/comm/discord"
-    "${userModules}/devtools/neovim"
+    "${umodPath}/devtools/neovim"
-    "${userModules}/devtools/vscode"
+    "${umodPath}/devtools/vscode"
-    "${userModules}/devtools/helix"
+    "${umodPath}/devtools/helix"
-    "${userModules}/gaming/lutris"
+    "${umodPath}/gaming/lutris"
-    "${userModules}/gaming/mangohud"
+    "${umodPath}/gaming/mangohud"
-    "${userModules}/terminal/alacritty"
+    "${umodPath}/terminal/alacritty"
-    "${userModules}/terminal/foot"
+    "${umodPath}/terminal/foot"
-    "${userModules}/terminal/kitty"
+    "${umodPath}/terminal/kitty"
-    "${userModules}/terminal/wezterm"
+    "${umodPath}/terminal/wezterm"
-    "${userModules}/terminal/zellij"
+    "${umodPath}/terminal/zellij"
-    "${userModules}/userd/copyq"
+    "${umodPath}/userd/copyq"
-    "${userModules}/userd/blueman-applet"
+    "${umodPath}/userd/blueman-applet"
-    "${userModules}/userd/mako"
+    "${umodPath}/userd/mako"
-    "${userModules}/userd/udiskie"
+    "${umodPath}/userd/udiskie"
-    "${userModules}/userd/gpg"
+    "${umodPath}/userd/gpg"
-    "${userModules}/userd/syncthing"
+    "${umodPath}/userd/syncthing"
-    "${userModules}/utils/anyrun"
+    "${umodPath}/utils/anyrun"
-    "${userModules}/utils/misc"
+    "${umodPath}/utils/misc"
-    "${userModules}/utils/rofi"
+    "${umodPath}/utils/rofi"
-    "${userModules}/utils/waybar"
+    "${umodPath}/utils/waybar"
-    "${userModules}/utils/yazi"
+    "${umodPath}/utils/yazi"
-    "${userModules}/utils/zathura"
+    "${umodPath}/utils/zathura"
-    "${userModules}/utils/tuirun"
+    "${umodPath}/utils/tuirun"
-    "${userModules}/utils/eza"
+    "${umodPath}/utils/eza"
-    "${userModules}/utils/ssh"
+    "${umodPath}/utils/ssh"
-    "${userModules}/wm/hyprland"
+    "${umodPath}/wm/hyprland"
-    "${userModules}/wm/utils/hypridle"
+    "${umodPath}/wm/utils/hypridle"
-    "${userModules}/wm/utils/hyprlock"
+    "${umodPath}/wm/utils/hyprlock"
-    "${userModules}/wm/utils/hyprpaper"
+    "${umodPath}/wm/utils/hyprpaper"
   ];
 }

home/modules/devtools/helix/default.nix

@@ -6,7 +6,7 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.devtools.helix;
+  cfg = config.userModules.devtools.helix;
 in {
   imports = [
     ./lang.nix
@@ -14,7 +14,7 @@ in {
   ];
 
   options = {
-    modules.devtools.helix.enable = mkEnableOption "Enable helix";
+    userModules.devtools.helix.enable = mkEnableOption "Enable helix";
   };
 
   config = mkIf cfg.enable {

home/modules/devtools/neovim/default.nix

@@ -5,7 +5,7 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.devtools.neovim;
+  cfg = config.userModules.devtools.neovim;
 in {
   imports = [
     ./plugins
@@ -15,7 +15,7 @@ in {
   ];
 
   options = {
-    modules.devtools.neovim.enable = mkEnableOption "Enable neovim";
+    userModules.devtools.neovim.enable = mkEnableOption "Enable neovim";
   };
 
   config = mkIf cfg.enable {

home/modules/devtools/nixvim/default.nix

@@ -6,7 +6,7 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.devtools.nixvim;
+  cfg = config.userModules.devtools.nixvim;
 in {
   imports = [
     inputs.nixvim.homeManagerModules.nixvim
@@ -18,7 +18,7 @@ in {
   ];
 
   options = {
-    modules.devtools.nixvim.enable = mkEnableOption "Enable nixvim";
+    userModules.devtools.nixvim.enable = mkEnableOption "Enable nixvim";
   };
 
   config = mkIf cfg.enable {

home/modules/devtools/nixvim/plugins/barbar.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkEnableOption mkIf;
-  cfg = config.modules.devtools.nixvim.plugins.barbar;
+  cfg = config.userModules.devtools.nixvim.plugins.barbar;
 in {
   options = {
-    modules.devtools.nixvim.plugins.barbar.enable = mkEnableOption "Enables Barbar plugin for nixvim";
+    userModules.devtools.nixvim.plugins.barbar.enable = mkEnableOption "Enables Barbar plugin for nixvim";
   };
 
   config = mkIf cfg.enable {

home/modules/devtools/nixvim/plugins/cmp.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkEnableOption mkIf;
-  cfg = config.modules.devtools.nixvim.plugins.cmp;
+  cfg = config.userModules.devtools.nixvim.plugins.cmp;
 in {
   options = {
-    modules.devtools.nixvim.plugins.cmp.enable = mkEnableOption "Enables completion plugin for nixvim";
+    userModules.devtools.nixvim.plugins.cmp.enable = mkEnableOption "Enables completion plugin for nixvim";
   };
 
   config = mkIf cfg.enable {

home/modules/devtools/nixvim/plugins/comment.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkEnableOption mkIf;
-  cfg = config.modules.devtools.nixvim.plugins.comment;
+  cfg = config.userModules.devtools.nixvim.plugins.comment;
 in {
   options = {
-    modules.devtools.nixvim.plugins.comment.enable = mkEnableOption "Enables Comment plugin for nixvim";
+    userModules.devtools.nixvim.plugins.comment.enable = mkEnableOption "Enables Comment plugin for nixvim";
   };
 
   config = mkIf cfg.enable {

home/modules/devtools/nixvim/plugins/conform.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkEnableOption mkIf;
-  cfg = config.modules.devtools.nixvim.plugins.conform;
+  cfg = config.userModules.devtools.nixvim.plugins.conform;
 in {
   options = {
-    modules.devtools.nixvim.plugins.conform.enable = mkEnableOption "Enables Conform plugin for nixvim";
+    userModules.devtools.nixvim.plugins.conform.enable = mkEnableOption "Enables Conform plugin for nixvim";
   };
 
   config = mkIf cfg.enable {

home/modules/devtools/nixvim/plugins/copilot.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkEnableOption mkIf;
-  cfg = config.modules.devtools.nixvim.plugins.copilot;
+  cfg = config.userModules.devtools.nixvim.plugins.copilot;
 in {
   options = {
-    modules.devtools.nixvim.plugins.copilot.enable = mkEnableOption "Enables AI tools for nixvim";
+    userModules.devtools.nixvim.plugins.copilot.enable = mkEnableOption "Enables AI tools for nixvim";
   };
 
   config = mkIf cfg.enable {

home/modules/devtools/nixvim/plugins/default.nix

@@ -1,25 +1,25 @@
-{userModules, ...}: {
+{umodPath, ...}: {
   imports = [
-    "${userModules}/devtools/nixvim/plugins/barbar.nix"
+    "${umodPath}/devtools/nixvim/plugins/barbar.nix"
-    "${userModules}/devtools/nixvim/plugins/comment.nix"
+    "${umodPath}/devtools/nixvim/plugins/comment.nix"
-    "${userModules}/devtools/nixvim/plugins/conform.nix"
+    "${umodPath}/devtools/nixvim/plugins/conform.nix"
-    "${userModules}/devtools/nixvim/plugins/cmp.nix"
+    "${umodPath}/devtools/nixvim/plugins/cmp.nix"
-    "${userModules}/devtools/nixvim/plugins/copilot.nix"
+    "${umodPath}/devtools/nixvim/plugins/copilot.nix"
-    "${userModules}/devtools/nixvim/plugins/efm.nix"
+    "${umodPath}/devtools/nixvim/plugins/efm.nix"
-    "${userModules}/devtools/nixvim/plugins/floaterm.nix"
+    "${umodPath}/devtools/nixvim/plugins/floaterm.nix"
-    "${userModules}/devtools/nixvim/plugins/harpoon.nix"
+    "${umodPath}/devtools/nixvim/plugins/harpoon.nix"
-    "${userModules}/devtools/nixvim/plugins/lsp.nix"
+    "${umodPath}/devtools/nixvim/plugins/lsp.nix"
-    "${userModules}/devtools/nixvim/plugins/lualine.nix"
+    "${umodPath}/devtools/nixvim/plugins/lualine.nix"
-    "${userModules}/devtools/nixvim/plugins/lightline.nix"
+    "${umodPath}/devtools/nixvim/plugins/lightline.nix"
-    "${userModules}/devtools/nixvim/plugins/markdown-preview.nix"
+    "${umodPath}/devtools/nixvim/plugins/markdown-preview.nix"
-    "${userModules}/devtools/nixvim/plugins/neo-tree.nix"
+    "${umodPath}/devtools/nixvim/plugins/neo-tree.nix"
-    "${userModules}/devtools/nixvim/plugins/nonels.nix"
+    "${umodPath}/devtools/nixvim/plugins/nonels.nix"
-    "${userModules}/devtools/nixvim/plugins/rustaceanvim.nix"
+    "${umodPath}/devtools/nixvim/plugins/rustaceanvim.nix"
-    "${userModules}/devtools/nixvim/plugins/startify.nix"
+    "${umodPath}/devtools/nixvim/plugins/startify.nix"
-    "${userModules}/devtools/nixvim/plugins/tagbar.nix"
+    "${umodPath}/devtools/nixvim/plugins/tagbar.nix"
-    "${userModules}/devtools/nixvim/plugins/telescope.nix"
+    "${umodPath}/devtools/nixvim/plugins/telescope.nix"
-    "${userModules}/devtools/nixvim/plugins/treesitter.nix"
+    "${umodPath}/devtools/nixvim/plugins/treesitter.nix"
-    "${userModules}/devtools/nixvim/plugins/vimtex.nix"
+    "${umodPath}/devtools/nixvim/plugins/vimtex.nix"
-    "${userModules}/devtools/nixvim/plugins/yanky.nix"
+    "${umodPath}/devtools/nixvim/plugins/yanky.nix"
   ];
 }

home/modules/devtools/nixvim/plugins/efm.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkEnableOption mkIf;
-  cfg = config.modules.devtools.nixvim.plugins.efm;
+  cfg = config.userModules.devtools.nixvim.plugins.efm;
 in {
   options = {
-    modules.devtools.nixvim.plugins.efm.enable = mkEnableOption "Enables EFM LSP support for nixvim";
+    userModules.devtools.nixvim.plugins.efm.enable = mkEnableOption "Enables EFM LSP support for nixvim";
   };
 
   config = mkIf cfg.enable {

home/modules/devtools/nixvim/plugins/floaterm.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkEnableOption mkIf;
-  cfg = config.modules.devtools.nixvim.plugins.floaterm;
+  cfg = config.userModules.devtools.nixvim.plugins.floaterm;
 in {
   options = {
-    modules.devtools.nixvim.plugins.floaterm.enable = mkEnableOption "Enables Floaterm plugin for nixvim";
+    userModules.devtools.nixvim.plugins.floaterm.enable = mkEnableOption "Enables Floaterm plugin for nixvim";
   };
 
   config = mkIf cfg.enable {

home/modules/devtools/nixvim/plugins/harpoon.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkEnableOption mkIf;
-  cfg = config.modules.devtools.nixvim.plugins.harpoon;
+  cfg = config.userModules.devtools.nixvim.plugins.harpoon;
 in {
   options = {
-    modules.devtools.nixvim.plugins.harpoon.enable = mkEnableOption "Enables Harpoon plugin for nixvim";
+    userModules.devtools.nixvim.plugins.harpoon.enable = mkEnableOption "Enables Harpoon plugin for nixvim";
   };
 
   config = mkIf cfg.enable {

home/modules/devtools/nixvim/plugins/lightline.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkEnableOption mkIf;
-  cfg = config.modules.devtools.nixvim.plugins.lightline;
+  cfg = config.userModules.devtools.nixvim.plugins.lightline;
 in {
   options = {
-    modules.devtools.nixvim.plugins.lightline.enable = mkEnableOption "Enables lightline plugin for nixvim";
+    userModules.devtools.nixvim.plugins.lightline.enable = mkEnableOption "Enables lightline plugin for nixvim";
   };
 
   config = mkIf cfg.enable {

home/modules/devtools/nixvim/plugins/lsp-format.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkEnableOption mkIf;
-  cfg = config.modules.devtools.nixvim.plugins.lsp-format;
+  cfg = config.userModules.devtools.nixvim.plugins.lsp-format;
 in {
   options = {
-    modules.devtools.nixvim.plugins.lsp-format = {
+    userModules.devtools.nixvim.plugins.lsp-format = {
       enable = mkEnableOption "Enables LSP formatting support for nixvim";
     };
   };

home/modules/devtools/nixvim/plugins/lsp.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkEnableOption mkIf;
-  cfg = config.modules.devtools.nixvim.plugins.lsp;
+  cfg = config.userModules.devtools.nixvim.plugins.lsp;
 in {
   options = {
-    modules.devtools.nixvim.plugins.lsp = {
+    userModules.devtools.nixvim.plugins.lsp = {
       enable = mkEnableOption "Enables LSP support for nixvim";
     };
   };

home/modules/devtools/nixvim/plugins/lualine.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkEnableOption mkIf;
-  cfg = config.modules.devtools.nixvim.plugins.lualine;
+  cfg = config.userModules.devtools.nixvim.plugins.lualine;
 in {
   options = {
-    modules.devtools.nixvim.plugins.lualine.enable = mkEnableOption "Enables Lualine plugin for nixvim";
+    userModules.devtools.nixvim.plugins.lualine.enable = mkEnableOption "Enables Lualine plugin for nixvim";
   };
 
   config = mkIf cfg.enable {

home/modules/devtools/nixvim/plugins/markdown-preview.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkEnableOption mkIf;
-  cfg = config.modules.devtools.nixvim.plugins.markdown-preview;
+  cfg = config.userModules.devtools.nixvim.plugins.markdown-preview;
 in {
   options = {
-    modules.devtools.nixvim.plugins.markdown-preview.enable = mkEnableOption "Enables Markdown Preview plugin for nixvim";
+    userModules.devtools.nixvim.plugins.markdown-preview.enable = mkEnableOption "Enables Markdown Preview plugin for nixvim";
   };
 
   config = mkIf cfg.enable {

home/modules/devtools/nixvim/plugins/neo-tree.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkEnableOption mkIf;
-  cfg = config.modules.devtools.nixvim.plugins.neo-tree;
+  cfg = config.userModules.devtools.nixvim.plugins.neo-tree;
 in {
   options = {
-    modules.devtools.nixvim.plugins.neo-tree.enable = mkEnableOption "Enables neo-tree plugin for nixvim";
+    userModules.devtools.nixvim.plugins.neo-tree.enable = mkEnableOption "Enables neo-tree plugin for nixvim";
   };
 
   config = mkIf cfg.enable {

home/modules/devtools/nixvim/plugins/nonels.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkEnableOption mkIf;
-  cfg = config.modules.devtools.nixvim.plugins.none-ls;
+  cfg = config.userModules.devtools.nixvim.plugins.none-ls;
 in {
   options = {
-    modules.devtools.nixvim.plugins.none-ls.enable = mkEnableOption "Enables None-LS plugin for nixvim";
+    userModules.devtools.nixvim.plugins.none-ls.enable = mkEnableOption "Enables None-LS plugin for nixvim";
   };
 
   config = mkIf cfg.enable {

home/modules/devtools/nixvim/plugins/rustaceanvim.nix

@@ -4,9 +4,9 @@
   ...
 }:
 with lib; let
-  cfg = config.modules.devtools.nixvim.plugins.rustaceanvim;
+  cfg = config.userModules.devtools.nixvim.plugins.rustaceanvim;
 in {
-  options.modules.devtools.nixvim.plugins.rustaceanvim = {
+  options.userModules.devtools.nixvim.plugins.rustaceanvim = {
     enable = mkEnableOption "Whether to enable rustaceanvim.";
   };
 

home/modules/devtools/nixvim/plugins/startify.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkEnableOption mkIf;
-  cfg = config.modules.devtools.nixvim.plugins.startify;
+  cfg = config.userModules.devtools.nixvim.plugins.startify;
 in {
   options = {
-    modules.devtools.nixvim.plugins.startify.enable = mkEnableOption "Enables Startify plugin for nixvim";
+    userModules.devtools.nixvim.plugins.startify.enable = mkEnableOption "Enables Startify plugin for nixvim";
   };
 
   config = mkIf cfg.enable {

home/modules/devtools/nixvim/plugins/tagbar.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkEnableOption mkIf;
-  cfg = config.modules.devtools.nixvim.plugins.tagbar;
+  cfg = config.userModules.devtools.nixvim.plugins.tagbar;
 in {
   options = {
-    modules.devtools.nixvim.plugins.tagbar.enable = mkEnableOption "Enables Tagbar plugin for nixvim";
+    userModules.devtools.nixvim.plugins.tagbar.enable = mkEnableOption "Enables Tagbar plugin for nixvim";
   };
 
   config = mkIf cfg.enable {

home/modules/devtools/nixvim/plugins/telescope.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkEnableOption mkIf;
-  cfg = config.modules.devtools.nixvim.plugins.telescope;
+  cfg = config.userModules.devtools.nixvim.plugins.telescope;
 in {
   options = {
-    modules.devtools.nixvim.plugins.telescope.enable = mkEnableOption "Enables Telescope plugin for nixvim";
+    userModules.devtools.nixvim.plugins.telescope.enable = mkEnableOption "Enables Telescope plugin for nixvim";
   };
 
   config = mkIf cfg.enable {

home/modules/devtools/nixvim/plugins/treesitter.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkEnableOption mkIf;
-  cfg = config.modules.devtools.nixvim.plugins.treesitter;
+  cfg = config.userModules.devtools.nixvim.plugins.treesitter;
 in {
   options = {
-    modules.devtools.nixvim.plugins = {
+    userModules.devtools.nixvim.plugins = {
       treesitter.enable = mkEnableOption "Enables Treesitter plugin for nixvim";
     };
   };

home/modules/devtools/nixvim/plugins/vimtex.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkEnableOption mkIf;
-  cfg = config.modules.devtools.nixvim.plugins.vimtex;
+  cfg = config.userModules.devtools.nixvim.plugins.vimtex;
 in {
   options = {
-    modules.devtools.nixvim.plugins.vimtex.enable = mkEnableOption "Enables VimTeX plugin for nixvim";
+    userModules.devtools.nixvim.plugins.vimtex.enable = mkEnableOption "Enables VimTeX plugin for nixvim";
   };
 
   config = mkIf cfg.enable {

home/modules/devtools/nixvim/plugins/yanky.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkEnableOption mkIf;
-  cfg = config.modules.devtools.nixvim.plugins.yanky;
+  cfg = config.userModules.devtools.nixvim.plugins.yanky;
 in {
   options = {
-    modules.devtools.nixvim.plugins.yanky.enable = mkEnableOption "Enables Yanky plugin for nixvim";
+    userModules.devtools.nixvim.plugins.yanky.enable = mkEnableOption "Enables Yanky plugin for nixvim";
   };
 
   config = mkIf cfg.enable {

home/modules/devtools/vscode/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.devtools.vscode;
+  cfg = config.userModules.devtools.vscode;
 in {
   options = {
-    modules.devtools.vscode.enable = mkEnableOption "Enables vscode";
+    userModules.devtools.vscode.enable = mkEnableOption "Enables vscode";
   };
   config = mkIf cfg.enable {
     programs.vscode = {

home/modules/display/monitors/default.nix

@@ -0,0 +1,60 @@
+{
+  lib,
+  config,
+  ...
+}: let
+  inherit (lib) mkOption types;
+  cfg = config.userModules.display.monitors;
+in {
+  options.userModules.display.monitors = mkOption {
+    type = types.listOf (
+      types.submodule {
+        options = {
+          name = mkOption {
+            type = types.str;
+            example = "DP-1";
+          };
+          primary = mkOption {
+            type = types.bool;
+            default = false;
+          };
+          width = mkOption {
+            type = types.int;
+            example = 1920;
+          };
+          height = mkOption {
+            type = types.int;
+            example = 1080;
+          };
+          refreshRate = mkOption {
+            type = types.int;
+            default = 60;
+          };
+          position = mkOption {
+            type = types.str;
+            default = "auto";
+          };
+          enabled = mkOption {
+            type = types.bool;
+            default = true;
+          };
+          workspace = mkOption {
+            type = types.nullOr types.str;
+            default = null;
+          };
+        };
+      }
+    );
+    default = [];
+  };
+  config = {
+    assertions = [
+      {
+        assertion =
+          ((lib.length cfg) != 0)
+          -> ((lib.length (lib.filter (m: m.primary) cfg)) == 1);
+        message = "Exactly one monitor must be set to primary.";
+      }
+    ];
+  };
+}

home/modules/gaming/lutris/default.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.gaming.lutris;
+  cfg = config.userModules.gaming.lutris;
 in {
   options = {
-    modules.gaming.lutris.enable = mkEnableOption "Enables lutris";
+    userModules.gaming.lutris.enable = mkEnableOption "Enables lutris";
   };
   config = mkIf cfg.enable {
     home.packages = [

home/modules/gaming/mangohud/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.gaming.mangohud;
+  cfg = config.userModules.gaming.mangohud;
 in {
   options = {
-    modules.gaming.mangohud.enable = mkEnableOption "Enables mangohud";
+    userModules.gaming.mangohud.enable = mkEnableOption "Enables mangohud";
   };
   config = mkIf cfg.enable {
     programs.mangohud = {

home/modules/terminal/alacritty/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.terminal.alacritty;
+  cfg = config.userModules.terminal.alacritty;
 in {
   options = {
-    modules.terminal.alacritty.enable = mkEnableOption "Enables firefox";
+    userModules.terminal.alacritty.enable = mkEnableOption "Enables firefox";
   };
   config = mkIf cfg.enable {
     programs.alacritty = {

home/modules/terminal/foot/default.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.terminal.foot;
+  cfg = config.userModules.terminal.foot;
 in {
   options = {
-    modules.terminal.foot.enable = mkEnableOption "Enables foot terminal";
+    userModules.terminal.foot.enable = mkEnableOption "Enables foot terminal";
   };
   config = mkIf cfg.enable {
     programs.foot = {

home/modules/terminal/kitty/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.terminal.kitty;
+  cfg = config.userModules.terminal.kitty;
 in {
   options = {
-    modules.terminal.kitty.enable = mkEnableOption "Enables kitty terminal";
+    userModules.terminal.kitty.enable = mkEnableOption "Enables kitty terminal";
   };
   config = mkIf cfg.enable {
     programs.kitty = {

home/modules/terminal/wezterm/default.nix

@@ -9,10 +9,10 @@
   weztermPkg = pkgs.wezterm;
   # weztermFlake = inputs.wezterm.packages.${pkgs.system}.default;
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.terminal.wezterm;
+  cfg = config.userModules.terminal.wezterm;
 in {
   options = {
-    modules.terminal.wezterm.enable = mkEnableOption "Enables wezterm terminal";
+    userModules.terminal.wezterm.enable = mkEnableOption "Enables wezterm terminal";
   };
   config = mkIf cfg.enable {
     programs.wezterm = {

home/modules/terminal/zellij/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.terminal.zellij;
+  cfg = config.userModules.terminal.zellij;
 in {
   options = {
-    modules.terminal.zellij.enable = mkEnableOption "Enables zellij";
+    userModules.terminal.zellij.enable = mkEnableOption "Enables zellij";
   };
   config = mkIf cfg.enable {
     programs.zellij = {

home/modules/userd/blueman-applet/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.userd.blueman-applet;
+  cfg = config.userModules.userd.blueman-applet;
 in {
   options = {
-    modules.userd.blueman-applet.enable = mkEnableOption "Enables blueman-applet";
+    userModules.userd.blueman-applet.enable = mkEnableOption "Enables blueman-applet";
   };
   config = mkIf cfg.enable {
     services.blueman-applet = {

home/modules/userd/copyq/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.userd.copyq;
+  cfg = config.userModules.userd.copyq;
 in {
   options = {
-    modules.userd.copyq.enable = mkEnableOption "Enables copyq";
+    userModules.userd.copyq.enable = mkEnableOption "Enables copyq";
   };
   config = mkIf cfg.enable {
     services.copyq = {

home/modules/userd/gpg/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.userd.gpg;
+  cfg = config.userModules.userd.gpg;
 in {
   options = {
-    modules.userd.gpg.enable = mkEnableOption "Enables gpg";
+    userModules.userd.gpg.enable = mkEnableOption "Enables gpg";
   };
   config = mkIf cfg.enable {
     services.gpg-agent = {

home/modules/userd/mako/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.userd.mako;
+  cfg = config.userModules.userd.mako;
 in {
   options = {
-    modules.userd.mako.enable = mkEnableOption "Enables mako";
+    userModules.userd.mako.enable = mkEnableOption "Enables mako";
   };
   config = mkIf cfg.enable {
     services.mako = {

home/modules/userd/syncthing/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.userd.syncthing;
+  cfg = config.userModules.userd.syncthing;
 in {
   options = {
-    modules.userd.syncthing.enable = mkEnableOption "Enables syncthing";
+    userModules.userd.syncthing.enable = mkEnableOption "Enables syncthing";
   };
   config = mkIf cfg.enable {
     services.syncthing = {

home/modules/userd/udiskie/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.userd.udiskie;
+  cfg = config.userModules.userd.udiskie;
 in {
   options = {
-    modules.userd.udiskie.enable = mkEnableOption "Enables udiskie";
+    userModules.userd.udiskie.enable = mkEnableOption "Enables udiskie";
   };
   config = mkIf cfg.enable {
     services.udiskie = {

home/modules/utils/anyrun/default.nix

@@ -5,13 +5,13 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.utils.anyrun;
+  cfg = config.userModules.utils.anyrun;
 in {
   imports = [
     inputs.anyrun.homeManagerModules.default
   ];
   options = {
-    modules.utils.anyrun.enable = mkEnableOption "Enables anyrun";
+    userModules.utils.anyrun.enable = mkEnableOption "Enables anyrun";
   };
   config = mkIf cfg.enable {
     programs.anyrun = {

home/modules/utils/eza/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.utils.eza;
+  cfg = config.userModules.utils.eza;
 in {
   options = {
-    modules.utils.eza.enable = mkEnableOption "Enables eza";
+    userModules.utils.eza.enable = mkEnableOption "Enables eza";
   };
   config = mkIf cfg.enable {
     programs.eza = {

home/modules/utils/misc/default.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.utils.misc;
+  cfg = config.userModules.utils.misc;
 in {
   options = {
-    modules.utils.misc.enable = mkEnableOption "Enables miscellaneous utility apps";
+    userModules.utils.misc.enable = mkEnableOption "Enables miscellaneous utility apps";
   };
   config = mkIf cfg.enable {
     programs = {

home/modules/utils/rofi/default.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.utils.rofi;
+  cfg = config.userModules.utils.rofi;
 in {
   options = {
-    modules.utils.rofi.enable = mkEnableOption "Enables firefox";
+    userModules.utils.rofi.enable = mkEnableOption "Enables firefox";
   };
   config = mkIf cfg.enable {
     programs.rofi = {

home/modules/utils/ssh/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.utils.ssh;
+  cfg = config.userModules.utils.ssh;
 in {
   options = {
-    modules.utils.ssh.enable = mkEnableOption "Enables ssh";
+    userModules.utils.ssh.enable = mkEnableOption "Enables ssh";
   };
   config = mkIf cfg.enable {
     programs.ssh = {

home/modules/utils/tuirun/default.nix

@@ -6,13 +6,13 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.utils.tuirun;
+  cfg = config.userModules.utils.tuirun;
 in {
   imports = [
     inputs.tuirun.homeManagerModules.default
   ];
   options = {
-    modules.utils.tuirun.enable = mkEnableOption "Enables tuirun";
+    userModules.utils.tuirun.enable = mkEnableOption "Enables tuirun";
   };
   config = mkIf cfg.enable {
     programs.tuirun = {

home/modules/utils/waybar/default.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.utils.waybar;
+  cfg = config.userModules.utils.waybar;
 in {
   options = {
-    modules.utils.waybar.enable = mkEnableOption "Enables waybar";
+    userModules.utils.waybar.enable = mkEnableOption "Enables waybar";
   };
   config = mkIf cfg.enable {
     systemd.user.services.waybar = {

home/modules/utils/yazi/default.nix

@@ -5,14 +5,14 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.utils.yazi;
+  cfg = config.userModules.utils.yazi;
 in {
   imports = [
     ./theme
   ];
 
   options = {
-    modules.utils.yazi.enable = mkEnableOption "Enables yazi";
+    userModules.utils.yazi.enable = mkEnableOption "Enables yazi";
   };
   config = mkIf cfg.enable {
     programs.yazi = {

home/modules/utils/zathura/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.utils.zathura;
+  cfg = config.userModules.utils.zathura;
 in {
   options = {
-    modules.utils.zathura.enable = mkEnableOption "Enables zathura";
+    userModules.utils.zathura.enable = mkEnableOption "Enables zathura";
   };
   config = mkIf cfg.enable {
     programs.zathura = {

home/modules/wm/hyprland/cnst/appearance.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.wm.hyprland.cnst.appearance;
+  cfg = config.userModules.wm.hyprland.cnst.appearance;
 in {
   options = {
-    modules.wm.hyprland.cnst.appearance.enable = mkEnableOption "Enables appearance settings in Hyprland";
+    userModules.wm.hyprland.cnst.appearance.enable = mkEnableOption "Enables appearance settings in Hyprland";
   };
   config = mkIf cfg.enable {
     wayland.windowManager.hyprland.settings = {

home/modules/wm/hyprland/cnst/default.nix

@@ -3,26 +3,26 @@
   config,
   lib,
   pkgs,
-  userModules,
+  umodPath,
   ...
 }: let
   inherit (lib) mkIf mkEnableOption mkDefault;
-  cfg = config.modules.wm.hyprland.cnst;
+  cfg = config.userModules.wm.hyprland.cnst;
 in {
   imports = [
-    "${userModules}/wm/hyprland/cnst/appearance.nix"
+    "${umodPath}/wm/hyprland/cnst/appearance.nix"
-    "${userModules}/wm/hyprland/cnst/inputs.nix"
+    "${umodPath}/wm/hyprland/cnst/inputs.nix"
-    "${userModules}/wm/hyprland/cnst/keybinds.nix"
+    "${umodPath}/wm/hyprland/cnst/keybinds.nix"
-    "${userModules}/wm/hyprland/cnst/rules.nix"
+    "${umodPath}/wm/hyprland/cnst/rules.nix"
-    "${userModules}/wm/hyprland/cnst/startup.nix"
+    "${umodPath}/wm/hyprland/cnst/startup.nix"
   ];
 
   options = {
-    modules.wm.hyprland.cnst.enable = mkEnableOption "Enable Hyprland";
+    userModules.wm.hyprland.cnst.enable = mkEnableOption "Enable Hyprland";
   };
 
   config = mkIf cfg.enable {
-    modules.wm.hyprland.cnst = {
+    userModules.wm.hyprland.cnst = {
       appearance.enable = mkDefault cfg.enable;
       inputs.enable = mkDefault cfg.enable;
       keybinds.enable = mkDefault cfg.enable;

home/modules/wm/hyprland/cnst/inputs.nix

@@ -4,15 +4,15 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.wm.hyprland.cnst.inputs;
+  cfg = config.userModules.wm.hyprland.cnst.inputs;
 in {
   options = {
-    modules.wm.hyprland.cnst.inputs.enable = mkEnableOption "Enables input settings in Hyprland";
+    userModules.wm.hyprland.cnst.inputs.enable = mkEnableOption "Enables input settings in Hyprland";
   };
   config = mkIf cfg.enable {
     wayland.windowManager.hyprland.settings = {
       monitor = [
-        "DP-3, 2560x1440@239.97, auto, auto, bitdepth, 10"
+        "DP-3, 2560x1440@240, auto, auto, bitdepth, 10"
         "eDP-1,1920x1200@60.02,auto,1"
       ];
       env = [
@@ -63,7 +63,7 @@ in {
         workspace_swipe_create_new = true;
       };
       misc = {
-        vrr = 2;
+        vrr = 0;
         mouse_move_enables_dpms = 1;
         key_press_enables_dpms = 0;
         force_default_wallpaper = 0;

home/modules/wm/hyprland/cnst/keybinds.nix

@@ -14,10 +14,10 @@
     if osConfig.networking.hostName == "cnixpad"
     then "foot"
     else "alacritty";
-  cfg = config.modules.wm.hyprland.cnst.keybinds;
+  cfg = config.userModules.wm.hyprland.cnst.keybinds;
 in {
   options = {
-    modules.wm.hyprland.cnst.keybinds.enable = mkEnableOption "Enables keybind settings in Hyprland";
+    userModules.wm.hyprland.cnst.keybinds.enable = mkEnableOption "Enables keybind settings in Hyprland";
   };
   config = mkIf cfg.enable {
     wayland.windowManager.hyprland.settings = {

home/modules/wm/hyprland/cnst/rules.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.wm.hyprland.cnst.rules;
+  cfg = config.userModules.wm.hyprland.cnst.rules;
 in {
   options = {
-    modules.wm.hyprland.cnst.rules.enable = mkEnableOption "Enables window rule settings in Hyprland";
+    userModules.wm.hyprland.cnst.rules.enable = mkEnableOption "Enables window rule settings in Hyprland";
   };
   config = mkIf cfg.enable {
     wayland.windowManager.hyprland.settings = {

home/modules/wm/hyprland/cnst/startup.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.wm.hyprland.cnst.startup;
+  cfg = config.userModules.wm.hyprland.cnst.startup;
 in {
   options = {
-    modules.wm.hyprland.cnst.startup.enable = mkEnableOption "Enables startup settings in Hyprland";
+    userModules.wm.hyprland.cnst.startup.enable = mkEnableOption "Enables startup settings in Hyprland";
   };
   config = mkIf cfg.enable {
     wayland.windowManager.hyprland.settings = {

home/modules/wm/hyprland/default.nix

@@ -1,6 +1,6 @@
-{userModules, ...}: {
+{umodPath, ...}: {
   imports = [
-    "${userModules}/wm/hyprland/cnst"
+    "${umodPath}/wm/hyprland/cnst"
-    "${userModules}/wm/hyprland/toothpick"
+    "${umodPath}/wm/hyprland/toothpick"
   ];
 }

home/modules/wm/hyprland/toothpick/appearance.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.wm.hyprland.toothpick.appearance;
+  cfg = config.userModules.wm.hyprland.toothpick.appearance;
 in {
   options = {
-    modules.wm.hyprland.toothpick.appearance.enable = mkEnableOption "Enables appearance settings in Hyprland";
+    userModules.wm.hyprland.toothpick.appearance.enable = mkEnableOption "Enables appearance settings in Hyprland";
   };
   config = mkIf cfg.enable {
     wayland.windowManager.hyprland.settings = {

home/modules/wm/hyprland/toothpick/default.nix

@@ -3,26 +3,26 @@
   config,
   lib,
   pkgs,
-  userModules,
+  umodPath,
   ...
 }: let
   inherit (lib) mkIf mkEnableOption mkDefault;
-  cfg = config.modules.wm.hyprland.toothpick;
+  cfg = config.userModules.wm.hyprland.toothpick;
 in {
   imports = [
-    "${userModules}/wm/hyprland/toothpick/appearance.nix"
+    "${umodPath}/wm/hyprland/toothpick/appearance.nix"
-    "${userModules}/wm/hyprland/toothpick/inputs.nix"
+    "${umodPath}/wm/hyprland/toothpick/inputs.nix"
-    "${userModules}/wm/hyprland/toothpick/keybinds.nix"
+    "${umodPath}/wm/hyprland/toothpick/keybinds.nix"
-    "${userModules}/wm/hyprland/toothpick/rules.nix"
+    "${umodPath}/wm/hyprland/toothpick/rules.nix"
-    "${userModules}/wm/hyprland/toothpick/startup.nix"
+    "${umodPath}/wm/hyprland/toothpick/startup.nix"
   ];
 
   options = {
-    modules.wm.hyprland.toothpick.enable = mkEnableOption "Enable Hyprland";
+    userModules.wm.hyprland.toothpick.enable = mkEnableOption "Enable Hyprland";
   };
 
   config = mkIf cfg.enable {
-    modules.wm.hyprland.toothpick = {
+    userModules.wm.hyprland.toothpick = {
       appearance.enable = mkDefault cfg.enable;
       inputs.enable = mkDefault cfg.enable;
       keybinds.enable = mkDefault cfg.enable;

home/modules/wm/hyprland/toothpick/inputs.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.wm.hyprland.toothpick.inputs;
+  cfg = config.userModules.wm.hyprland.toothpick.inputs;
 in {
   options = {
-    modules.wm.hyprland.toothpick.inputs.enable = mkEnableOption "Enables input settings in Hyprland";
+    userModules.wm.hyprland.toothpick.inputs.enable = mkEnableOption "Enables input settings in Hyprland";
   };
   config = mkIf cfg.enable {
     wayland.windowManager.hyprland.settings = {

home/modules/wm/hyprland/toothpick/keybinds.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.wm.hyprland.toothpick.keybinds;
+  cfg = config.userModules.wm.hyprland.toothpick.keybinds;
 in {
   options = {
-    modules.wm.hyprland.toothpick.keybinds.enable = mkEnableOption "Enables keybind settings in Hyprland";
+    userModules.wm.hyprland.toothpick.keybinds.enable = mkEnableOption "Enables keybind settings in Hyprland";
   };
   config = mkIf cfg.enable {
     wayland.windowManager.hyprland.settings = {

home/modules/wm/hyprland/toothpick/rules.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.wm.hyprland.toothpick.rules;
+  cfg = config.userModules.wm.hyprland.toothpick.rules;
 in {
   options = {
-    modules.wm.hyprland.toothpick.rules.enable = mkEnableOption "Enables window rule settings in Hyprland";
+    userModules.wm.hyprland.toothpick.rules.enable = mkEnableOption "Enables window rule settings in Hyprland";
   };
   config = mkIf cfg.enable {
     wayland.windowManager.hyprland.settings = {

home/modules/wm/hyprland/toothpick/startup.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.wm.hyprland.toothpick.startup;
+  cfg = config.userModules.wm.hyprland.toothpick.startup;
 in {
   options = {
-    modules.wm.hyprland.toothpick.startup.enable = mkEnableOption "Enables startup settings in Hyprland";
+    userModules.wm.hyprland.toothpick.startup.enable = mkEnableOption "Enables startup settings in Hyprland";
   };
   config = mkIf cfg.enable {
     wayland.windowManager.hyprland.settings = {

home/modules/wm/utils/hypridle/default.nix

@@ -6,13 +6,13 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.wm.utils.hypridle;
+  cfg = config.userModules.wm.utils.hypridle;
 
   hypridleFlake = inputs.hypridle.packages.${pkgs.system}.hypridle;
   # hypridlePkg = pkgs.hypridle;
 in {
   options = {
-    modules.wm.utils.hypridle.enable = mkEnableOption "Enables hypridle";
+    userModules.wm.utils.hypridle.enable = mkEnableOption "Enables hypridle";
   };
   config = mkIf cfg.enable {
     services.hypridle = {

home/modules/wm/utils/hyprlock/default.nix

@@ -6,13 +6,13 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.wm.utils.hyprlock;
+  cfg = config.userModules.wm.utils.hyprlock;
 
   hyprlockFlake = inputs.hyprlock.packages.${pkgs.system}.hyprlock;
   # hyprlockPkg = pkgs.hyprlock;
 in {
   options = {
-    modules.wm.utils.hyprlock.enable = mkEnableOption "Enables hyprlock";
+    userModules.wm.utils.hyprlock.enable = mkEnableOption "Enables hyprlock";
   };
   config = mkIf cfg.enable {
     programs.hyprlock = {

home/modules/wm/utils/hyprpaper/default.nix

@@ -6,13 +6,13 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.wm.utils.hyprpaper;
+  cfg = config.userModules.wm.utils.hyprpaper;
 
   hyprpaperFlake = inputs.hyprpaper.packages.${pkgs.system}.default;
   # hyprpaperPkg = pkgs.hyprpaper;
 in {
   options = {
-    modules.wm.utils.hyprpaper.enable = mkEnableOption "Enables hyprpaper";
+    userModules.wm.utils.hyprpaper.enable = mkEnableOption "Enables hyprpaper";
   };
   config = mkIf cfg.enable {
     services.hyprpaper = {

home/users/cnst/default.nix

@@ -13,6 +13,7 @@ in {
       ./shell.nix
     ]
     ++ lib.optionals isCnixpad [./cpmodules.nix];
+
   home = {
     username = "cnst";
     homeDirectory = "/home/cnst";

home/users/cnst/modules.nix

@@ -1,5 +1,15 @@
 {
-  modules = {
+  # monitors = [
+  #   {
+  #     name = "DP-3";
+  #     width = 2560;
+  #     height = 1440;
+  #     refreshRate = 240;
+  #     workspace = "1";
+  #     primary = true;
+  #   }
+  # ];
+  userModules = {
     browsers = {
       firefox = {
         enable = true;

hosts/cnix/modules.nix

@@ -1,5 +1,5 @@
 {
-  modules = {
+  systemModules = {
     boot = {
       loader = {
         default = {
@@ -132,10 +132,6 @@
         dconf = {
           enable = true;
         };
-        xserver = {
-          videoDrivers = ["amdgpu"];
-          xkbLayout = "se";
-        };
       };
       system = {
         fwupd = {

hosts/default.nix

@@ -14,8 +14,8 @@
     cnstConfig = "${self}/home/users/cnst";
     toothpickConfig = "${self}/home/users/toothpick";
 
-    userModules = "${self}/home/modules";
+    umodPath = "${self}/home/modules";
-    systemModules = "${self}/system/modules";
+    smodPath = "${self}/system/modules";
 
     # shorten paths
     inherit (inputs.nixpkgs.lib) nixosSystem;
@@ -25,10 +25,11 @@
     inherit (import "${systemConfig}") shared;
 
     # get these into the module system
-    specialArgs = {inherit inputs self userConfig systemConfig hostConfig cnstConfig toothpickConfig userModules systemModules;};
+    specialArgs = {inherit inputs self userConfig systemConfig hostConfig cnstConfig toothpickConfig umodPath smodPath;};
   in {
     cnix = nixosSystem {
       inherit specialArgs;
+
       modules =
         shared
         ++ [

system/modules/boot/kernel/default.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkOption;
-  cfg = config.modules.boot.kernel;
+  cfg = config.systemModules.boot.kernel;
 in {
   options = {
-    modules.boot.kernel = {
+    systemModules.boot.kernel = {
       variant = mkOption {
         type = lib.types.enum ["stable" "latest" "cachyos"];
         default = "latest";
@@ -30,7 +30,7 @@ in {
       extraBlacklistedModules = mkOption {
         type = lib.types.listOf lib.types.str;
         default = [];
-        description = "Additional kernel modules to blacklist.";
+        description = "Additional kernel systemModules to blacklist.";
       };
     };
   };

system/modules/boot/loader/default.nix

@@ -6,10 +6,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption mkMerge mkForce;
-  cfg = config.modules.boot.loader;
+  cfg = config.systemModules.boot.loader;
 in {
   options = {
-    modules.boot.loader = {
+    systemModules.boot.loader = {
       default = {
         enable = mkEnableOption "Enable default boot loader configuration.";
       };
@@ -28,7 +28,7 @@ in {
       assertions = [
         {
           assertion = !(cfg.default.enable && cfg.lanzaboote.enable);
-          message = "Only one of modules.boot.loader.default.enable and modules.boot.loader.lanzaboote.enable can be set to true.";
+          message = "Only one of systemModules.boot.loader.default.enable and systemModules.boot.loader.lanzaboote.enable can be set to true.";
         }
       ];
     }

system/modules/default.nix

@@ -1,54 +1,54 @@
-{systemModules, ...}: {
+{smodPath, ...}: {
   imports = [
-    "${systemModules}/boot/loader"
+    "${smodPath}/boot/loader"
-    "${systemModules}/boot/kernel"
+    "${smodPath}/boot/kernel"
-    "${systemModules}/gaming/gamemode"
+    "${smodPath}/gaming/gamemode"
-    "${systemModules}/gaming/gamescope"
+    "${smodPath}/gaming/gamescope"
-    "${systemModules}/gaming/lutris"
+    "${smodPath}/gaming/lutris"
-    "${systemModules}/gaming/steam"
+    "${smodPath}/gaming/steam"
-    "${systemModules}/gui/gnome"
+    "${smodPath}/gui/gnome"
-    "${systemModules}/gui/hyprland"
+    "${smodPath}/gui/hyprland"
-    "${systemModules}/hardware/bluetooth"
+    "${smodPath}/hardware/bluetooth"
-    "${systemModules}/hardware/graphics/amd"
+    "${smodPath}/hardware/graphics/amd"
-    "${systemModules}/hardware/graphics/nvidia"
+    "${smodPath}/hardware/graphics/nvidia"
-    "${systemModules}/hardware/logitech"
+    "${smodPath}/hardware/logitech"
-    "${systemModules}/hardware/network"
+    "${smodPath}/hardware/network"
-    "${systemModules}/nix/nh"
+    "${smodPath}/nix/nh"
-    "${systemModules}/studio/blender"
+    "${smodPath}/studio/blender"
-    "${systemModules}/studio/gimp"
+    "${smodPath}/studio/gimp"
-    "${systemModules}/studio/inkscape"
+    "${smodPath}/studio/inkscape"
-    "${systemModules}/studio/beekeeper"
+    "${smodPath}/studio/beekeeper"
-    "${systemModules}/studio/mysql-workbench"
+    "${smodPath}/studio/mysql-workbench"
-    "${systemModules}/sysd/network/blueman"
+    "${smodPath}/sysd/network/blueman"
-    "${systemModules}/sysd/network/mullvad"
+    "${smodPath}/sysd/network/mullvad"
-    "${systemModules}/sysd/network/samba"
+    "${smodPath}/sysd/network/samba"
-    "${systemModules}/sysd/network/openssh"
+    "${smodPath}/sysd/network/openssh"
-    "${systemModules}/sysd/security/agenix"
+    "${smodPath}/sysd/security/agenix"
-    "${systemModules}/sysd/security/gnome-keyring"
+    "${smodPath}/sysd/security/gnome-keyring"
-    "${systemModules}/sysd/session/dbus"
+    "${smodPath}/sysd/session/dbus"
-    "${systemModules}/sysd/session/dconf"
+    "${smodPath}/sysd/session/dconf"
-    "${systemModules}/sysd/session/xserver"
+    "${smodPath}/sysd/session/xserver"
-    "${systemModules}/sysd/system/fwupd"
+    "${smodPath}/sysd/system/fwupd"
-    "${systemModules}/sysd/system/greetd"
+    "${smodPath}/sysd/system/greetd"
-    "${systemModules}/sysd/system/gvfs"
+    "${smodPath}/sysd/system/gvfs"
-    "${systemModules}/sysd/system/locate"
+    "${smodPath}/sysd/system/locate"
-    "${systemModules}/sysd/system/nix-ld"
+    "${smodPath}/sysd/system/nix-ld"
-    "${systemModules}/sysd/system/pcscd"
+    "${smodPath}/sysd/system/pcscd"
-    "${systemModules}/sysd/system/pipewire"
+    "${smodPath}/sysd/system/pipewire"
-    "${systemModules}/sysd/system/powerd"
+    "${smodPath}/sysd/system/powerd"
-    "${systemModules}/sysd/system/udisks"
+    "${smodPath}/sysd/system/udisks"
-    "${systemModules}/sysd/system/zram"
+    "${smodPath}/sysd/system/zram"
-    "${systemModules}/sysd/system/kanata"
+    "${smodPath}/sysd/system/kanata"
-    "${systemModules}/utils/android"
+    "${smodPath}/utils/android"
-    "${systemModules}/utils/anyrun"
+    "${smodPath}/utils/anyrun"
-    "${systemModules}/utils/brightnessctl"
+    "${smodPath}/utils/brightnessctl"
-    "${systemModules}/utils/chaotic"
+    "${smodPath}/utils/chaotic"
-    "${systemModules}/utils/corectrl"
+    "${smodPath}/utils/corectrl"
-    "${systemModules}/utils/microfetch"
+    "${smodPath}/utils/microfetch"
-    "${systemModules}/utils/misc"
+    "${smodPath}/utils/misc"
-    "${systemModules}/utils/npm"
+    "${smodPath}/utils/npm"
-    "${systemModules}/utils/obsidian"
+    "${smodPath}/utils/obsidian"
-    "${systemModules}/utils/yubikey"
+    "${smodPath}/utils/yubikey"
-    "${systemModules}/utils/zsh"
+    "${smodPath}/utils/zsh"
   ];
 }

system/modules/gaming/gamemode/default.nix

@@ -6,14 +6,14 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption mkOption;
-  cfg = config.modules.gaming.gamemode;
+  cfg = config.systemModules.gaming.gamemode;
   pipewireLowLatencyModule = inputs.nix-gaming.nixosModules.pipewireLowLatency;
 in {
   imports = [
     pipewireLowLatencyModule
   ];
   options = {
-    modules.gaming.gamemode = {
+    systemModules.gaming.gamemode = {
       enable = mkEnableOption "Enables gamemode";
       optimizeGpu.enable = mkOption {
         type = lib.types.bool;
@@ -29,7 +29,7 @@ in {
         general = {
           inhibit_screensaver = 1;
           softrealtime = "auto";
-          renice = 15;
+          # renice = 15;
         };
         gpu = mkIf cfg.optimizeGpu.enable {
           apply_gpu_optimisations = "accept-responsibility";

system/modules/gaming/gamescope/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.gaming.gamescope;
+  cfg = config.systemModules.gaming.gamescope;
 in {
   options = {
-    modules.gaming.gamescope.enable = mkEnableOption "Enables gamescope";
+    systemModules.gaming.gamescope.enable = mkEnableOption "Enables gamescope";
   };
   config = mkIf cfg.enable {
     programs.gamescope = {

system/modules/gaming/lutris/default.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.gaming.lutris;
+  cfg = config.systemModules.gaming.lutris;
 in {
   options = {
-    modules.gaming.lutris.enable = mkEnableOption "Enables lutris";
+    systemModules.gaming.lutris.enable = mkEnableOption "Enables lutris";
   };
   config = mkIf cfg.enable {
     environment.systemPackages = with pkgs; [

system/modules/gaming/steam/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.gaming.steam;
+  cfg = config.systemModules.gaming.steam;
 in {
   options = {
-    modules.gaming.steam.enable = mkEnableOption "Enables steam";
+    systemModules.gaming.steam.enable = mkEnableOption "Enables steam";
   };
   config = mkIf cfg.enable {
     programs = {

system/modules/gui/gnome/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.gui.gnome;
+  cfg = config.systemModules.gui.gnome;
 in {
   options = {
-    modules.gui.gnome.enable = mkEnableOption "Enables gnome";
+    systemModules.gui.gnome.enable = mkEnableOption "Enables gnome";
   };
   config = mkIf cfg.enable {
     services = {

system/modules/gui/hyprland/default.nix

@@ -6,10 +6,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.gui.hyprland;
+  cfg = config.systemModules.gui.hyprland;
 in {
   options = {
-    modules.gui.hyprland.enable = mkEnableOption "Enables hyprland";
+    systemModules.gui.hyprland.enable = mkEnableOption "Enables hyprland";
   };
   config = mkIf cfg.enable {
     programs.hyprland = {

system/modules/hardware/bluetooth/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.hardware.bluetooth;
+  cfg = config.systemModules.hardware.bluetooth;
 in {
   options = {
-    modules.hardware.bluetooth.enable = mkEnableOption "Enables bluetooth";
+    systemModules.hardware.bluetooth.enable = mkEnableOption "Enables bluetooth";
   };
   config = mkIf cfg.enable {
     hardware = {

system/modules/hardware/graphics/amd/default.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.hardware.graphics.amd;
+  cfg = config.systemModules.hardware.graphics.amd;
 in {
   options = {
-    modules.hardware.graphics.amd.enable = mkEnableOption "Enables AMD graphics";
+    systemModules.hardware.graphics.amd.enable = mkEnableOption "Enables AMD graphics";
   };
   config = mkIf cfg.enable {
     hardware = {

system/modules/hardware/graphics/nvidia/default.nix

@@ -15,10 +15,10 @@
         exec "$@"
   '';
   inherit (lib) types mkIf mkEnableOption mkOption;
-  cfg = config.modules.hardware.graphics.nvidia;
+  cfg = config.systemModules.hardware.graphics.nvidia;
 in {
   options = {
-    modules.hardware.graphics.nvidia = {
+    systemModules.hardware.graphics.nvidia = {
       enable = mkEnableOption "Enables NVidia graphics";
       package = mkOption {
         type = types.enum ["stable" "beta" "production" "latest"];

system/modules/hardware/logitech/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.hardware.logitech;
+  cfg = config.systemModules.hardware.logitech;
 in {
   options = {
-    modules.hardware.logitech.enable = mkEnableOption "Enables logitech";
+    systemModules.hardware.logitech.enable = mkEnableOption "Enables logitech";
   };
   config = mkIf cfg.enable {
     hardware = {

system/modules/hardware/network/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption mkOption types;
-  cfg = config.modules.hardware.network;
+  cfg = config.systemModules.hardware.network;
 in {
   options = {
-    modules = {
+    systemModules = {
       hardware = {
         network = {
           enable = mkEnableOption "Enable the custom networking module";

system/modules/nix/nh/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption mkOption;
-  cfg = config.modules.nix.nh;
+  cfg = config.systemModules.nix.nh;
 in {
   options = {
-    modules.nix.nh = {
+    systemModules.nix.nh = {
       enable = mkEnableOption "Enables nix helper";
       clean = {
         enable = mkEnableOption "Enables nix helper cleaning";

system/modules/studio/beekeeper/default.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.studio.beekeeper;
+  cfg = config.systemModules.studio.beekeeper;
 in {
   options = {
-    modules.studio.beekeeper.enable = mkEnableOption "Enables Beekeeper Studio";
+    systemModules.studio.beekeeper.enable = mkEnableOption "Enables Beekeeper Studio";
   };
   config = mkIf cfg.enable {
     environment.systemPackages = with pkgs; [

system/modules/studio/blender/default.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption mkOption;
-  cfg = config.modules.studio.blender;
+  cfg = config.systemModules.studio.blender;
 in {
   options = {
-    modules.studio.blender = {
+    systemModules.studio.blender = {
       enable = mkEnableOption "Enables Blender";
       hip.enable = mkOption {
         type = lib.types.bool;

system/modules/studio/gimp/default.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.studio.gimp;
+  cfg = config.systemModules.studio.gimp;
 in {
   options = {
-    modules.studio.gimp.enable = mkEnableOption "Enables gimp";
+    systemModules.studio.gimp.enable = mkEnableOption "Enables gimp";
   };
   config = mkIf cfg.enable {
     environment.systemPackages = [

system/modules/studio/inkscape/default.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.studio.inkscape;
+  cfg = config.systemModules.studio.inkscape;
 in {
   options = {
-    modules.studio.inkscape.enable = mkEnableOption "Enables inkscape";
+    systemModules.studio.inkscape.enable = mkEnableOption "Enables inkscape";
   };
   config = mkIf cfg.enable {
     environment.systemPackages = with pkgs; [

system/modules/studio/mysql-workbench/default.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.studio.mysql-workbench;
+  cfg = config.systemModules.studio.mysql-workbench;
 in {
   options = {
-    modules.studio.mysql-workbench.enable = mkEnableOption "Enables MySQL Workbench";
+    systemModules.studio.mysql-workbench.enable = mkEnableOption "Enables MySQL Workbench";
   };
   config = mkIf cfg.enable {
     environment.systemPackages = with pkgs; [

system/modules/sysd/network/blueman/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.sysd.network.blueman;
+  cfg = config.systemModules.sysd.network.blueman;
 in {
   options = {
-    modules.sysd.network.blueman.enable = mkEnableOption "Enables blueman";
+    systemModules.sysd.network.blueman.enable = mkEnableOption "Enables blueman";
   };
   config = mkIf cfg.enable {
     services = {

system/modules/sysd/network/mullvad/default.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.sysd.network.mullvad;
+  cfg = config.systemModules.sysd.network.mullvad;
 in {
   options = {
-    modules.sysd.network.mullvad.enable = mkEnableOption "Enables mullvad";
+    systemModules.sysd.network.mullvad.enable = mkEnableOption "Enables mullvad";
   };
   config = mkIf cfg.enable {
     services.mullvad-vpn = {

system/modules/sysd/network/openssh/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.sysd.network.openssh;
+  cfg = config.systemModules.sysd.network.openssh;
 in {
   options = {
-    modules.sysd.network.openssh.enable = mkEnableOption "Enables openssh";
+    systemModules.sysd.network.openssh.enable = mkEnableOption "Enables openssh";
   };
   config = mkIf cfg.enable {
     services.openssh = {

system/modules/sysd/network/samba/default.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.sysd.network.samba;
+  cfg = config.systemModules.sysd.network.samba;
 in {
   options = {
-    modules.sysd.network.samba.enable = mkEnableOption "Enables samba";
+    systemModules.sysd.network.samba.enable = mkEnableOption "Enables samba";
   };
   config = mkIf cfg.enable {
     services = {

system/modules/sysd/security/agenix/default.nix

@@ -7,10 +7,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption mkOption mkMerge;
-  cfg = config.modules.sysd.security.agenix;
+  cfg = config.systemModules.sysd.security.agenix;
 in {
   options = {
-    modules.sysd.security.agenix = {
+    systemModules.sysd.security.agenix = {
       enable = mkEnableOption "Enables agenix system environment";
       cnix.enable = mkOption {
         type = lib.types.bool;

system/modules/sysd/security/gnome-keyring/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.sysd.security.gnome-keyring;
+  cfg = config.systemModules.sysd.security.gnome-keyring;
 in {
   options = {
-    modules.sysd.security.gnome-keyring.enable = mkEnableOption "Enables gnome-keyring";
+    systemModules.sysd.security.gnome-keyring.enable = mkEnableOption "Enables gnome-keyring";
   };
   config = mkIf cfg.enable {
     services.gnome.gnome-keyring.enable = true;