From afb7ef8c6829389b46e62332e04406f3abab63d9 Mon Sep 17 00:00:00 2001 From: Miguel Palhas Date: Thu, 5 Feb 2026 14:57:31 +0000 Subject: [PATCH] wip --- flake.lock | 12 +++--- home/arrakis/default.nix | 10 ++--- home/common/programs/hyprland/default.nix | 48 ++++++++++++----------- home/common/programs/nerd-dictation.nix | 22 +++++------ home/desktop/default.nix | 32 +++++++-------- 5 files changed, 64 insertions(+), 60 deletions(-) diff --git a/flake.lock b/flake.lock index 3edbc10..2158ecb 100644 --- a/flake.lock +++ b/flake.lock @@ -133,11 +133,11 @@ ] }, "locked": { - "lastModified": 1766387499, - "narHash": "sha256-AjK3/UKDzeXFeYNLVBaJ3+HLE9he1g5UrlNd4/BM3eA=", + "lastModified": 1770299906, + "narHash": "sha256-/t77Jcj4slWWby2v7Fng48wO7XNvcJNkrx3yyFpvKiw=", "owner": "nix-community", "repo": "home-manager", - "rev": "527ad07e6625302b648ed3b28c34b62a79bd103e", + "rev": "bbccee87134fdf6d153d10ff8c06f94d7339c830", "type": "github" }, "original": { @@ -271,11 +271,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1770115704, - "narHash": "sha256-KHFT9UWOF2yRPlAnSXQJh6uVcgNcWlFqqiAZ7OVlHNc=", + "lastModified": 1770197578, + "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e6eae2ee2110f3d31110d5c222cd395303343b08", + "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", "type": "github" }, "original": { diff --git a/home/arrakis/default.nix b/home/arrakis/default.nix index fa29895..da3655a 100644 --- a/home/arrakis/default.nix +++ b/home/arrakis/default.nix @@ -34,11 +34,11 @@ "4, monitor:eDP-1" ]; - windowrulev2 = [ - "noinitialfocus, class:bevy-.*" - "float, class:bevy-.*" - "size 800 600, class:bevy-.*" - "move 100%-800 100%-600, class:bevy-.*" + windowrule = [ + "no_initial_focus on, match:class bevy-.*" + "float on, match:class bevy-.*" + "size 800 600, match:class bevy-.*" + "move 100%-800 100%-600, match:class bevy-.*" ]; }; diff --git a/home/common/programs/hyprland/default.nix b/home/common/programs/hyprland/default.nix index a83f233..76357b0 100644 --- a/home/common/programs/hyprland/default.nix +++ b/home/common/programs/hyprland/default.nix @@ -56,7 +56,11 @@ in misc = { disable_hyprland_logo = true; disable_splash_rendering = true; - new_window_takes_over_fullscreen = 2; + on_focus_under_fullscreen = 2; + }; + + ecosystem = { + no_update_news = true; }; xwayland = { @@ -122,40 +126,40 @@ in "special:yazi, on-created-empty:[float; size 1400 1000; move center] kitty --session sessions/yazi, persistent:false" ]; - windowrulev2 = [ + windowrule = [ # imv - "float, class:imv" - "move cursor -50% -50%, class:imv" + "float on, match:class imv" + "move cursor -50% -50%, match:class imv" - "float, title:termfilechooser" - "move center, title:termfilechooser" + "float on, match:title termfilechooser" + "move center, match:title termfilechooser" # bluetooth - "float, class:blueman-manager" - "move cursor -50% -50%, class:blueman-manager" - "size 600 400, class:blueman-manager" + "float on, match:class blueman-manager" + "move cursor -50% -50%, match:class blueman-manager" + "size 600 400, match:class blueman-manager" # pavucontrol - "float, class:pavucontrol" - "move cursor -50% -50%, class:pavucontrol" - "size 600 600, class:pavucontrol" + "float on, match:class pavucontrol" + "move cursor -50% -50%, match:class pavucontrol" + "size 600 600, match:class pavucontrol" # metamask - "float, class:chrome-nkbihfbeogaeaoehlefnkodbefgpgknn-.*" + "float on, match:class chrome-nkbihfbeogaeaoehlefnkodbefgpgknn-.*" # bitwarden, chrome - "float, class:chrome-nngceckbapebfimnlniiiahkandclblb-.*" + "float on, match:class chrome-nngceckbapebfimnlniiiahkandclblb-.*" # no gaps when only window - "bordersize 0, floating:0, onworkspace:w[t1]" - "rounding 0, floating:0, onworkspace:w[t1]" - "bordersize 0, floating:0, onworkspace:w[tg1]" - "rounding 0, floating:0, onworkspace:w[tg1]" - "bordersize 0, floating:0, onworkspace:f[1]" - "rounding 0, floating:0, onworkspace:f[1]" + "border_size 0, match:float 0, match:workspace w[t1]" + "rounding 0, match:float 0, match:workspace w[t1]" + "border_size 0, match:float 0, match:workspace w[tg1]" + "rounding 0, match:float 0, match:workspace w[tg1]" + "border_size 0, match:float 0, match:workspace f[1]" + "rounding 0, match:float 0, match:workspace f[1]" - "move center, onworkspace:special:terminal" - "move center, onworkspace:special:yazi" + "move center, match:workspace special:terminal" + "move center, match:workspace special:yazi" ]; "$mod" = "SUPER"; diff --git a/home/common/programs/nerd-dictation.nix b/home/common/programs/nerd-dictation.nix index f1d4c63..a7bbd7b 100644 --- a/home/common/programs/nerd-dictation.nix +++ b/home/common/programs/nerd-dictation.nix @@ -89,18 +89,18 @@ let local size=$1 local color=$2 # Unset existing rules for single-window workspaces - hyprctl keyword windowrulev2 "unset, floating:0, onworkspace:w[t1]" - hyprctl keyword windowrulev2 "unset, floating:0, onworkspace:w[tg1]" - hyprctl keyword windowrulev2 "unset, floating:0, onworkspace:f[1]" - hyprctl keyword windowrulev2 "unset, fullscreen:1" + hyprctl keyword windowrule "unset, match:float 0, match:workspace w[t1]" + hyprctl keyword windowrule "unset, match:float 0, match:workspace w[tg1]" + hyprctl keyword windowrule "unset, match:float 0, match:workspace f[1]" + hyprctl keyword windowrule "unset, match:fullscreen 1" # Re-add with specified border size - hyprctl keyword windowrulev2 "bordersize $size, floating:0, onworkspace:w[t1]" - hyprctl keyword windowrulev2 "rounding 0, floating:0, onworkspace:w[t1]" - hyprctl keyword windowrulev2 "bordersize $size, floating:0, onworkspace:w[tg1]" - hyprctl keyword windowrulev2 "rounding 0, floating:0, onworkspace:w[tg1]" - hyprctl keyword windowrulev2 "bordersize $size, floating:0, onworkspace:f[1]" - hyprctl keyword windowrulev2 "rounding 0, floating:0, onworkspace:f[1]" - hyprctl keyword windowrulev2 "bordersize $size, fullscreen:1" + hyprctl keyword windowrule "border_size $size, match:float 0, match:workspace w[t1]" + hyprctl keyword windowrule "rounding 0, match:float 0, match:workspace w[t1]" + hyprctl keyword windowrule "border_size $size, match:float 0, match:workspace w[tg1]" + hyprctl keyword windowrule "rounding 0, match:float 0, match:workspace w[tg1]" + hyprctl keyword windowrule "border_size $size, match:float 0, match:workspace f[1]" + hyprctl keyword windowrule "rounding 0, match:float 0, match:workspace f[1]" + hyprctl keyword windowrule "border_size $size, match:fullscreen 1" # Set border color hyprctl keyword general:col.active_border "$color" } diff --git a/home/desktop/default.nix b/home/desktop/default.nix index 4b810ca..d112b36 100644 --- a/home/desktop/default.nix +++ b/home/desktop/default.nix @@ -38,27 +38,27 @@ "WEBKIT_DISABLE_DMABUF_RENDERER, 1" ]; - windowrulev2 = [ + windowrule = [ # ethui-dev - "workspace 2, title:ethui-dev.*" - "noinitialfocus, title:ethui-dev.*" - "float, title:ethui-dev - dialog.*" + "workspace 2, match:title ethui-dev.*" + "no_initial_focus on, match:title ethui-dev.*" + "float on, match:title ethui-dev - dialog.*" - "workspace 1, title:ethui.*" - "noinitialfocus, title:ethui.*" - "float, title:ethui - dialog.*" + "workspace 1, match:title ethui.*" + "no_initial_focus on, match:title ethui.*" + "float on, match:title ethui - dialog.*" - "workspace 1, title:^\\[bevy\\].*" + "workspace 1, match:title ^\\[bevy\\].*" - "workspace 3 silent, class:bevy-.*" - "noinitialfocus, class:bevy-.*" - "fullscreen, class:bevy-.*" + "workspace 3 silent, match:class bevy-.*" + "no_initial_focus on, match:class bevy-.*" + "fullscreen on, match:class bevy-.*" - "workspace 1 silent, title:egui-.*" - "bordersize 0, title:egui-.*" - "float, title:egui-.*" - "noblur, title:egui-.*" - "move 100%-w-20 100%-h-20, title:egui-.*" + "workspace 1 silent, match:title egui-.*" + "border_size 0, match:title egui-.*" + "float on, match:title egui-.*" + "no_blur on, match:title egui-.*" + "move 100%-w-20 100%-h-20, match:title egui-.*" ]; render = {