From 4992ab28f48b570690bc375770a5d8bb25cbf8a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adomas=20Jatu=C5=BEis?= Date: Tue, 21 Jan 2025 21:34:26 +0200 Subject: [PATCH] hyprland: use settings and style from stylix --- profiles/t14.nix | 8 +++++++- profiles/wm/hyprland/default.nix | 17 ++++++++++++----- profiles/wm/waybar/default.nix | 2 +- profiles/wm/waybar/style.css | 2 +- 4 files changed, 21 insertions(+), 8 deletions(-) diff --git a/profiles/t14.nix b/profiles/t14.nix index b2e8fb8d..7cfe1ffd 100644 --- a/profiles/t14.nix +++ b/profiles/t14.nix @@ -94,7 +94,13 @@ xset s off -dpms xrandr --output eDP --set TearFree on ''; - wayland.windowManager.hyprland.settings.monitor = [ "eDP-1,1920x1080,0x0,1.25" ]; + wayland.windowManager.hyprland.settings = { + monitor = [ "eDP-1,1920x1080,0x0,1.25" ]; + decoration = { + blur.enabled = false; + shadow.enabled = false; + }; + }; wayland.windowManager.sway = { config = { input = { diff --git a/profiles/wm/hyprland/default.nix b/profiles/wm/hyprland/default.nix index 54cf548f..5105e41d 100644 --- a/profiles/wm/hyprland/default.nix +++ b/profiles/wm/hyprland/default.nix @@ -1,5 +1,6 @@ { pkgs, + lib, myPkgs, config, ... @@ -65,6 +66,15 @@ } ]; }; + stylix.targets = { + hyprland.enable = true; + waybar = { + enable = true; + enableCenterBackColors = true; + enableLeftBackColors = true; + enableRightBackColors = true; + }; + }; wayland.windowManager.hyprland = { enable = true; xwayland.enable = true; @@ -122,8 +132,6 @@ gaps_in = 5; gaps_out = 20; border_size = 2; - "col.active_border" = "rgba(33ccffee) rgba(00ff99ee) 45deg"; - "col.inactive_border" = "rgba(595959aa)"; layout = "master"; allow_tearing = true; @@ -134,17 +142,16 @@ rounding = 5; blur = { - enabled = true; + enabled = lib.mkDefault true; size = 3; passes = 1; new_optimizations = true; }; shadow = { - enabled = true; + enabled = lib.mkDefault true; range = 4; render_power = 3; - color = "rgba(1a1a1aee)"; }; }; diff --git a/profiles/wm/waybar/default.nix b/profiles/wm/waybar/default.nix index cb521fff..a8568ed0 100644 --- a/profiles/wm/waybar/default.nix +++ b/profiles/wm/waybar/default.nix @@ -1,6 +1,6 @@ { programs.waybar = { enable = true; - style = builtins.readFile ./style.css; + # style = builtins.readFile ./style.css; }; } diff --git a/profiles/wm/waybar/style.css b/profiles/wm/waybar/style.css index 433026b2..55a5db82 100644 --- a/profiles/wm/waybar/style.css +++ b/profiles/wm/waybar/style.css @@ -7,7 +7,7 @@ window#waybar { background-color: rgba(43, 48, 59, 0.5); - border-bottom: 3px solid rgba(100, 114, 125, 0.5); + border-bottom: 0px solid rgba(100, 114, 125, 0.5); color: #ffffff; transition-property: background-color; transition-duration: .5s;