diff --git a/modules/desktop-environments/hyprland/config/hypr/default.nix b/modules/desktop-environments/hyprland/config/hypr/default.nix index e785fc0..2c710a6 100755 --- a/modules/desktop-environments/hyprland/config/hypr/default.nix +++ b/modules/desktop-environments/hyprland/config/hypr/default.nix @@ -40,7 +40,7 @@ in "$mod, P, pseudo, " # dwindle "$mod, S, togglesplit, " # dwindle "$mod SHIFT, Q, exec, hyprlock" - ", PRINT, exec, hyprshot -m region --clipboard-only" + "$mod SHIFT, 4, exec, hyprshot -m region --clipboard-only" "$mod,F,exec,hyprctl dispatch fullscreen active" "$mod SHIFT, E, exec, smile" @@ -67,16 +67,16 @@ in "$mod, 9, workspace, 9" "$mod, 0, workspace, 10" - "$mod SHIFT, 1, movetoworkspace, 1" - "$mod SHIFT, 2, movetoworkspace, 2" - "$mod SHIFT, 3, movetoworkspace, 3" - "$mod SHIFT, 4, movetoworkspace, 4" - "$mod SHIFT, 5, movetoworkspace, 5" - "$mod SHIFT, 6, movetoworkspace, 6" - "$mod SHIFT, 7, movetoworkspace, 7" - "$mod SHIFT, 8, movetoworkspace, 8" - "$mod SHIFT, 9, movetoworkspace, 9" - "$mod SHIFT, 0, movetoworkspace, discord" + "$mod ALT, 1, movetoworkspace, 1" + "$mod ALT, 2, movetoworkspace, 2" + "$mod ALT, 3, movetoworkspace, 3" + "$mod ALT, 4, movetoworkspace, 4" + "$mod ALT, 5, movetoworkspace, 5" + "$mod ALT, 6, movetoworkspace, 6" + "$mod ALT, 7, movetoworkspace, 7" + "$mod ALT, 8, movetoworkspace, 8" + "$mod ALT, 9, movetoworkspace, 9" + "$mod ALT, 0, movetoworkspace, discord" "$mod CTRL, l, resizeactive, 10 0" "$mod CTRL, h, resizeactive, -10 0" @@ -135,10 +135,10 @@ in new_optimizations = true; xray = false; }; - drop_shadow = "yes"; - shadow_range = 4; - shadow_render_power = "3"; - "col.shadow" = "rgba(1a1a1aee)"; + # drop_shadow = "yes"; + # shadow_range = 4; + # shadow_render_power = "3"; + # "col.shadow" = "rgba(1a1a1aee)"; }; animations = { @@ -173,63 +173,58 @@ in }; workspace = [ - "name:firefox, monitor:DP-2, default:false, special, firefox" - "name:discord, monitor:DP-2, default:true, special, vesktop, spotify" - "name:steam, monitor:DP-1, default:false, special, steam" + "name:firefox, monitor:DP-2, default:false, special, class:(.*firefox.*)" + "name:discord, monitor:DP-2, default:true, special, title:(.*vesktop.*), title:(.*Apple Music.*)" + "name:steam, monitor:DP-1, default:false, special, class:(.*[Ss]team.*)" ]; windowrule = [ - "float, file_progress" - "float, confirm" - "float, dialog" - "float, download" - "float, notification" - "float, error" - "float, splash" - "float, confirmreset" - "float, title:Open File" - "float, title:branchdialog" - "float, pavucontrol" - "move onscreen cursor 0% 0%, pavucontrol" - "float, file-roller" - "fullscreen, wlogout" - "float, title:wlogout" - "fullscreen, title:wlogout" - "idleinhibit stayfocused, mpv" - ]; - - windowrulev2 = [ - "float, title:^(Media viewer)$" - "float, class:^(it.mijorus.smile)$,title:^(Smile)$" - "float, class:^(.blueman-manager-wrapped)$,title:^(Bluetooth Devices)$" + "float, title:(file_progress)" + "float, title:(.*confirm.*)" + "float, title:(.*dialog.*)" + "float, title:(.*download.*)" + "float, title:(.*notification.*)" + "float, title:(.*error.*)" + "float, title:(.*splash.*)" + "float, title:(.*confirmreset.*)" + "float, title:(.*Open File.*)" + "float, title:(.*branchdialog.*)" + "float, class:(.*pavucontrol)" + "move onscreen cursor 0% 0%, class:(.*pavucontrol)" + "float, class:(.*FileRoller)" + "float, class:(.*wlogout)" + "idleinhibit stayfocused, title:(.*mpv)" + + "float, title:(Media viewer)" + "float, class:(it.mijorus.smile),title:(Smile)" + "float, class:(.blueman-manager-wrapped)$,title:(Bluetooth Devices)" # Picture in picture windows - # "float, class:pavucontrol,title:pavucontrol" # ????? - "float, title:^(Picture-in-Picture)$" - "pin, title:^(Picture-in-Picture)$" + "float, title:(.*Picture-in-Picture.*)" + "pin, title::(.*Picture-in-Picture.*)" # discord/vesktop - "workspace: name:discord, class:^(vesktop)$" - "float, class:^(vesktop)$,title:^(Discord Popout)$" - "pin, class:^(vesktop)$,title:^(Discord Popout)$" + "workspace: name:discord, class:(.*vesktop)" + "float, class:(.*vesktop),title:(.*Discord Popout.*)" + "pin, class:(.*vesktop),title:(.*Discord Popout.*)" # Steam - "float, class:^([Ss]team)$, title:^((?![Ss]team).*)$" - "workspace name:steam silent, class:^([Ss]team)$, title:^([Ss]team)$" - "tile, class:^([Ss]team)$, title:^([Ss]team)$" - "float, class:^(steam)$,title:^(Friends List)$" + "float, class:(.*[Ss]team), title:(.*[Ss]team.*)$" + "workspace name:steam silent, class:(.*[Ss]team), title:(.*[Ss]team.*)$" + "tile, class:(.*[Ss]team), title:(.*[Ss]team.*)$" + "float, class:(.*steam),title:(.*Friends List.*)" # Code - # "pin, class:^(code)$,title:^(Save As)$" - "float, class:^(code)$,title:^(Save As)$" - "float, class:^(xdg-desktop-portal-gtk)$,title:^(Open Workspace from File)$" + "pin, class:(.*codium.*),title:(Save As)" + "float, class:(.*codium.*),title:(Save As)" + "float, class:(xdg-desktop-portal-gtk),title:(Open Workspace from File)" # Game Tearing??? https://wiki.hyprland.org/Configuring/Tearing/ - "immediate, class:gamescope" + "immediate, class:(.*gamescope)" # todo properly fix this shit instead of using gamescope # vmware - "tag +horizonrdp, class:Remote Desktop Connection,title:BBar" - "tag +horizonrdp, class:Remote Desktop Connection,title:Remote Desktop Connection" + "tag +horizonrdp, class:(Remote Desktop Connection),title:(BBar)" + "tag +horizonrdp, class:(Remote Desktop Connection),title:(Remote Desktop Connection)" "noanim, tag:horizonrdp" "noblur, tag:horizonrdp" @@ -241,10 +236,10 @@ in "nodim, tag:horizonrdp" "nomaxsize, tag:horizonrdp" - "float, class:Vmware-view,title:VMware Horizon Client" - "float, class:Remote Desktop Connection,title:^(Remote Desktop Connection)$" - "float, class:Remote Desktop Connection,title:^(5cd238b4x0)$" - "float, class:Credential Manager UI Host,title:Windows Security" + "float, class:(.*Vmware-view),title:(VMware Horizon Client" + "float, class:(Remote Desktop Connection),title:(.*Remote Desktop Connection.*)" + "float, class:(Remote Desktop Connection),title:(.*5cd238b4x0.*)" + "float, class:(Credential Manager UI Host),title:(.*Windows Security.*)" ]; input = { @@ -276,7 +271,7 @@ in exec-once = blueberry-tray exec-once = [silent] firefox exec-once = [silent] vesktop - exec-once = [silent] spotify + exec-once = [silent] chromium --app="https://music.apple.com" exec-once = [silent] steam ''; }; diff --git a/modules/desktop-environments/hyprland/environment.nix b/modules/desktop-environments/hyprland/environment.nix index c5b67f0..92e05af 100755 --- a/modules/desktop-environments/hyprland/environment.nix +++ b/modules/desktop-environments/hyprland/environment.nix @@ -21,10 +21,10 @@ in egl-wayland unstable.file-roller glib - unstable.gnome-tweaks - unstable.gnome-disk-utility - unstable.gnome-system-monitor - unstable.gsettings-desktop-schemas + gnome-tweaks + gnome-disk-utility + gnome-system-monitor + gsettings-desktop-schemas hyprcursor hyprland hyprshot diff --git a/modules/desktop-environments/hyprland/home.nix b/modules/desktop-environments/hyprland/home.nix index 4cb2411..1768d83 100755 --- a/modules/desktop-environments/hyprland/home.nix +++ b/modules/desktop-environments/hyprland/home.nix @@ -18,7 +18,7 @@ let # iconThemeColor = "dark"; # "" "light" "dark" # iconThemeVariant = ""; # "" "purple" "pink" "red" "orange" "yellow" "green" "teal" "grey" iconThemeScheme = "nord"; # "" "nord" "dracula" "gruvbox" "everforest" "catppuccin" - iconTheme = "Colloid-Nord"; + iconTheme = "Colloid-Nord-Dark"; iconThemePkg = pkgs.colloid-icon-theme.override { schemeVariants = [ iconThemeScheme ]; colorVariants = [ "default" ];