diff --git a/home-manager/features/3d-printing.nix b/home-manager/features/3d-printing.nix index e3c5808..965f82c 100644 --- a/home-manager/features/3d-printing.nix +++ b/home-manager/features/3d-printing.nix @@ -29,7 +29,7 @@ in home.packages = with pkgs; [ bambu-studio-wrapped - LycheeSlicer + lycheeslicer orca-slicer blender diff --git a/home-manager/features/eww/default.nix b/home-manager/features/eww/default.nix index b624b02..3b38cf8 100644 --- a/home-manager/features/eww/default.nix +++ b/home-manager/features/eww/default.nix @@ -1,16 +1,15 @@ { pkgs, ... }: { - home.packages = with pkgs; [ - # For Noto Sans NF - # 25.05 - nerd-fonts.noto - # 24.11 - # (nerdfonts.override { fonts = [ "NotoSans" ]; }) - ]; + home = { + packages = with pkgs; [ + # For Noto Sans NF + nerd-fonts.noto + ]; + + file.".config/eww".source = ./config; + }; programs.eww = { enable = true; - yuckConfig = "${./config}"; - scssConfig = "${./config}"; }; } diff --git a/home-manager/features/gaming.nix b/home-manager/features/gaming.nix index 32e8ba9..1c18210 100644 --- a/home-manager/features/gaming.nix +++ b/home-manager/features/gaming.nix @@ -108,25 +108,24 @@ in }; }; - wayland.windowManager.hyprland.settings.windowrulev2 = [ + wayland.windowManager.hyprland.settings.windowrule = [ # Set up full-screen games on monitor 1 (since window 0 is the vertical one.) - "monitor 1,class:^steam_app_\d+$" - "float,class:^steam_app_\d+$" - "monitor 1,fullscreen:1" - "center,class:^steam_app_\d+$" + # "match:class ^steam_app_\d+$, float" + "match:class ^steam_app_\d+$, fullscreen 1, monitor 1" + "match:class ^steam_app_\d+$, center on" # Make sure WoW spawns on the right monitor and that Battlenet floats so it renders correctly - "monitor 1,title:^World of Warcraft$" - "fullscreen,title:^World of Warcraft$" - "monitor 1,title:^Battle.net$" - "float,title:^Battle.net$" + "match:title ^World of Warcraft$, monitor 1" + "match:title ^World of Warcraft$, fullscreen on" + "match:title ^Battle.net$, monitor 1" + "match:title ^Battle.net$, float on" # Make Balatro into a regular window. - "monitor 1,title:^Balatro$" - "tile,title:^Balatro$" + "match:title ^Balatro$, monitor 1" + "match:title ^Balatro$, tile on" # Load Cyberpunk 2077 on the right monitor. - "monitor 1,class:steam_app_1091500" - "fullscreen,class:steam_app_1091500" + "match:class steam_app_1091500, monitor 1" + "match:class steam_app_1091500, fullscreen on" ]; } diff --git a/home-manager/features/hyprland.nix b/home-manager/features/hyprland.nix index 78c2088..f123a67 100644 --- a/home-manager/features/hyprland.nix +++ b/home-manager/features/hyprland.nix @@ -34,6 +34,10 @@ systemd.enable = false; settings = { + debug = { + disable_logs = false; + }; + monitor = [ "DP-2, 3440x1440@164.90, 0x0, 1" "DP-1, 2560x1440, -1440x-510, 1, transform, 1" @@ -334,16 +338,16 @@ "$mainMod + SHIFT, up, hy3:movewindow, u" "$mainMod + SHIFT, down, hy3:movewindow, d" # Switch workspaces with mainMod + [0-9] - "$mainMod, 1, split:workspace, 1" - "$mainMod, 2, split:workspace, 2" - "$mainMod, 3, split:workspace, 3" - "$mainMod, 4, split:workspace, 4" - "$mainMod, 5, split:workspace, 5" - "$mainMod, 6, split:workspace, 6" - "$mainMod, 7, split:workspace, 7" - "$mainMod, 8, split:workspace, 8" - "$mainMod, 9, split:workspace, 9" - "$mainMod, 0, split:workspace, 10" + "$mainMod, 1, workspace, 1" + "$mainMod, 2, workspace, 2" + "$mainMod, 3, workspace, 3" + "$mainMod, 4, workspace, 4" + "$mainMod, 5, workspace, 5" + "$mainMod, 6, workspace, 6" + "$mainMod, 7, workspace, 7" + "$mainMod, 8, workspace, 8" + "$mainMod, 9, workspace, 9" + "$mainMod, 0, workspace, 10" # Move active window to a workspace with mainMod + SHIFT + [0-9] # Note: using hy3:movetoworkspace instead of split:movetoworkspace. # The plugins are compatible. @@ -396,17 +400,17 @@ # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more - windowrulev2 = [ + windowrule = [ # Ignore maximize requests from apps. You'll probably like this. - "suppressevent maximize, class:.*" + "match:class .*, suppress_event maximize" # Fix some dragging issues with XWayland - "nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0" + # "nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0" # Make right-click backgrounds not transparent. The menus have no class or title. - "opaque,class:(),title:()" - "noshadow,class:(),title:()" - "noblur,class:(),title:()" + # "opaque,class:(),title:()" + # "noshadow,class:(),title:()" + # "match:class (),title:(), noblur" ]; # See https://wiki.hyprland.org/Configuring/Workspace-Rules/ for workspace rules diff --git a/home-manager/features/linux-desktop.nix b/home-manager/features/linux-desktop.nix index 4d03bf8..b012585 100644 --- a/home-manager/features/linux-desktop.nix +++ b/home-manager/features/linux-desktop.nix @@ -41,9 +41,11 @@ in pointerCursor = { enable = true; gtk.enable = true; - name = "phinger-cursors"; size = 16; - package = pkgs.phinger-cursors; + package = pkgs.bibata-cursors; + name = "Bibata-Modern-Classic"; + # package = pkgs.phinger-cursors; + # name = "phinger-cursors"; }; # Hint for electron apps to use wayland diff --git a/home-manager/features/rofi/rofi.nix b/home-manager/features/rofi/rofi.nix index 8be11c6..74ae62d 100644 --- a/home-manager/features/rofi/rofi.nix +++ b/home-manager/features/rofi/rofi.nix @@ -9,9 +9,9 @@ recursive = true; }; - wayland.windowManager.hyprland.settings.windowrulev2 = [ + wayland.windowManager.hyprland.settings.windowrule = [ # Forces the Rofi window to hold focus so that it gets input even if # something else opens or the mouse is outside the window. - "stayfocused, class:Rofi" + "stay_focused on, match:class Rofi" ]; } diff --git a/system/hosts/altair/drew.nix b/system/hosts/altair/drew.nix index 79d9296..dbddcaf 100644 --- a/system/hosts/altair/drew.nix +++ b/system/hosts/altair/drew.nix @@ -55,9 +55,9 @@ in # Set DP-2 as the primary monitor, otherwise it defaults to DP-1 because it's first in the list. "xrandr --output DP-2 --primary" ]; - windowrulev2 = [ + windowrule = [ # Rofi doesn't center properly when I have the two asymetric monitors, so we need hyprland to manage it. - "center, class:Rofi" + "match:class Rofi, center on" ]; }; }