sorting modules

home/modules/default.nix

@@ -1,36 +1,29 @@
 {userModules, ...}: {
   imports = [
-    "${userModules}/wm/hyprland"
-    "${userModules}/wm/utils/hypridle"
-    "${userModules}/wm/utils/hyprlock"
-    "${userModules}/wm/utils/hyprpaper"
-
-    "${userModules}/browsers/firefox"
     "${userModules}/browsers/chromium"
-
+    "${userModules}/browsers/firefox"
     "${userModules}/comm/discord"
-
-    "${userModules}/gaming/lutris"
-    "${userModules}/gaming/mangohud"
-    # "${userModules}/create"
     "${userModules}/devtools/neovim"
     "${userModules}/devtools/vscode"
-    # "${userModules}/media"
+    "${userModules}/gaming/lutris"
+    "${userModules}/gaming/mangohud"
     "${userModules}/terminal/alacritty"
     "${userModules}/terminal/foot"
     "${userModules}/terminal/kitty"
     "${userModules}/terminal/zellij"
-    "${userModules}/userd/sops"
     "${userModules}/userd/copyq"
     "${userModules}/userd/mako"
+    "${userModules}/userd/sops"
     "${userModules}/userd/udiskie"
-    # "${userModules}/userd"
     "${userModules}/utils/ags"
     "${userModules}/utils/anyrun"
+    "${userModules}/utils/misc"
     "${userModules}/utils/rofi"
     "${userModules}/utils/waybar"
     "${userModules}/utils/yazi"
-    "${userModules}/utils/misc"
+    "${userModules}/wm/hyprland"
-    # "${userModules}/wm"
+    "${userModules}/wm/utils/hypridle"
+    "${userModules}/wm/utils/hyprlock"
+    "${userModules}/wm/utils/hyprpaper"
   ];
 }

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

