From 415460db2d3e002441fffff2cf62ad7fa829bde8 Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Sun, 24 Sep 2023 10:29:51 +0100 Subject: [PATCH] Use anyrun again with new theme/config Do some retheming of hyprland/rofi/swaync for better consistency, add transparency + blur to some missing bits Add prismlauncher for minecraft --- home/hyprland/anyrun.nix | 22 +++++++++------ home/hyprland/config.nix | 50 ++++++++++++++++++++++++---------- home/hyprland/default.nix | 1 + home/hyprland/rofi/theme.rasi | 2 +- home/hyprland/swaync/style.css | 14 +++++----- home/hyprland/waybar/style.css | 14 +++++----- system/desktop.nix | 4 ++- system/steam.nix | 3 +- 8 files changed, 70 insertions(+), 40 deletions(-) diff --git a/home/hyprland/anyrun.nix b/home/hyprland/anyrun.nix index dc597071..0ae54183 100644 --- a/home/hyprland/anyrun.nix +++ b/home/hyprland/anyrun.nix @@ -1,15 +1,19 @@ { pkgs, anyrun, ... }: { + imports = [ anyrun.homeManagerModules.default ]; + home.packages = with pkgs; [ rink ]; programs.anyrun = { enable = true; config = { plugins = with anyrun.packages.${pkgs.system}; [ applications + dictionary randr rink shell symbols translate + websearch ]; width.fraction = 0.3; @@ -21,7 +25,7 @@ extraCss = '' * { all: unset; - font-family: Lexend; + font-family: FiraCode Nerd Font; font-size: 1.3rem; } @@ -32,7 +36,7 @@ #main { background: transparent; } #match.activatable { - border-radius: 16px; + border-radius: 10px; padding: .3rem .9rem; margin-top: .01rem; } @@ -47,13 +51,13 @@ } #match:selected, #match:hover, #plugin:hover { - background: rgba(255, 255, 255, .1); + background: rgba(202, 211, 245, .1); } #entry { - background: rgba(255,255,255,.05); - border: 1px solid rgba(255,255,255,.1); - border-radius: 16px; + background: rgba(183, 189, 248, .05); + border: 1px solid rgba(183, 189, 248, .1); + border-radius: 10px; margin: .3rem; padding: .3rem 1rem; } @@ -67,9 +71,9 @@ list > #plugin:hover { padding: .6rem; } box#main { - background: rgba(0, 0, 0, .5); - box-shadow: inset 0 0 0 1px rgba(255, 255, 255, .1), 0 0 0 1px rgba(0, 0, 0, .5); - border-radius: 24px; + background: rgba(36, 39, 58, .5); + box-shadow: inset 0 0 0 1px rgba(183, 189, 248, .1), 0 0 0 1px rgba(36, 39, 58, .5); + border-radius: 10px; padding: .3rem; } ''; diff --git a/home/hyprland/config.nix b/home/hyprland/config.nix index a0a1d482..8d82c5a6 100644 --- a/home/hyprland/config.nix +++ b/home/hyprland/config.nix @@ -1,22 +1,37 @@ -{ config, pkgs, theme, ... }: '' +{ config, pkgs, theme, ... }: +let cursorSize = 24; +in '' source = ${theme} source = ./extra.conf monitor=,preferred,auto,auto + exec-once = hyprctl setcursor ${config.gtk.cursorTheme.name} ${ + toString cursorSize + } + env = XDG_CURRENT_DESKTOP=Hyprland env = XDG_SESSION_TYPE=wayland env = XDG_SESSION_DESKTOP=Hyprland env = GDK_BACKEND=wayland,x11 env = GTK_THEME,${config.gtk.theme.name} env = XCURSOR_THEME,${config.gtk.cursorTheme.name} - env = XCURSOR_SIZE,24 - env = QT_AUTO_SCREEN_SCALE_FACTOR=1 - env = QT_QPA_PLATFORM=wayland;xcb - env = QT_WAYLAND_DISABLE_WINDOWDECORATION=1 - env = MOZ_ENABLE_WAYLAND=1 + env = XCURSOR_SIZE,${toString cursorSize} + env = QT_AUTO_SCREEN_SCALE_FACTOR,1 + env = QT_QPA_PLATFORM,wayland + env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1 + env = MOZ_ENABLE_WAYLAND,1 env = DOOMLOCALDIR=${config.home.sessionVariables.DOOMLOCALDIR}; env = DOOMPROFILELOADFILE=${config.home.sessionVariables.DOOMPROFILELOADFILE}; + misc { + disable_autoreload = true + vrr = 2 + } + + gestures { + workspace_swipe = true + } + input { kb_layout = gb follow_mouse = 1 @@ -28,7 +43,7 @@ general { gaps_in = 5 gaps_out = 10 - border_size = 3 + border_size = 1 col.active_border = $lavender col.group_border_active = $lavender col.inactive_border = $surface2 @@ -45,18 +60,25 @@ decoration { rounding = 10 drop_shadow = yes + shadow_ignore_window = true shadow_range = 4 shadow_render_power = 3 blur { enabled = true size = 5 passes = 3 - ignore_opacity = false - new_optimizations = on - xray = false + new_optimizations = true + brightness = 1.0 + noise = 0.02 } } + $layers = ^(eww-.+|bar|system-menu|anyrun|gtk-layer-shell|swaync-.+)$ + layerrule = blur, $layers + layerrule = ignorealpha 0, $layers + layerrule = ignorealpha 0.5, ^(eww-(music|calendar)|system-menu|anyrun|swaync-.+)$ + layerrule = xray 1, ^(bar|gtk-layer-shell)$ + animations { enabled = yes bezier = myBezier, 0.05, 0.9, 0.1, 1.05 @@ -84,10 +106,8 @@ # Common program shortcuts bind = SUPER, E, exec, emacsclient -c - bind = SUPER, B, exec, pkill rofi || rofi -show filebrowser - bind = SUPER, Space, exec, pkill rofi || rofi -show combi + bind = SUPER, Space, exec, pkill anyrun || anyrun bind = SUPER, Return, exec, alacritty - bind = SUPER SHIFT, Return, exec, pkill rofi || rofi -show run bind = SUPER ALT, W, exec, [workspace 2] firefox bind = SUPER ALT, F, exec, [workspace 4] alacritty -e mc @@ -95,7 +115,7 @@ # Misc useful binds bind=,Print,exec,${pkgs.grim}/bin/grim -g "$(${pkgs.slurp}/bin/slurp)" - bind=,XF86Calculator,exec,pkill rofi || rofi -show calc + bind=,XF86Calculator,exec,pkill anyrun || anyrun # Sound bindl=,XF86AudioMute,exec,${pkgs.pamixer}/bin/pamixer -t bindl=,XF86AudioMicMute,exec,${pkgs.pamixer}/bin/pamixer --default-source -t @@ -137,6 +157,8 @@ windowrule = nomaximizerequest,(org.remmina.Remmina) windowrulev2 = float,title:(File|Picture-in-Picture),class:(firefox) windowrulev2 = pin,title:(File|Picture-in-Picture),class:(firefox) + windowrulev2 = workspace special silent, title:^(Firefox — Sharing Indicator)$ + windowrulev2 = workspace special silent, title:^(.*is sharing (your screen|a window)\.)$ windowrulev2 = float,title:(Open),class:(soffice) windowrulev2 = float,class:(org.remmina.Remmina),title:^(Remmina Remote Desktop Client)$ windowrulev2 = float,class:(steam),title:(Friends List) diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix index b7ee4c85..5510efb0 100644 --- a/home/hyprland/default.nix +++ b/home/hyprland/default.nix @@ -6,6 +6,7 @@ ./waybar/default.nix ./swaync/default.nix ./rofi/default.nix + ./anyrun.nix ./swaylock.nix ./gtk.nix ]; diff --git a/home/hyprland/rofi/theme.rasi b/home/hyprland/rofi/theme.rasi index 4b447b87..53e7348a 100644 --- a/home/hyprland/rofi/theme.rasi +++ b/home/hyprland/rofi/theme.rasi @@ -20,7 +20,7 @@ element-text, element-icon , mode-switcher { window { height: 75%; - border: 3px; + border: 1px; border-radius: 10px; border-color: @lavender; background-color: @bg-col; diff --git a/home/hyprland/swaync/style.css b/home/hyprland/swaync/style.css index 7cc40528..f1b8cdbe 100644 --- a/home/hyprland/swaync/style.css +++ b/home/hyprland/swaync/style.css @@ -7,16 +7,16 @@ .floating-notifications.background .notification-row .notification-background { box-shadow: 0 0 8px 0 rgba(0, 0, 0, 0.8), inset 0 0 0 1px #313244; - border-radius: 12.6px; + border-radius: 10px; margin: 18px; - background-color: #1e1e2e; + background-color: rgba(36, 39, 58, .5); color: #cdd6f4; padding: 0; } .floating-notifications.background .notification-row .notification-background .notification { padding: 7px; - border-radius: 12.6px; + border-radius: 10px; } .floating-notifications.background .notification-row .notification-background .notification.critical { @@ -44,7 +44,7 @@ } .floating-notifications.background .notification-row .notification-background .notification > *:last-child > * .notification-action { - border-radius: 7px; + border-radius: 10px; color: #cdd6f4; background-color: #313244; box-shadow: inset 0 0 0 1px #45475a; @@ -66,7 +66,7 @@ .floating-notifications.background .notification-row .notification-background .close-button { margin: 7px; padding: 2px; - border-radius: 6.3px; + border-radius: 10px; color: #1e1e2e; background-color: #f38ba8; } @@ -83,9 +83,9 @@ .control-center { box-shadow: 0 0 8px 0 rgba(0, 0, 0, 0.8), inset 0 0 0 1px #313244; - border-radius: 12.6px; + border-radius: 10px; margin: 18px; - background-color: #1e1e2e; + background-color: rgba(36, 39, 58, .5); color: #cdd6f4; padding: 14px; } diff --git a/home/hyprland/waybar/style.css b/home/hyprland/waybar/style.css index 0f013ef2..b6e29370 100644 --- a/home/hyprland/waybar/style.css +++ b/home/hyprland/waybar/style.css @@ -42,9 +42,9 @@ window > box { margin-left: 10px; margin-right: 10px; - border-left: 3px solid @surface2; - border-right: 3px solid @surface2; - border-bottom: 3px solid @surface2; + border-left: 1px solid @surface2; + border-right: 1px solid @surface2; + border-bottom: 1px solid @surface2; border-top-left-radius: 0px; border-top-right-radius: 0px; border-bottom-left-radius: 10px; @@ -54,7 +54,7 @@ window > box { tooltip { background: @base; - border: 3px solid @lavender; + border: 1px solid @lavender; border-radius: 10px; } @@ -76,10 +76,10 @@ tooltip { } #workspaces button { - border-top: 3px solid transparent; + border-top: 1px solid transparent; border-radius: 0px; } -#workspaces button.active { border-top: 3px solid @lavender; } +#workspaces button.active { border-top: 1px solid @lavender; } -#workspaces button.urgent { border-top: 3px solid @red; } +#workspaces button.urgent { border-top: 1px solid @red; } diff --git a/system/desktop.nix b/system/desktop.nix index 5c21aea3..2e8e4109 100644 --- a/system/desktop.nix +++ b/system/desktop.nix @@ -10,6 +10,7 @@ catppuccin-sddm-corners protonvpn-cli protonvpn-gui + qbittorrent ]; security.rtkit.enable = true; sound.enable = true; @@ -30,7 +31,8 @@ xkbVariant = ""; displayManager.sddm = { enable = true; - theme = "catppuccin"; + theme = "catppuccin-sddm-corners"; + autoNumlock = true; settings = { General = { InputMethod = ""; }; }; }; }; diff --git a/system/steam.nix b/system/steam.nix index a4109dc4..124942c8 100644 --- a/system/steam.nix +++ b/system/steam.nix @@ -1,6 +1,7 @@ -{ lib, ... }: +{ lib, pkgs, ... }: { + environment.systemPackages = with pkgs; [ prismlauncher ]; nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "steam" "steam-original" "steam-run" ]; hardware = {