From bc2d8762c97a7cda61fcf628fdb3d5fab09411c8 Mon Sep 17 00:00:00 2001 From: Nick Date: Thu, 5 Jun 2025 15:28:52 -0500 Subject: [PATCH] feat: quick commit don't care lolololol --- modules/config/default.nix | 6 +++++- modules/config/themes/default.nix | 8 ++++++-- .../gui/desktop/hypr/land/config/decoration.nix | 6 +++++- .../home/gui/desktop/hypr/land/config/general.nix | 12 ++++++++---- modules/home/gui/desktop/hypr/land/default.nix | 2 +- modules/home/gui/desktop/niri/config/layout.nix | 6 +++--- .../home/gui/desktop/niri/config/windowrules.nix | 7 +++++-- modules/home/gui/desktop/niri/default.nix | 2 +- .../gui/desktop/wayland/waybar/config/settings.nix | 8 ++++---- .../gui/desktop/wayland/waybar/config/style.nix | 13 ++++++++++--- 10 files changed, 48 insertions(+), 22 deletions(-) diff --git a/modules/config/default.nix b/modules/config/default.nix index a7ee82e..1beb130 100755 --- a/modules/config/default.nix +++ b/modules/config/default.nix @@ -96,7 +96,11 @@ let themesSubmodule = lib.types.submodule { options = { currentTheme = genOptions stringType "theme"; - wmGaps = intType; + windowManager = { + gaps = intType; + borders = intType; + rounding = intType; + }; fonts = { names = genOptions stringType "name"; sizes = { diff --git a/modules/config/themes/default.nix b/modules/config/themes/default.nix index 4027134..77db2b8 100755 --- a/modules/config/themes/default.nix +++ b/modules/config/themes/default.nix @@ -1,5 +1,5 @@ let - currentTheme0 = catppuccin-mocha; # User0 Theme + currentTheme0 = catppuccin-macchiato; # User0 Theme currentTheme1 = catppuccin-mocha; # User1 Theme currentTheme2 = catppuccin-mocha; # User2 Theme @@ -24,7 +24,11 @@ let in { themes = { - wmGaps = 6; + windowManager = { + gaps = 6; + borders = 3; + rounding = 20; + }; currentTheme = { theme0 = currentTheme0; # User0 Theme theme1 = currentTheme1; # User1 Theme diff --git a/modules/home/gui/desktop/hypr/land/config/decoration.nix b/modules/home/gui/desktop/hypr/land/config/decoration.nix index 38bba5c..ac88625 100755 --- a/modules/home/gui/desktop/hypr/land/config/decoration.nix +++ b/modules/home/gui/desktop/hypr/land/config/decoration.nix @@ -1,8 +1,12 @@ +{ flake, ... }: +let + inherit (flake.config.aesthetics.themes) windowManager; +in { active_opacity = 0.95; inactive_opacity = 0.90; fullscreen_opacity = 1; - rounding = 20; + rounding = windowManager.rounding; dim_inactive = 1; dim_strength = 0.05; diff --git a/modules/home/gui/desktop/hypr/land/config/general.nix b/modules/home/gui/desktop/hypr/land/config/general.nix index ffdc546..68bfe76 100755 --- a/modules/home/gui/desktop/hypr/land/config/general.nix +++ b/modules/home/gui/desktop/hypr/land/config/general.nix @@ -5,7 +5,11 @@ }: let - inherit (flake.config.aesthetics.themes) currentTheme palettes wmGaps; + inherit (flake.config.aesthetics.themes) + currentTheme + palettes + windowManager + ; inherit (flake.config.people) user0 user1 user2; @@ -24,9 +28,9 @@ let el = palettes.${themeLogic}.colours; in { - gaps_in = wmGaps / 2; - gaps_out = wmGaps; - border_size = 2; + gaps_in = windowManager.gaps / 2; + gaps_out = windowManager.gaps; + border_size = windowManager.borders; "col.active_border" = "rgb(${el.base0E})"; "col.inactive_border" = "0xff${el.base02}"; diff --git a/modules/home/gui/desktop/hypr/land/default.nix b/modules/home/gui/desktop/hypr/land/default.nix index d77e245..8aab20b 100755 --- a/modules/home/gui/desktop/hypr/land/default.nix +++ b/modules/home/gui/desktop/hypr/land/default.nix @@ -12,7 +12,7 @@ let bindm = import (configPath + /bindm.nix); binds = import (configPath + /binds.nix); # bindl = import (configPath + /bindl.nix); - decoration = import (configPath + /decoration.nix); + decoration = import (configPath + /decoration.nix) { inherit flake; }; dwindle = import (configPath + /dwindle.nix); exec-once = import (configPath + /exec-once.nix); general = import (configPath + /general.nix) { inherit config flake; }; diff --git a/modules/home/gui/desktop/niri/config/layout.nix b/modules/home/gui/desktop/niri/config/layout.nix index e2b5822..7e62baf 100755 --- a/modules/home/gui/desktop/niri/config/layout.nix +++ b/modules/home/gui/desktop/niri/config/layout.nix @@ -1,6 +1,6 @@ { colourHelpers, flake, ... }: let - inherit (flake.config.aesthetics.themes) wmGaps; + inherit (flake.config.aesthetics.themes) windowManager; in { layout = { @@ -15,11 +15,11 @@ in ]; border = { enable = true; - width = 2; + width = windowManager.borders; active.color = colourHelpers.makeColour colourHelpers.el.base0E; inactive.color = colourHelpers.makeColour colourHelpers.el.base02; }; - gaps = wmGaps; + gaps = windowManager.gaps; shadow = { enable = true; color = colourHelpers.el.base11; diff --git a/modules/home/gui/desktop/niri/config/windowrules.nix b/modules/home/gui/desktop/niri/config/windowrules.nix index b42c7be..5f38b18 100755 --- a/modules/home/gui/desktop/niri/config/windowrules.nix +++ b/modules/home/gui/desktop/niri/config/windowrules.nix @@ -1,4 +1,7 @@ -{ workspaceStrings, ... }: +{ flake, workspaceStrings, ... }: +let + inherit (flake.config.aesthetics.themes) windowManager; +in { window-rules = [ { @@ -113,7 +116,7 @@ focus-ring.enable = false; geometry-corner-radius = let - radius = 10.0; + radius = windowManager.rounding + 0.0; in { top-left = radius; diff --git a/modules/home/gui/desktop/niri/default.nix b/modules/home/gui/desktop/niri/default.nix index 7620a21..06249b2 100755 --- a/modules/home/gui/desktop/niri/default.nix +++ b/modules/home/gui/desktop/niri/default.nix @@ -61,7 +61,7 @@ let }; startup = import (configPath + /startup.nix) { inherit lib pkgs; }; style = import (configPath + /style.nix) { inherit flake; }; - windowrules = import (configPath + /windowrules.nix) { inherit workspaceStrings; }; + windowrules = import (configPath + /windowrules.nix) { inherit flake workspaceStrings; }; workspaces = import (configPath + /workspaces.nix) { inherit workspaceStrings; }; in binds // layout // main // outputs // startup // style // windowrules // workspaces; diff --git a/modules/home/gui/desktop/wayland/waybar/config/settings.nix b/modules/home/gui/desktop/wayland/waybar/config/settings.nix index fa44811..58563f1 100755 --- a/modules/home/gui/desktop/wayland/waybar/config/settings.nix +++ b/modules/home/gui/desktop/wayland/waybar/config/settings.nix @@ -1,7 +1,7 @@ { config, flake, ... }: let user = config.home.username; - inherit (flake.config.aesthetics.themes) wmGaps; + inherit (flake.config.aesthetics.themes) windowManager; in { mainBar = { @@ -9,9 +9,9 @@ in layer = "top"; height = 5; margin-top = 0; - margin-bottom = wmGaps; - margin-left = wmGaps; - margin-right = wmGaps; + margin-bottom = windowManager.gaps; + margin-left = windowManager.gaps; + margin-right = windowManager.gaps; modules-left = [ "custom/launcher" "hyprland/workspaces" diff --git a/modules/home/gui/desktop/wayland/waybar/config/style.nix b/modules/home/gui/desktop/wayland/waybar/config/style.nix index e062be9..018d9b2 100755 --- a/modules/home/gui/desktop/wayland/waybar/config/style.nix +++ b/modules/home/gui/desktop/wayland/waybar/config/style.nix @@ -5,7 +5,12 @@ }: let - inherit (flake.config.aesthetics.themes) currentTheme palettes fonts; + inherit (flake.config.aesthetics.themes) + currentTheme + palettes + fonts + windowManager + ; inherit (flake.config.people) user0 user1 user2; @@ -29,6 +34,8 @@ let font_weight = "bold"; opacityBg = "0.90"; opacityBt = "1"; + border = windowManager.borders; + rounding = windowManager.rounding; text_color = el.base0E; secondary_accent = el.base07; tertiary_accent = el.base15; @@ -50,8 +57,8 @@ in window#waybar { background: #${custom.background_2}; color: #${custom.text_color}; - border: 2px solid; - border-radius: 30px; + border: ${builtins.toString custom.border}px solid; + border-radius: ${builtins.toString custom.rounding}px; border-color: #${custom.text_color}; opacity: ${custom.opacityBg}; }