diff --git a/home-modules/hyprland.nix b/home-modules/hyprland.nix index d0fed24..a10c7aa 100755 --- a/home-modules/hyprland.nix +++ b/home-modules/hyprland.nix @@ -333,7 +333,7 @@ lib.mkIf (user != "tv") "SUPER SHIFT, F5, exec, nx_gcal_event reauthenticate" # "SUPER, F6," ''SUPER, F8, exec, find ~/Pictures/wallpapers/* -type f -not -path "~/Pictures/wallpapers/.git/*" | sort -R | head -n 1 | xargs swww img --transition-type wipe --transition-angle 60 --transition-step 120 --transition-fps 120'' - "SUPER, F9, exec, change_colors_json $(swww query | sed -n 2p | sed -e 's-.*image: --g') && kitty -e sh -c 'nh home switch'" + "SUPER, F9, exec, change_colors_json $(swww query | sed -n 2p | sed -e 's-.*image: --g') && kitty -e bash -c 'home-manager switch --flake /home/${user}/nix-dots/#${user}@${host} --refresh'" # "SUPER, F10, hyprload,update" "SUPER, F11, exec, waybar" "SUPER SHIFT, F11, exec, pkill waybar " diff --git a/home-modules/rofi.nix b/home-modules/rofi.nix index 574e699..6b02510 100755 --- a/home-modules/rofi.nix +++ b/home-modules/rofi.nix @@ -1,4 +1,4 @@ -{ config, pkgs, rice, lib, user, ... }: +{ pkgs, rice, lib, user, ... }: let trdr = "${rice.lib.float-to-drune rice.transparency}"; in @@ -29,7 +29,7 @@ lib.mkIf (user != "tv") background-color: ${rice.color.background}${trdr}; border: ${builtins.toString rice.border-width}px; border-radius: ${builtins.toString rice.rounding}; - border-color: ${rice.color.blue.base}; + border-color: ${rice.color.border}; } #mainbox { border: 0; @@ -53,12 +53,13 @@ lib.mkIf (user != "tv") #element { border: 0; - padding: 0px ; + padding: 0px; + border-radius: ${if rice.rounding > 0 then "2" else "0"}px; } - #element.normal.normal { background-color: ${rice.color.background}${trdr}; text-color: ${rice.color.foreground}; } - #element.selected.normal { background-color: ${rice.color.blue.base}${trdr}; text-color: ${rice.color.background}; } - #element.alternate.normal { background-color: ${rice.color.black.base}${trdr}; text-color: ${rice.color.foreground}; } + #element.normal.normal { background-color: ${rice.color.background}${trdr}; text-color: ${rice.color.accent.base}; } + #element.selected.normal { background-color: ${rice.color.tertiary.base}${trdr}; text-color: ${rice.color.background}; } + #element.alternate.normal { background-color: ${rice.color.background}${trdr}; text-color: ${rice.color.secondary.base}; } #scrollbar { @@ -76,8 +77,9 @@ lib.mkIf (user != "tv") #inputbar { spacing: 0; text-color: ${rice.color.background}; - background-color: ${rice.color.red.base}${trdr}; + background-color: ${rice.color.accent.base}${trdr}; padding: 0; + margine-bottom: 2px; children: [ prompt,textbox-prompt-colon,entry,case-indicator ]; } #prompt { diff --git a/home-modules/wallpaper-to-colors.nix b/home-modules/wallpaper-to-colors.nix index 8c597f3..50dcc57 100644 --- a/home-modules/wallpaper-to-colors.nix +++ b/home-modules/wallpaper-to-colors.nix @@ -68,7 +68,7 @@ class Palette: def ensure_color(c: Color, alter_sat: bool) -> list[int]: hue, lum, sat = c.hls if alter_sat: - new_sat = min(max(sat, 0.6) + 0.3, 1) + new_sat = min(sat**0.5, 1) else: new_sat = sat new_lum = max(lum, 0.5)