diff --git a/desktops/hyprland/decoration.nix b/desktops/hyprland/decoration.nix index dc75c12..154c491 100644 --- a/desktops/hyprland/decoration.nix +++ b/desktops/hyprland/decoration.nix @@ -2,7 +2,7 @@ rounding = 20; blur = { enabled = true; - xray = true; + xray = false; special = false; size = 6; diff --git a/desktops/hyprland/hyprland.nix b/desktops/hyprland/hyprland.nix index 7dd9339..7d113b7 100644 --- a/desktops/hyprland/hyprland.nix +++ b/desktops/hyprland/hyprland.nix @@ -14,6 +14,9 @@ # Fixes black screen on Jellyfin # https://github.com/jellyfin/jellyfin-media-player/issues/165#issuecomment-1569842393 "QT_QPA_PLATFORM,xcb" + # Fixes dialogs randomly closing again in IntelliJ + # https://github.com/hyprwm/Hyprland/issues/1947 + "_JAVA_AWT_WM_NOREPARENTING=1" ]; exec-once = [ "ags" @@ -42,10 +45,31 @@ "SUPER,space,exec,(pkill fuzzel && hyprctl workspace previous) || (hyprctl workspace empty && fuzzel)" ]; monitor = import ./monitors.nix; + workspace = [ + "1,monitor:DP-1" + "2,monitor:DP-1" + "3,monitor:DP-1" + "4,monitor:DP-3" + "5,monitor:DP-3" + "6,monitor:DP-3" + "7,monitor:HDMI-A-1" + "8,monitor:HDMI-A-1" + "9,monitor:HDMI-A-1" + ]; windowrule = [ "pseudo,^(discord)$" + "pseudo,^(org.gnome.Calculator)$" + "pseudo,^(Slack)$" "monitor DP-3,^(discord)$" ]; + windowrulev2 = [ + # IntelliJ focus fixes + "windowdance,class:^(jetbrains-.*)$" + "dimaround,class:^(jetbrains-.*)$,floating:1,title:^(?!win)" + "noanim,class:^(jetbrains-.*)$,title:^(win.*)$" + "noinitialfocus,class:^(jetbrains-.*)$,title:^(win.*)$" + "rounding 0,class:^(jetbrains-.*)$,title:^(win.*)$" + ]; layerrule = import ./layerrules.nix; decoration = import ./decoration.nix; }; @@ -90,13 +114,27 @@ ydotool sassc # gnome packages + evince + gnome.gnome-keyring gnome.nautilus + gnome.gnome-calendar + gnome.gnome-characters + gnome.gnome-contacts + gnome.gnome-clocks + gnome.gnome-calculator + gnome.simple-scan + gnome.geary + gnome.ghex + gnome.gnome-weather + gnome.gnome-keyring + gnome.gnome-disk-utility ]; + dconf.settings."org/gnome/desktop/interface".color-scheme = "prefer-dark"; gtk = { enable = true; theme = { - name = "adw-gtk3"; + name = "adw-gtk3-dark"; package = pkgs.adw-gtk3; }; cursorTheme = { @@ -108,6 +146,10 @@ package = pkgs.tela-icon-theme; }; }; + qt = { + enable = true; + platformTheme = "gtk"; + }; home.file.profile = { enable = true; diff --git a/desktops/hyprland/keybinds.nix b/desktops/hyprland/keybinds.nix index cf19869..4a95377 100644 --- a/desktops/hyprland/keybinds.nix +++ b/desktops/hyprland/keybinds.nix @@ -18,4 +18,24 @@ "SUPER,Tab,workspace,m+1" "SUPER,mouse_up,workspace,m+1" "SUPER,mouse_down,workspace,m-1" + + "SUPER,1,workspace,1" + "SUPER,2,workspace,2" + "SUPER,3,workspace,3" + "SUPER,4,workspace,4" + "SUPER,5,workspace,5" + "SUPER,6,workspace,6" + "SUPER,7,workspace,7" + "SUPER,8,workspace,8" + "SUPER,9,workspace,9" + + "SUPER_SHIFT,1,movetoworkspace,1" + "SUPER_SHIFT,2,movetoworkspace,2" + "SUPER_SHIFT,3,movetoworkspace,3" + "SUPER_SHIFT,4,movetoworkspace,4" + "SUPER_SHIFT,5,movetoworkspace,5" + "SUPER_SHIFT,6,movetoworkspace,6" + "SUPER_SHIFT,7,movetoworkspace,7" + "SUPER_SHIFT,8,movetoworkspace,8" + "SUPER_SHIFT,9,movetoworkspace,9" ]