diff --git a/flake.lock b/flake.lock index c00ca3a..af7c9fb 100644 --- a/flake.lock +++ b/flake.lock @@ -39,11 +39,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1772039265, - "narHash": "sha256-3TR+B2DmkkkIi/b0CE8PuKkmb2jgzdKrOPsIwdWhsM0=", + "lastModified": 1773005383, + "narHash": "sha256-Nlln9sKJa1q5lYX4xXS34Lt1oREwgQbT59Aa37nBGkU=", "owner": "9001", "repo": "copyparty", - "rev": "7c60adc69c977fb4b75e31c576131b1379498c3f", + "rev": "266d6e0ae6a6eecac7bc863bd8f746d16686e61a", "type": "github" }, "original": { @@ -220,11 +220,11 @@ ] }, "locked": { - "lastModified": 1772380125, - "narHash": "sha256-8C+y46xA9bxcchj9GeDPJaRUDApaA3sy2fhJr1bTbUw=", + "lastModified": 1772985280, + "narHash": "sha256-FdrNykOoY9VStevU4zjSUdvsL9SzJTcXt4omdEDZDLk=", "owner": "nix-community", "repo": "home-manager", - "rev": "a07a44a839eb036e950bf397d9b782916f8dcab3", + "rev": "8f736f007139d7f70752657dff6a401a585d6cbc", "type": "github" }, "original": { @@ -330,11 +330,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1772543027, - "narHash": "sha256-EAhpSHxxxJiN/Cv7iZMobJxgvUR6BDKZ7wTPLNVYO5Y=", + "lastModified": 1773082851, + "narHash": "sha256-4zkUP+gZF6zveHFN0W3oX750mpVgxfiShL+ZcvcH244=", "ref": "refs/heads/main", - "rev": "7299a3b0d5332da030e980e60b0ee35b93387cff", - "revCount": 6976, + "rev": "e32eeb1d454b029a24ca71f410896bf52839085d", + "revCount": 7010, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -720,11 +720,11 @@ }, "nixpkgs-latest": { "locked": { - "lastModified": 1772551582, - "narHash": "sha256-oW85BDFXoF2aWesTe27jnMY8y65n87B6qmPDbneQdWo=", + "lastModified": 1773098859, + "narHash": "sha256-ShEH4g8sw83iV+JDd2MYQv+Q7Lka2NgBjtPUQFsoZco=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3aafe1dc5f7d4a8c1c4ae1e7e075fdc8fb283c34", + "rev": "1d74c186d4e7b3237c236eaeac6bc88c2904b560", "type": "github" }, "original": { @@ -752,11 +752,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1772433332, - "narHash": "sha256-izhTDFKsg6KeVBxJS9EblGeQ8y+O8eCa6RcW874vxEc=", + "lastModified": 1772963539, + "narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cf59864ef8aa2e178cccedbe2c178185b0365705", + "rev": "9dcb002ca1690658be4a04645215baea8b95f31d", "type": "github" }, "original": { @@ -831,11 +831,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1772465433, - "narHash": "sha256-ywy9troNEfpgh0Ee+zaV1UTgU8kYBVKtvPSxh6clYGU=", + "lastModified": 1772822230, + "narHash": "sha256-yf3iYLGbGVlIthlQIk5/4/EQDZNNEmuqKZkQssMljuw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c581273b8d5bdf1c6ce7e0a54da9841e6a763913", + "rev": "71caefce12ba78d84fe618cf61644dce01cf3a96", "type": "github" }, "original": { @@ -1046,11 +1046,11 @@ ] }, "locked": { - "lastModified": 1772495394, - "narHash": "sha256-hmIvE/slLKEFKNEJz27IZ8BKlAaZDcjIHmkZ7GCEjfw=", + "lastModified": 1773096132, + "narHash": "sha256-M3zEnq9OElB7zqc+mjgPlByPm1O5t2fbUrH3t/Hm5Ag=", "owner": "Mic92", "repo": "sops-nix", - "rev": "1d9b98a29a45abe9c4d3174bd36de9f28755e3ff", + "rev": "d1ff3b1034d5bab5d7d8086a7803c5a5968cd784", "type": "github" }, "original": { @@ -1137,11 +1137,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1772540335, - "narHash": "sha256-NCG394pzUEr7H4r2NTSwzpCsVu/GnDgX2aMmHRizdts=", + "lastModified": 1772869527, + "narHash": "sha256-U0E3U2Iu3JeQFbTQ+vclG2jZMoJl+rJdEa68I8qk4Eg=", "owner": "sxyazi", "repo": "yazi", - "rev": "b92b576ce17c6e475e2c231c2ae9cbaf70de41bd", + "rev": "741f84e22b2c360366c685724d45cbec6d90b480", "type": "github" }, "original": { diff --git a/home-modules/hyprland.nix b/home-modules/hyprland.nix index bc4b727..a800985 100644 --- a/home-modules/hyprland.nix +++ b/home-modules/hyprland.nix @@ -28,15 +28,15 @@ in { hyprshade hyprshot slurp - xdg-desktop-portal-hyprland + # xdg-desktop-portal-hyprland ]; wayland.windowManager.hyprland = { enable = true; # package = pkgs-unstable.hyprland; - package = pkgs.hyprland; - # package = inputs.hyprland.packages.${pkgs.system}.hyprland; + # package = pkgs.hyprland; + package = inputs.hyprland.packages.${hyper.system}.hyprland; xwayland.enable = true; systemd.enable = true; plugins = [ @@ -237,74 +237,74 @@ in { # "hyprswitch --daemon" ]; - windowrulev2 = [ - "bordercolor rgba(${rice.lib.nohash rice.color.special.bright}ff), pinned:1" + windowrule = [ + "border_color rgba(${rice.lib.nohash rice.color.special.bright}ff) rgba(${rice.lib.nohash rice.color.special.brighter}ff), match:pin 1" - "bordersize 0, floating:0, onworkspace:w[tv1]" - "rounding 0, floating:0, onworkspace:w[tv1]" - "bordersize 0, floating:0, onworkspace:f[1]" - "rounding 0, floating:0, onworkspace:f[1]" + "border_size 0, match:float 0, match:workspace w[tv1]" + "rounding 0, match:float 0, match:workspace w[tv1]" + "border_size 0, match:float 0, match:workspace f[1]" + "rounding 0, match:float 0, match:workspace f[1]" ] ++ [ - "center 1,class:^(gimp)$" + "center 1,match:class ^(gimp)$" - "float, class:^(ibus-ui.*)$" - "float, class:^(ibus-ui-gtk3)$" - "float, class:^(imv)$" - "float, class:^(org.kde.polkit-kde-authentication-agent-1)$" - "float, class:^(presenter)$" # sent - "float, class:^(thunderbird)$" - "float, title:^(Compact folders)$" - "float, title:^(Ibus-ui.*)$" - "float, title:^(Ibus-ui-gtk3)$" - "float, title:^(Page Info — .*)$" - "float, title:^(Picture-in-Picture)$" - "float, title:^(wlogout)$" + "float on, match:class ^(ibus-ui.*)$" + "float on, match:class ^(ibus-ui-gtk3)$" + "float on, match:class ^(imv)$" + "float on, match:class ^(org.kde.polkit-kde-authentication-agent-1)$" + "float on, match:class ^(presenter)$" # sent + "float on, match:class ^(thunderbird)$" + "float on, match:title ^(Compact folders)$" + "float on, match:title ^(Ibus-ui.*)$" + "float on, match:title ^(Ibus-ui-gtk3)$" + "float on, match:title ^(Page Info — .*)$" + "float on, match:title ^(Picture-in-Picture)$" + "float on, match:title ^(wlogout)$" - "fullscreen, class:^(imv)$" - "fullscreen, class:^(sent)$" - "fullscreen, class:^(wlogout)$" + "fullscreen on, match:class ^(imv)$" + "fullscreen on, match:class ^(sent)$" + "fullscreen on, match:class ^(wlogout)$" - "noanim, class:^(imv)$" - "noanim, class:^(presenter)$" # sent + "no_anim on, match:class ^(imv)$" + "no_anim on, match:class ^(presenter)$" # sent - "opacity ${transparency}, class:^(Code)$" - "opacity ${transparency}, class:^(code-oss)$" - "opacity ${transparency}, class:^(discord)$" - # "opacity ${transparency}, class:^(vesktop)$" - # "opacity ${transparency}, class:^(Element)$" - "opacity ${transparency}, class:^(lutris)$" - "opacity ${transparency}, class:^(neovide)$" - # "opacity ${transparency}, class:^(obsidian)$" - "opacity ${transparency}, class:^(VSCodium)$" - "opacity ${transparency}, title:^(wlogout)$" - "opaque, title:^(GNU Image Manipulation Program)$" - "opaque, fullscreen:1" + "opacity ${transparency}, match:class ^(Code)$" + "opacity ${transparency}, match:class ^(code-oss)$" + "opacity ${transparency}, match:class ^(discord)$" + # "opacity ${transparency}, match:class ^(vesktop)$" + # "opacity ${transparency}, match:class ^(Element)$" + "opacity ${transparency}, match:class ^(lutris)$" + "opacity ${transparency}, match:class ^(neovide)$" + # "opacity ${transparency}, match:class ^(obsidian)$" + "opacity ${transparency}, match:class ^(VSCodium)$" + "opacity ${transparency}, match:title ^(wlogout)$" + "opaque on, match:title ^(GNU Image Manipulation Program)$" + "opaque on, match:fullscreen 1" - "pin, title:^(Picture-in-Picture)$" + "pin on, match:title ^(Picture-in-Picture)$" - "tile, class:^(sent)$" + "tile on, match:class ^(sent)$" - "workspace 100, class:^(gamescope)$" + "workspace 100, match:class ^(gamescope)$" - "float, title:^(terminal-file-picker)$" - "dimaround, title:^(terminal-file-picker)$" - "center, title:^(terminal-file-picker)$" - "size 80% 80%, title:^(terminal-file-picker)$" + "float on, match:title ^(terminal-file-picker)$" + "dim_around on, match:title ^(terminal-file-picker)$" + "center on, match:title ^(terminal-file-picker)$" + "size 80% 80%, match:title ^(terminal-file-picker)$" - # "size 30% 30%, initialTitle:^(Select Calendar)$" - ]; + "float on, match:initial_title ^(Select Calendar)$" + "size 30% 30%, match:initial_title ^(Select Calendar)$" + ]; layerrule = [ - "blur,waybar" - "blur,bar-0" # hyprpanel - "blur,bar-1" - "blur,bar-2" - "blur,bar-3" - "blur,bar-4" - "dimaround,rofi" - "blur,rofi" - "xray,rofi" + "blur on, match:namespace waybar" + "blur on, match:namespace bar-0" # hyprpanel + "blur on, match:namespace bar-1" + "blur on, match:namespace bar-2" + "blur on, match:namespace bar-3" + "blur on, match:namespace bar-4" + "blur on, match:namespace rofi" + "dim_around on, match:namespace rofi" ]; @@ -378,6 +378,7 @@ in { "SUPER, W, submap, browserSM " # "SUPER, E, exec, element-desktop" "SUPER, R, exec, rofi -show drun" + "SUPER SHIFT, R, exec, rofi -show drun" # "SUPER, T, exec, alacritty" # "SUPER SHIFT, T, exec, alacritty -e sh -c "ssh nxace"" "SUPER, T, exec, SESSION_FROM_DE=TRUE ${terminal}" @@ -424,7 +425,7 @@ in { "SUPER SHIFT, C, exec, hyprpicker -n -a" "SUPER, V, togglefloating, " # "SUPER, B, exec, bitwarden" - "SUPER, N, togglesplit" + "SUPER, N, layoutmsg, togglesplit" # "SUPER, M, exec, /home/nx2/scripts/meme-full-screen/meme-full-screen.sh " ''SUPER, M, exec, sh -c "hyprshade on $(find ${hyper.home}/.config/hypr/shaders -type f | sed -E 's-.*shaders/(.+)\.glsl-\1-g' | rofi -dmenu)"'' "SUPER Shift, M, exec, hyprshade off" diff --git a/home-modules/yazi.nix b/home-modules/yazi.nix index e81f48c..b8971b0 100644 --- a/home-modules/yazi.nix +++ b/home-modules/yazi.nix @@ -492,11 +492,9 @@ in { xdgOpenUsePortal = true; config.common."org.freedesktop.impl.portal.FileChooser" = "termfilechooser"; extraPortals = [ tfc ] ++ (with pkgs; [ - xdg-desktop-portal-hyprland xdg-desktop-portal xdg-desktop-portal-gnome xdg-desktop-portal-gtk - xdg-desktop-portal-hyprland xdg-desktop-portal-wlr ]); }; diff --git a/system-modules/gui.nix b/system-modules/gui.nix index 94fb4b6..ea75443 100644 --- a/system-modules/gui.nix +++ b/system-modules/gui.nix @@ -1,6 +1,7 @@ -{ ... }: { +{ pkgs, ... }@all: with all; { programs.hyprland = { enable = true; + package = inputs.hyprland.packages.${hyper.system}.hyprland; xwayland.enable = true; }; services.xserver.enable = true;