From 63fcc689bc762c2b11c94613a7d7c23b8ca588aa Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Thu, 19 Dec 2024 07:16:12 +0000 Subject: [PATCH] Theme updates Add wlogout style config, based on default with modified colours using base16 scheme Add some opacity back: 0.8 for terminal and desktop, 0.4 for popups, still 1.0 for applications Slightly shrink fuzzel and Nautilus sizes to fit laptops better Set round to 10px from 5 globally Fix inactive border colour in btm, fix fzf using a solid background on translucent terminals --- system/default.nix | 7 +++- system/home/fuzzel.nix | 6 ++-- system/home/hyprland.nix | 4 +-- system/home/mako.nix | 2 +- system/home/shell/bottom.nix | 2 +- system/home/shell/default.nix | 11 ++++++- system/home/waybar.nix | 4 +-- system/home/wlogout.nix | 60 +++++++++++++++++++++++++++++++++++ 8 files changed, 85 insertions(+), 11 deletions(-) diff --git a/system/default.nix b/system/default.nix index 5592bf7b..3b9cba3d 100644 --- a/system/default.nix +++ b/system/default.nix @@ -203,7 +203,12 @@ enable = true; image = ./wallpapers/tropic_island_day.jpg; base16Scheme = "${pkgs.base16-schemes}/share/themes/one-light.yaml"; - opacity.terminal = 0.6; + opacity = { + applications = 1.0; + desktop = 0.8; + popups = 0.4; + terminal = 0.8; + }; cursor = { package = pkgs.volantes-cursors; name = "volantes_cursors"; diff --git a/system/home/fuzzel.nix b/system/home/fuzzel.nix index 14f7181f..1f69d013 100644 --- a/system/home/fuzzel.nix +++ b/system/home/fuzzel.nix @@ -11,13 +11,13 @@ filter-desktop = true; terminal = "${config.programs.alacritty.package}/bin/alacritty -e"; lines = 24; - width = 60; + width = 40; tabs = 4; layer = "overlay"; }; border = { - width = 1; - radius = 5; + width = 2; + radius = 10; }; colors.border = lib.mkForce "${config.lib.stylix.scheme.base0E}ff"; }; diff --git a/system/home/hyprland.nix b/system/home/hyprland.nix index 23328816..f7ad0e01 100644 --- a/system/home/hyprland.nix +++ b/system/home/hyprland.nix @@ -176,7 +176,7 @@ touchpad.natural_scroll = "yes"; }; decoration = { - rounding = 5; + rounding = 10; blur = { enabled = true; size = 5; @@ -241,7 +241,7 @@ "move onscreen 100%-820 50,pavucontrol|nm-connection-editor|overskride|io.github.kaii_lb.Overskride" # File browser and picker dialog "float, org.gnome.Nautilus|xdg-desktop-portal-gtk" - "size 1200 800, org.gnome.Nautilus|xdg-desktop-portal-gtk" + "size 800 600, org.gnome.Nautilus|xdg-desktop-portal-gtk" "center, org.gnome.Nautilus|xdg-desktop-portal-gtk" # Matplotlib plots "float, Matplotlib" diff --git a/system/home/mako.nix b/system/home/mako.nix index 7caa0978..287ca842 100644 --- a/system/home/mako.nix +++ b/system/home/mako.nix @@ -10,7 +10,7 @@ maxVisible = 10; icons = true; iconPath = with config.gtk.iconTheme; "${package}/share/icons/${name}"; - borderRadius = 5; + borderRadius = 10; borderSize = 1; borderColor = lib.mkForce config.lib.stylix.scheme.withHashtag.base0E; defaultTimeout = (builtins.mul 5 1000); # 5s timeout diff --git a/system/home/shell/bottom.nix b/system/home/shell/bottom.nix index e2ade74f..fa79f700 100644 --- a/system/home/shell/bottom.nix +++ b/system/home/shell/bottom.nix @@ -35,7 +35,7 @@ tx_color = scheme.green; }; widgets = { - border_color = scheme.base04; + border_color = scheme.base03; selected_border_color = scheme.base0E; }; }; diff --git a/system/home/shell/default.nix b/system/home/shell/default.nix index 4d2c65bc..963a0ce7 100644 --- a/system/home/shell/default.nix +++ b/system/home/shell/default.nix @@ -1,4 +1,9 @@ -{ config, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: { imports = [ ./git.nix @@ -44,6 +49,10 @@ defaultCommand = "${pkgs.fd}/bin/fd --type f"; changeDirWidgetCommand = "${pkgs.fd}/bin/fd --type d"; fileWidgetCommand = "${pkgs.fd}/bin/fd --type f"; + colors = { + bg = lib.mkForce "-1"; + "bg+" = lib.mkForce "-1"; + }; }; hyfetch = { enable = true; diff --git a/system/home/waybar.nix b/system/home/waybar.nix index 2c3d620b..cf8749e6 100644 --- a/system/home/waybar.nix +++ b/system/home/waybar.nix @@ -313,13 +313,13 @@ margin: 5px 5px 0px; padding: 0px; border: 1px solid ${scheme.base04}; - border-radius: 5px; + border-radius: 10px; } tooltip { background: ${scheme.base00}; border: 1px solid ${scheme.base0E}; - border-radius: 5px; + border-radius: 10px; box-shadow: none; } diff --git a/system/home/wlogout.nix b/system/home/wlogout.nix index a2c380d7..08d1987e 100644 --- a/system/home/wlogout.nix +++ b/system/home/wlogout.nix @@ -22,5 +22,65 @@ keybind = "l"; } ]; + style = + let + scheme = config.lib.stylix.scheme; + opacity = config.stylix.opacity.popups; + icons = "${config.programs.wlogout.package}/share/wlogout/icons"; + in + '' + * { + background-image: none; + box-shadow: none; + } + + window { + background-color: rgba(${scheme.base00-rgb-r}, ${scheme.base00-rgb-g}, ${scheme.base00-rgb-b}, ${toString opacity}); + } + + button { + border-radius: 0; + border-color: ${scheme.withHashtag.base03}; + text-decoration-color: ${scheme.withHashtag.base05}; + color: ${scheme.withHashtag.base05}; + background-color: ${scheme.withHashtag.base00}; + border-style: solid; + border-width: 1px; + background-repeat: no-repeat; + background-position: center; + background-size: 25%; + } + + button:focus, button:active, button:hover { + text-decoration-color: ${scheme.withHashtag.base00}; + color: ${scheme.withHashtag.base00}; + background-color: ${scheme.withHashtag.base0E}; + outline-style: none; + } + + #lock { + background-image: image(url("${icons}/lock.png")); + } + + #logout { + background-image: image(url("${icons}/logout.png")); + } + + #suspend { + background-image: image(url("${icons}/suspend.png")); + } + + #hibernate { + background-image: image(url("${icons}/hibernate.png")); + } + + #shutdown { + background-image: image(url("${icons}/shutdown.png")); + } + + #reboot { + background-image: image(url("${icons}/reboot.png")); + } + ''; }; }