From 03518b0b90a17ef3b81c01b618fd100d5c4da865 Mon Sep 17 00:00:00 2001 From: Kirill Date: Tue, 31 Mar 2026 19:10:55 +0300 Subject: [PATCH] fix: after update fix --- host/modules/pockets.nix | 2 ++ modules/host/vpn.nix | 2 +- modules/user/hyprland.nix | 24 ++++++++++++++---------- modules/user/yazi.nix | 4 ++++ user/common.nix | 3 ++- 5 files changed, 23 insertions(+), 12 deletions(-) diff --git a/host/modules/pockets.nix b/host/modules/pockets.nix index 3f387a9..34f6124 100644 --- a/host/modules/pockets.nix +++ b/host/modules/pockets.nix @@ -109,6 +109,8 @@ deluge ]; + + enableDefaultPackages = false; fonts.packages = with pkgs; [ jetbrains-mono noto-fonts diff --git a/modules/host/vpn.nix b/modules/host/vpn.nix index 173ecea..09dae81 100644 --- a/modules/host/vpn.nix +++ b/modules/host/vpn.nix @@ -1,4 +1,4 @@ -{ pkgs, pkgs-unstable, config, ...}: { +{ pkgs, pkgs-unstable, config, inputs, ...}: { systemd.services.v2raya = { enable = true; description = "v2rayA gui client"; diff --git a/modules/user/hyprland.nix b/modules/user/hyprland.nix index 7ddd272..8dd650c 100644 --- a/modules/user/hyprland.nix +++ b/modules/user/hyprland.nix @@ -90,15 +90,19 @@ ]; windowrule = [ - "float, class:^(imv)$" - "float, class:^(feh)$" - "float, class:^(mpv)$" - "float, title:^(Список друзей)" - "move onscreen cursor -50% -50%, class:^(xdragon)$" - "float, title:(nmtui)" - "float, title:(pulsemixer)" - "float, title:(clipse)" - "size 622 652, title:(clipse)" + "match:class imv, float 1" + "match:class feh, float 1" + "match:class mpv, float 1" + + "match:title Список друзей, float 1" + "match:title nmtui, float 1" + "match:title pulsemixer, float 1" + + "match:title clipse, float 1" + "match:title clipse, size 622 652" + + "match:focus 1, rounding 0" + "match:float 0, match:workspace w[t1], border_size 0" ]; exec-once = [ @@ -120,7 +124,7 @@ "$mainMod, F, togglefloating," "$mainMod, D, exec, fuzzel" "$mainMod, P, pseudo, # dwindle" - "$mainMod, J, togglesplit, # dwindle" + "$mainMod, J, layoutmsg, togglesplit, # dwindle" # Move focus with mainMod + arrow keys "$mainMod, left, movefocus, l" diff --git a/modules/user/yazi.nix b/modules/user/yazi.nix index 8c4eb8a..4c15157 100644 --- a/modules/user/yazi.nix +++ b/modules/user/yazi.nix @@ -3,6 +3,10 @@ ( ouch.override { enableUnfree = true; } ) ]; + wayland.windowManager.hyprland.settings.windowrule = [ + "match:class dragon-drop, move cursor_x-window_w/2 cursor_y-window_h/2" + ]; + programs.yazi = { package = inputs.yazi.packages .${pkgs.stdenv.hostPlatform.system}.default diff --git a/user/common.nix b/user/common.nix index 191dfe8..1c76903 100644 --- a/user/common.nix +++ b/user/common.nix @@ -16,6 +16,7 @@ ./${name}/modules/hyprland.nix ./${name}/modules/style.nix ./${name}/home.nix + ./${name}/modules/waybar.nix ]; home = { @@ -51,7 +52,7 @@ services.greetd = let tuigreet = lib.getExe pkgs.tuigreet; - session = lib.getExe inputs.hyprland.packages.${pkgs.system}.default; + session = lib.getExe' inputs.hyprland.packages.${pkgs.system}.default "start-hyprland"; in { enable = true; settings = {