diff --git a/config/waybar/style.css b/config/waybar/style.css index 3eda627..d03b43e 100644 --- a/config/waybar/style.css +++ b/config/waybar/style.css @@ -1,11 +1,15 @@ + +@import "./theme.css"; * { border: none; border-radius: 0; min-height: 0; font-family: CaskaydiaMono Nerd Font; font-size: 14px; + background-color: transparent; } + #workspaces { margin-left: 7px; } @@ -23,8 +27,9 @@ #network, #bluetooth, #wireplumber, -#tray widget, +#tray, #clock { + background-color: transparent; min-width: 12px; margin-right: 13px; } @@ -36,5 +41,3 @@ tooltip { tooltip label { padding: 2px; } - -@import "./theme.css"; \ No newline at end of file diff --git a/modules/home-manager/hyprland/bindings.nix b/modules/home-manager/hyprland/bindings.nix index 79f0e9d..f4a6733 100644 --- a/modules/home-manager/hyprland/bindings.nix +++ b/modules/home-manager/hyprland/bindings.nix @@ -15,6 +15,7 @@ in { # "SUPER SHIFT CTRL, SPACE, exec, ~/.local/share/omarchy/bin/omarchy-theme-next" "SUPER, W, killactive," + "SUPER, Backspace, killactive," # End active session "SUPER, ESCAPE, exec, hyprlock" diff --git a/modules/home-manager/hyprland/looknfeel.nix b/modules/home-manager/hyprland/looknfeel.nix index a469fad..3f828ba 100644 --- a/modules/home-manager/hyprland/looknfeel.nix +++ b/modules/home-manager/hyprland/looknfeel.nix @@ -30,18 +30,17 @@ in { rounding = 4; shadow = { - enabled = true; - range = 14; + enabled = false; + range = 30; render_power = 3; ignore_window = true; color = "rgba(00000045)"; - # color = hexToRgba config.colorScheme.palette.base00 "ee"; }; blur = { enabled = true; - size = 3; - passes = 1; + size = 5; + passes = 2; vibrancy = 0.1696; }; diff --git a/modules/home-manager/waybar.nix b/modules/home-manager/waybar.nix index 66f167f..f80b940 100644 --- a/modules/home-manager/waybar.nix +++ b/modules/home-manager/waybar.nix @@ -2,11 +2,10 @@ inputs: { config, pkgs, ... -}: -let +}: let palette = config.colorScheme.palette; convert = inputs.nix-colors.lib.conversions.hexToRGBString; - backgroundRgb = "rgba(${convert ", " palette.base00}, 0.25)"; + backgroundRgb = "rgba(${convert ", " palette.base00}, 0)"; in { home.file = { ".config/waybar/" = { @@ -15,10 +14,13 @@ in { }; ".config/waybar/theme.css" = { text = '' + @define-color background ${backgroundRgb}; * { - color: #${config.colorScheme.palette.base05}; + color: white; + } + + window#waybar { background-color: ${backgroundRgb}; - } ''; }; @@ -152,6 +154,7 @@ in { on-click-right = "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"; # Updated command max-volume = 150; # Optional: allow volume over 100% }; + tray = {spacing = 13;}; power-profiles-daemon = { format = "{icon}"; tooltip-format = "Power profile: {profile}"; diff --git a/modules/nixos/1password.nix b/modules/nixos/1password.nix index 17af226..3203acd 100644 --- a/modules/nixos/1password.nix +++ b/modules/nixos/1password.nix @@ -6,5 +6,4 @@ # TODO: Dynamically get user names _1password-gui.polkitPolicyOwners = ["henry"]; }; - } diff --git a/modules/packages.nix b/modules/packages.nix index d47777e..d90af3c 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -11,6 +11,7 @@ nautilus hyprshot hyprpicker + hyprsunset alejandra pamixer playerctl