From 86046c6414215ec77263dea31fb15453be6085c4 Mon Sep 17 00:00:00 2001 From: cnst Date: Wed, 23 Oct 2024 19:22:50 +0200 Subject: [PATCH] rm dead code and organizing --- modules/home/wm/hyprland/cnst/inputs.nix | 28 ------ modules/home/wm/hyprland/cnst/rules.nix | 91 ++++++++++--------- modules/home/wm/hyprland/toothpick/inputs.nix | 18 +++- 3 files changed, 63 insertions(+), 74 deletions(-) diff --git a/modules/home/wm/hyprland/cnst/inputs.nix b/modules/home/wm/hyprland/cnst/inputs.nix index b8925f51..70a1b057 100644 --- a/modules/home/wm/hyprland/cnst/inputs.nix +++ b/modules/home/wm/hyprland/cnst/inputs.nix @@ -16,10 +16,6 @@ in { }; config = mkIf cfg.enable { wayland.windowManager.hyprland.settings = { - # monitor = [ - # "DP-3, 2560x1440@240, auto, auto, bitdepth, 10" - # "eDP-1,1920x1200@60.02,auto,1" - # ]; monitor = map ( m: "${m.name},${ if m.enabled @@ -55,25 +51,6 @@ in { scroll_factor = 0.5; }; }; - # Desktop keyboard - # device = [ - # { - # name = "pfu-limited-hhkb-hybrid"; - # kb_layout = "hhkbse"; - # kb_options = "lv3:rwin_switch"; - # } - # { - # name = "hhkb-hybrid_1-keyboard"; - # kb_layout = "hhkbse"; - # kb_options = "lv3:rwin_switch"; - # } - # # Laptop keyboard - # { - # name = "at-translated-set-2-keyboard"; - # kb_layout = "se"; - # kb_options = "ctrl:swapcaps"; - # } - # ]; gestures = { workspace_swipe = true; workspace_swipe_distance = 400; @@ -101,11 +78,6 @@ in { explicit_sync_kms = 2; direct_scanout = false; }; - # cursor = { - # no_hardware_cursors = true; - # no_break_fs_vrr = true; - # min_refresh_rate = 24; - # }; }; }; } diff --git a/modules/home/wm/hyprland/cnst/rules.nix b/modules/home/wm/hyprland/cnst/rules.nix index cbd2cfae..92780b29 100644 --- a/modules/home/wm/hyprland/cnst/rules.nix +++ b/modules/home/wm/hyprland/cnst/rules.nix @@ -9,54 +9,59 @@ in { options = { home.wm.hyprland.cnst.rules.enable = mkEnableOption "Enables window rule settings in Hyprland"; }; + config = mkIf cfg.enable { wayland.windowManager.hyprland.settings = { - # CALCURSE SETTINGS windowrulev2 = [ - "float,initialTitle:(floatcal)" - "size 843 650,initialTitle:(floatcal)" - "move 100%-w-20 40,initialTitle:(floatcal)" - "float,initialTitle:(tuirun)" - "size 600 300,initialTitle:(tuirun)" - "center,initialTitle:(tuirun)" - "workspace special:tuirun,initialTitle:(tuirun)" - "noborder,initialTitle:(tuirun)" - #windowrulev2 = move 1708 32,class:(floatcal) - "float,class:(org.keepassxc.KeePassXC)" - "size 843 530,class:(org.keepassxc.KeePassXC)" - "move 100%-w-20 40,class:(org.keepassxc.KeePassXC)" + # === CALCURSE SETTINGS === + "size 843 650, initialTitle:^(floatcal)$" + "move 100%-w-20 40, initialTitle:^(floatcal)$" + "float, initialTitle:^(floatcal)$" - # RANGER/NNN SETTINGS - "float,class:(floatranger)" - "float,class:(floatnnn)" - #windowrulev2 = size 843 650,class:(floatranger) - #windowrulev2 = move 1708 32,class:(floatranger) - #windowrulev2 = move 1708 32;size 843 650;dimaround;float,class:^(kitty)$,title:^(kitty)$ - # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more - "suppressevent maximize, class:.* # You'll probably like this." - #windowrulev2 = noshadow, floating:0 - "float,class:^(imv)$" - "float,class:^(com.github.hluk.copyq)$" - "float,class:^(blueman-manager)$" - "center,class:^(nwg-look)$" - "float,class:^(nwg-look)$" - "float,class:^(Lxappearance)$" - "float,class:(pavucontrol)$" - "move 100%-w-20 40,class:(pavucontrol)$" - "float,class:^(polkit-gnome-authentication-agent-1)$" - "float,class:^(org.gnome.Calculator)$" - "size 741 585,class:(pavucontrol)$" - "float,class:^(cnst.test)$" - "float,class:^(org.corectrl.CoreCtrl)$" - "float,class:^(feh)$" - "float,class:^(com.example.gtk-adieux)$" - ]; - windowrule = [ - "center, ^(xarchiver)$" - "float, ^(xarchiver)$" - "float, ^(org.gnome.FileRoller)$" - "float, ^(org.freedesktop.impl.portal.desktop.kde)$" + # === TUIRUN SETTINGS === + "size 600 300, initialTitle:^(tuirun)$" + "center, initialTitle:^(tuirun)$" + "workspace special:tuirun, initialTitle:^(tuirun)$" + "noborder, initialTitle:^(tuirun)$" + "float, initialTitle:^(tuirun)$" + + # === KEEPASSXC SETTINGS === + "size 843 530, class:^(org.keepassxc.KeePassXC)$" + "move 100%-w-20 40, class:^(org.keepassxc.KeePassXC)$" + "float, class:^(org.keepassxc.KeePassXC)$" + + # === SUPPRESS MAXIMIZE EVENT === + "suppressevent maximize, class:.*" # Suppress maximize events for all windows + + # === NWG-LOOK SETTINGS === + "center, class:^(nwg-look)$" + "float, class:^(nwg-look)$" + + # === PAVUCONTROL SETTINGS === + "move 100%-w-20 40, class:^(pavucontrol)$" + "size 741 585, class:^(pavucontrol)$" + "float, class:^(pavucontrol)$" + + # === XARCHIVER SETTINGS === + "center, class:^(xarchiver)$" + "float, class:^(xarchiver)$" + + # === FLOATING APPLICATIONS === + "float, class:^(org.gnome.FileRoller)$" + "float, class:^(org.freedesktop.impl.portal.desktop.kde)$" + "float, class:^(org.corectrl.CoreCtrl)$" + "float, class:^(feh)$" + "float, class:^(polkit-gnome-authentication-agent-1)$" + "float, class:^(org.gnome.Calculator)$" + "float, class:^(Lxappearance)$" + "float, class:^(imv)$" + "float, class:^(com.github.hluk.copyq)$" + "float, class:^(blueman-manager)$" + "float, class:^(floatranger)$" + "float, class:^(floatnnn)$" ]; + + windowrule = []; }; }; } diff --git a/modules/home/wm/hyprland/toothpick/inputs.nix b/modules/home/wm/hyprland/toothpick/inputs.nix index aa31f619..26beb914 100644 --- a/modules/home/wm/hyprland/toothpick/inputs.nix +++ b/modules/home/wm/hyprland/toothpick/inputs.nix @@ -11,9 +11,21 @@ in { }; config = mkIf cfg.enable { wayland.windowManager.hyprland.settings = { - monitor = [ - "monitor=DVI-D-1,1920x1080@144,auto,1" - ]; + monitor = map ( + m: "${m.name},${ + if m.enabled + then "${toString m.width}x${toString m.height}@${toString m.refreshRate},${m.position},1${ + if m.bitDepth != null + then ",bitdepth,${toString m.bitDepth}" + else "" + }" + else "disable" + }" + ) (config.monitors); + workspace = map ( + m: "name:${m.workspace},monitor:${m.name}" + ) (lib.filter (m: m.enabled && m.workspace != null) config.monitors); + env = [ "QT_WAYLAND_DISABLE_WINDOWDECORATION,1" ];