cnst/cnix
1
0
Fork 0
Code Issues Pull Requests Activity

some refactoring

Browse Source
This commit is contained in:
cnst
2024-10-13 18:09:15 +02:00
parent 25a3fed51c
commit 084bc3b34f
125 changed files with 437 additions and 370 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
home/modules/wm/hyprland/cnst/appearance.nix
View File

@@ -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 = {

18
home/modules/wm/hyprland/cnst/default.nix
View File

@@ -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"
"${userModules}/wm/hyprland/cnst/inputs.nix"
"${userModules}/wm/hyprland/cnst/keybinds.nix"
"${userModules}/wm/hyprland/cnst/rules.nix"
"${userModules}/wm/hyprland/cnst/startup.nix"
"${umodPath}/wm/hyprland/cnst/appearance.nix"
"${umodPath}/wm/hyprland/cnst/inputs.nix"
"${umodPath}/wm/hyprland/cnst/keybinds.nix"
"${umodPath}/wm/hyprland/cnst/rules.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;

8
home/modules/wm/hyprland/cnst/inputs.nix
View File

@@ -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;

4
home/modules/wm/hyprland/cnst/keybinds.nix
View File

@@ -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 = {

4
home/modules/wm/hyprland/cnst/rules.nix
View File

@@ -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 = {

4
home/modules/wm/hyprland/cnst/startup.nix
View File

@@ -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 = {

6
home/modules/wm/hyprland/default.nix
View File

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

4
home/modules/wm/hyprland/toothpick/appearance.nix
View File

@@ -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 = {

18
home/modules/wm/hyprland/toothpick/default.nix
View File

@@ -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"
"${userModules}/wm/hyprland/toothpick/inputs.nix"
"${userModules}/wm/hyprland/toothpick/keybinds.nix"
"${userModules}/wm/hyprland/toothpick/rules.nix"
"${userModules}/wm/hyprland/toothpick/startup.nix"
"${umodPath}/wm/hyprland/toothpick/appearance.nix"
"${umodPath}/wm/hyprland/toothpick/inputs.nix"
"${umodPath}/wm/hyprland/toothpick/keybinds.nix"
"${umodPath}/wm/hyprland/toothpick/rules.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;

4
home/modules/wm/hyprland/toothpick/inputs.nix
View File

@@ -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 = {

4
home/modules/wm/hyprland/toothpick/keybinds.nix
View File

@@ -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 = {

4
home/modules/wm/hyprland/toothpick/rules.nix
View File

@@ -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 = {

4
home/modules/wm/hyprland/toothpick/startup.nix
View File

@@ -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 = {

4
home/modules/wm/utils/hypridle/default.nix
View File

@@ -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 = {

4
home/modules/wm/utils/hyprlock/default.nix
View File

@@ -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 = {

4
home/modules/wm/utils/hyprpaper/default.nix
View File

@@ -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 = {