@@ -1,4 +1,15 @@
 {
+  lib,
+  config,
+  ...
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  cfg = config.modules.wm.hyprland.adam.appearance;
+in {
+  options = {
+    modules.wm.hyprland.adam.appearance.enable = mkEnableOption "Enables appearance settings in Hyprland";
+  };
+  config = mkIf cfg.enable {
     wayland.windowManager.hyprland.settings = {
       general = {
         gaps_in = 2;
@@ -45,4 +56,5 @@
         preserve_split = true; # you probably want this
       };
     };
+  };
 }

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

@@ -1,16 +1,37 @@
-{inputs, ...}: {
+{
+  inputs,
+  config,
+  lib,
+  pkgs,
+  userModules,
+  ...
+}: let
+  inherit (lib) mkIf mkEnableOption mkDefault;
+  cfg = config.modules.wm.hyprland.adam;
+in {
   imports = [
-    inputs.hyprland.homeManagerModules.default
+    "${userModules}/wm/hyprland/adam/appearance.nix"
-    ./appearance.nix
+    "${userModules}/wm/hyprland/adam/inputs.nix"
-    ./inputs.nix
+    "${userModules}/wm/hyprland/adam/keybinds.nix"
-    ./keybinds.nix
+    "${userModules}/wm/hyprland/adam/rules.nix"
-    ./rules.nix
+    "${userModules}/wm/hyprland/adam/startup.nix"
-    ./startup.nix
   ];
-  config = {
+
+  options = {
+    modules.wm.hyprland.adam.enable = mkEnableOption "Enable Hyprland";
+  };
+
+  config = mkIf cfg.enable {
+    modules.wm.hyprland.adam = {
+      appearance.enable = mkDefault cfg.enable;
+      inputs.enable = mkDefault cfg.enable;
+      keybinds.enable = mkDefault cfg.enable;
+      rules.enable = mkDefault cfg.enable;
+      startup.enable = mkDefault cfg.enable;
+    };
     wayland.windowManager.hyprland = {
       enable = true;
-      xwayland.enable = true;
+      package = inputs.hyprland.packages.${pkgs.system}.default;
       systemd = {
         variables = ["--all"];
         extraCommands = [

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

@@ -1,4 +1,15 @@
 {
+  lib,
+  config,
+  ...
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  cfg = config.modules.wm.hyprland.adam.inputs;
+in {
+  options = {
+    modules.wm.hyprland.adam.inputs.enable = mkEnableOption "Enables input settings in Hyprland";
+  };
+  config = mkIf cfg.enable {
     wayland.windowManager.hyprland.settings = {
       monitor = [
         "DP-3, 2560x1440@143.86, auto, auto"
@@ -72,4 +83,5 @@
       #   min_refresh_rate = 24;
       # };
     };
+  };
 }

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

@@ -1,19 +1,34 @@
-# KEYBINDS
 {
+  lib,
+  config,
+  pkgs,
+  ...
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  cfg = config.modules.wm.hyprland.adam.keybinds;
+in {
+  options = {
+    modules.wm.hyprland.adam.keybinds.enable = mkEnableOption "Enables keybind settings in Hyprland";
+  };
+  config = mkIf cfg.enable {
     wayland.windowManager.hyprland.settings = {
       "$terminal" = "kitty";
       "$fileManager" = "thunar";
       "$passwordManager" = "keepassxc";
       "$menu" = "pkill anyrun || anyrun | xargs hyprctl dispatch exec --";
       "$menuw" = "pkill anyrun || anyrun | xargs hyprctl dispatch exec --";
-    "$browser" = "firefox-nightly";
+      "$browser" = "firefox";
-    "$browserinc" = "firefox-nightly --private-window";
+      "$browserinc" = "firefox --private-window";
       "$yazi" = "alacritty -e yazi";
 
       # See https://wiki.hyprland.org/Configuring/Keywords/ for more
-    "$mod" = "SUPER";
+      "$mod" = "ALT_L";
 
-    bind = [
+      bind = let
+        grimblast = lib.getExe pkgs.grimblast;
+        tesseract = lib.getExe pkgs.tesseract;
+        notify-send = lib.getExe' pkgs.libnotify "notify-send";
+      in [
         # Custom binds
         "$mod SHIFT, B, exec, pkill -SIGUSR2 waybar" # Reload waybar
 
@@ -77,12 +92,11 @@
         "$mod, XF86MonBrightnessUp, exec, hyprctl dispatch dpms on"
         "$mod, XF86MonBrightnessDown, exec, hyprctl dispatch dpms off"
 
-      # Screenshot a window
+        # Screenshotting
-      "$mod, F10, exec, hyprshot -m window"
+        ",Print,exec,${grimblast} --notify --freeze copysave area"
-      # Screenshot a monitor
+        "SHIFT,Print,exec,${grimblast} --notify --freeze copysave output"
-      ", F10, exec, hyprshot -m output"
+        # To OCR
-      # Screenshot a region
+        "ALT,Print,exec,${grimblast} --freeze save area - | ${tesseract} - - | wl-copy && ${notify-send} -t 3000 'OCR result copied to buffer'"
-      "$mod SHIFT, F10, exec, hyprshot -m region"
 
         # Example special workspace (scratchpad)
         "$mod, S, togglespecialworkspace, magic"
@@ -98,4 +112,5 @@
         "$mod, mouse:273, resizewindow"
       ];
     };
+  };
 }

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

@@ -1,4 +1,15 @@
 {
+  lib,
+  config,
+  ...
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  cfg = config.modules.wm.hyprland.adam.rules;
+in {
+  options = {
+    modules.wm.hyprland.toothpick.adam.enable = mkEnableOption "Enables window rule settings in Hyprland";
+  };
+  config = mkIf cfg.enable {
     wayland.windowManager.hyprland.settings = {
       # CALCURSE SETTINGS
       windowrulev2 = [
@@ -41,4 +52,5 @@
         "float, ^(org.freedesktop.impl.portal.desktop.kde)$"
       ];
     };
+  };
 }

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

@@ -1,4 +1,15 @@
 {
+  lib,
+  config,
+  ...
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  cfg = config.modules.wm.hyprland.adam.startup;
+in {
+  options = {
+    modules.wm.hyprland.adam.startup.enable = mkEnableOption "Enables startup settings in Hyprland";
+  };
+  config = mkIf cfg.enable {
     wayland.windowManager.hyprland.settings = {
       exec-once = [
         # STARTUP
@@ -17,4 +28,5 @@
         "hyprctl dispatch exec 'sleep 3s && solaar -w hide'"
       ];
     };
+  };
 }

home/modules/wm/hyprland/default.nix

@@ -2,6 +2,6 @@
   imports = [
     "${userModules}/wm/hyprland/cnst"
     "${userModules}/wm/hyprland/toothpick"
-    # "${userModules}/wm/hyprland/adam"
+    "${userModules}/wm/hyprland/adam"
   ];
 }

home/users/adam/modules.nix

@@ -1,28 +1,16 @@
 {
   modules = {
-    wm = {
-      hyprland = {
-        cnst.enable = true;
-        # toothpick.enable = false;
-        # adam.enable = false;
-      };
-      utils = {
-        hypridle.enable = true;
-        hyprlock.enable = true;
-        hyprpaper.enable = true;
-      };
-    };
     browsers = {
       firefox.enable = true;
       chromium.enable = false;
     };
+    comm = {
+      discord.enable = true;
+    };
     devtools = {
       neovim.enable = true;
       vscode.enable = false;
     };
-    comm = {
-      discord.enable = true;
-    };
     gaming = {
       lutris.enable = false;
       mangohud.enable = false;
@@ -33,6 +21,12 @@
       kitty.enable = true;
       zellij.enable = false;
     };
+    userd = {
+      sops.enable = false;
+      copyq.enable = true;
+      mako.enable = true;
+      udiskie.enable = true;
+    };
     utils = {
       ags.enable = false;
       anyrun.enable = false;
@@ -41,11 +35,17 @@
       yazi.enable = true;
       misc.enable = true;
     };
-    userd = {
+    wm = {
-      sops.enable = true;
+      hyprland = {
-      copyq.enable = true;
+        cnst.enable = false;
-      mako.enable = true;
+        toothpick.enable = false;
-      udiskie.enable = true;
+        adam.enable = true;
+      };
+      utils = {
+        hypridle.enable = true;
+        hyprlock.enable = true;
+        hyprpaper.enable = true;
+      };
     };
   };
 }

home/users/cnst/modules.nix

@@ -1,28 +1,16 @@
 {
   modules = {
-    wm = {
-      hyprland = {
-        cnst.enable = true;
-        # toothpick.enable = false;
-        # adam.enable = false;
-      };
-      utils = {
-        hypridle.enable = true;
-        hyprlock.enable = true;
-        hyprpaper.enable = true;
-      };
-    };
     browsers = {
       firefox.enable = true;
       chromium.enable = false;
     };
+    comm = {
+      discord.enable = true;
+    };
     devtools = {
       neovim.enable = true;
       vscode.enable = false;
     };
-    comm = {
-      discord.enable = true;
-    };
     gaming = {
       lutris.enable = false;
       mangohud.enable = false;
@@ -33,6 +21,12 @@
       kitty.enable = true;
       zellij.enable = false;
     };
+    userd = {
+      sops.enable = true;
+      copyq.enable = true;
+      mako.enable = true;
+      udiskie.enable = true;
+    };
     utils = {
       ags.enable = false;
       anyrun.enable = false;
@@ -41,11 +35,17 @@
       yazi.enable = true;
       misc.enable = true;
     };
-    userd = {
+    wm = {
-      sops.enable = true;
+      hyprland = {
-      copyq.enable = true;
+        cnst.enable = true;
-      mako.enable = true;
+        toothpick.enable = false;
-      udiskie.enable = true;
+        adam.enable = false;
+      };
+      utils = {
+        hypridle.enable = true;
+        hyprlock.enable = true;
+        hyprpaper.enable = true;
+      };
     };
   };
 }

home/users/toothpick/modules.nix

@@ -1,28 +1,16 @@
 {
   modules = {
-    wm = {
-      hyprland = {
-        cnst.enable = false;
-        toothpick.enable = true;
-        # adam.enable = false;
-      };
-      utils = {
-        hypridle.enable = true;
-        hyprlock.enable = true;
-        hyprpaper.enable = true;
-      };
-    };
     browsers = {
       firefox.enable = true;
       chromium.enable = false;
     };
+    comm = {
+      discord.enable = true;
+    };
     devtools = {
       neovim.enable = true;
       vscode.enable = true;
     };
-    comm = {
-      discord.enable = true;
-    };
     gaming = {
       lutris.enable = false;
       mangohud.enable = false;
@@ -33,6 +21,12 @@
       kitty.enable = true;
       zellij.enable = false;
     };
+    userd = {
+      sops.enable = false;
+      copyq.enable = true;
+      mako.enable = true;
+      udiskie.enable = true;
+    };
     utils = {
       ags.enable = false;
       anyrun.enable = false;
@@ -41,11 +35,17 @@
       yazi.enable = true;
       misc.enable = true;
     };
-    userd = {
+    wm = {
-      sops.enable = false;
+      hyprland = {
-      copyq.enable = true;
+        cnst.enable = false;
-      mako.enable = true;
+        toothpick.enable = true;
-      udiskie.enable = true;
+        adam.enable = false;
+      };
+      utils = {
+        hypridle.enable = true;
+        hyprlock.enable = true;
+        hyprpaper.enable = true;
+      };
     };
   };
 }

hosts/adampad/modules.nix

@@ -1,14 +1,5 @@
 {
   modules = {
-    network = {
-      enable = true;
-      hostName = "adampad";
-      interfaces = {
-        "enp7s0" = {
-          allowedTCPPorts = [22 80 443];
-        };
-      };
-    };
     gaming = {
       steam.enable = false;
       gamescope.enable = false;
@@ -22,12 +13,30 @@
       gnome.enable = false;
       hyprland.enable = true;
     };
-    utils = {
+    hardware = {
-      android.enable = true;
+      bluetooth.enable = true;
-      anyrun.enable = true;
+      logitech.enable = false;
-      corectrl.enable = false;
+      graphics = {
-      microfetch.enable = true;
+        amd.enable = true;
-      nix-ld.enable = false;
+        nvidia.enable = false;
+      };
+    };
+    network = {
+      enable = true;
+      hostName = "adampad";
+      interfaces = {
+        "enp7s0" = {
+          allowedTCPPorts = [22 80 443];
+        };
+      };
+    };
+    studio = {
+      blender = {
+        enable = false;
+        hip = false;
+      };
+      gimp.enable = false;
+      inkscape.enable = false;
     };
     sysd = {
       blueman.enable = true;
@@ -46,21 +55,12 @@
       udisks.enable = true;
       xserver.amd.enable = true;
     };
-    hardware = {
+    utils = {
-      bluetooth.enable = true;
+      android.enable = true;
-      logitech.enable = false;
+      anyrun.enable = true;
-      graphics = {
+      corectrl.enable = false;
-        amd.enable = true;
+      microfetch.enable = true;
-        nvidia.enable = false;
+      nix-ld.enable = false;
-      };
-    };
-    studio = {
-      blender = {
-        enable = false;
-        hip = false;
-      };
-      gimp.enable = false;
-      inkscape.enable = false;
     };
   };
 }

hosts/cnix/modules.nix

@@ -1,14 +1,5 @@
 {
   modules = {
-    network = {
-      enable = true;
-      hostName = "cnix";
-      interfaces = {
-        "enp7s0" = {
-          allowedTCPPorts = [22 80 443];
-        };
-      };
-    };
     gaming = {
       steam.enable = true;
       gamescope.enable = true;
@@ -22,12 +13,30 @@
       gnome.enable = false;
       hyprland.enable = true;
     };
-    utils = {
+    hardware = {
-      android.enable = true;
+      bluetooth.enable = true;
-      anyrun.enable = true;
+      logitech.enable = true;
-      corectrl.enable = true;
+      graphics = {
-      microfetch.enable = true;
+        amd.enable = true;
-      nix-ld.enable = false;
+        nvidia.enable = false;
+      };
+    };
+    network = {
+      enable = true;
+      hostName = "cnix";
+      interfaces = {
+        "enp7s0" = {
+          allowedTCPPorts = [22 80 443];
+        };
+      };
+    };
+    studio = {
+      blender = {
+        enable = false;
+        hip = false;
+      };
+      gimp.enable = true;
+      inkscape.enable = true;
     };
     sysd = {
       blueman.enable = true;
@@ -46,21 +55,12 @@
       udisks.enable = true;
       xserver.amd.hhkbse.enable = true;
     };
-    hardware = {
+    utils = {
-      bluetooth.enable = true;
+      android.enable = true;
-      logitech.enable = true;
+      anyrun.enable = true;
-      graphics = {
+      corectrl.enable = true;
-        amd.enable = true;
+      microfetch.enable = true;
-        nvidia.enable = false;
+      nix-ld.enable = false;
-      };
-    };
-    studio = {
-      blender = {
-        enable = false;
-        hip = false;
-      };
-      gimp.enable = true;
-      inkscape.enable = true;
     };
   };
 }

hosts/toothpc/modules.nix

@@ -1,14 +1,5 @@
 {
   modules = {
-    network = {
-      enable = true;
-      hostName = "toothpc";
-      interfaces = {
-        "enp4s0" = {
-          allowedTCPPorts = [22 80 443];
-        };
-      };
-    };
     gaming = {
       steam.enable = true;
       gamescope.enable = true;
@@ -22,12 +13,30 @@
       gnome.enable = false;
       hyprland.enable = true;
     };
-    utils = {
+    hardware = {
-      android.enable = false;
+      bluetooth.enable = false;
-      anyrun.enable = true;
+      logitech.enable = true;
-      corectrl.enable = true;
+      graphics = {
-      microfetch.enable = true;
+        amd.enable = false;
-      nix-ld.enable = false;
+        nvidia.enable = true;
+      };
+    };
+    network = {
+      enable = true;
+      hostName = "toothpc";
+      interfaces = {
+        "enp4s0" = {
+          allowedTCPPorts = [22 80 443];
+        };
+      };
+    };
+    studio = {
+      blender = {
+        enable = false;
+        hip = false;
+      };
+      gimp.enable = true;
+      inkscape.enable = true;
     };
     sysd = {
       blueman.enable = false;
@@ -46,21 +55,12 @@
       udisks.enable = true;
       xserver.nvidia.enable = true;
     };
-    hardware = {
+    utils = {
-      bluetooth.enable = false;
+      android.enable = true;
-      logitech.enable = true;
+      anyrun.enable = true;
-      graphics = {
+      corectrl.enable = true;
-        amd.enable = false;
+      microfetch.enable = true;
-        nvidia.enable = true;
+      nix-ld.enable = false;
-      };
-    };
-    studio = {
-      blender = {
-        enable = false;
-        hip = false;
-      };
-      gimp.enable = true;
-      inkscape.enable = true;
     };
   };
 }

system/modules/default.nix

@@ -1,17 +1,19 @@
 {systemModules, ...}: {
   imports = [
-    "${systemModules}/network"
     "${systemModules}/gaming/gamemode"
     "${systemModules}/gaming/gamescope"
-    "${systemModules}/gaming/steam"
     "${systemModules}/gaming/lutris"
+    "${systemModules}/gaming/steam"
     "${systemModules}/gui/gnome"
     "${systemModules}/gui/hyprland"
-    "${systemModules}/utils/android"
+    "${systemModules}/hardware/bluetooth"
-    "${systemModules}/utils/anyrun"
+    "${systemModules}/hardware/graphics/amd"
-    "${systemModules}/utils/corectrl"
+    "${systemModules}/hardware/graphics/nvidia"
-    "${systemModules}/utils/microfetch"
+    "${systemModules}/hardware/logitech"
-    "${systemModules}/utils/nix-ld"
+    "${systemModules}/network"
+    "${systemModules}/studio/blender"
+    "${systemModules}/studio/gimp"
+    "${systemModules}/studio/inkscape"
     "${systemModules}/sysd/blueman"
     "${systemModules}/sysd/dbus"
     "${systemModules}/sysd/fwupd"
@@ -29,12 +31,10 @@
     "${systemModules}/sysd/xserver/amd"
     "${systemModules}/sysd/xserver/amd/hhkbse"
     "${systemModules}/sysd/xserver/nvidia"
-    "${systemModules}/hardware/graphics/amd"
+    "${systemModules}/utils/android"
-    "${systemModules}/hardware/graphics/nvidia"
+    "${systemModules}/utils/anyrun"
-    "${systemModules}/hardware/bluetooth"
+    "${systemModules}/utils/corectrl"
-    "${systemModules}/hardware/logitech"
+    "${systemModules}/utils/microfetch"
-    "${systemModules}/studio/gimp"
+    "${systemModules}/utils/nix-ld"
-    "${systemModules}/studio/inkscape"
-    "${systemModules}/studio/blender"
   ];
 }