diff --git a/bar.nix b/bar.nix index 7ab2567..7ebb832 100644 --- a/bar.nix +++ b/bar.nix @@ -102,7 +102,7 @@ format = "󰂯"; "format-disabled" = "󰂲"; "on-click" = "${pkgs.util-linux}/bin/rfkill toggle bluetooth"; - "on-click-right" = "$TERMINAL --class floating -e bluetuith"; + "on-click-right" = "$TERMINAL -c floating -e bluetuith"; "tooltip-format" = "{}"; }; @@ -123,7 +123,7 @@ interval = 1; format = "󰋊 {free}"; path = "/"; - "on-click" = "$TERMINAL --class floating -e ${pkgs.ncdu}/bin/ncdu -x /"; + "on-click" = "$TERMINAL -c floating -e ${pkgs.ncdu}/bin/ncdu -x /"; }; @@ -131,21 +131,21 @@ interval = 1; format = "󰋊 {free}"; path = "/home/ant/disk1"; - "on-click" = "$TERMINAL --class floating -e ${pkgs.ncdu}/bin/ncdu -x /home/${username}/disk1"; + "on-click" = "$TERMINAL -c floating -e ${pkgs.ncdu}/bin/ncdu -x /home/${username}/disk1"; }; "disk#3" = lib.attrsets.optionalAttrs (variant == "default") { interval = 1; format = "󰋊 {free}"; path = "/home/ant/disk2"; - "on-click" = "$TERMINAL --class floating -e ${pkgs.ncdu}/bin/ncdu -x /home/${username}/disk2"; + "on-click" = "$TERMINAL -c floating -e ${pkgs.ncdu}/bin/ncdu -x /home/${username}/disk2"; }; "disk#home" = lib.attrsets.optionalAttrs (variant == "allegro") { interval = 1; format = "󰋊 {free}"; path = "/home/${username}"; - "on-click" = "$TERMINAL --class floating -e ${pkgs.ncdu}/bin/ncdu -x /home/${username}"; + "on-click" = "$TERMINAL -c floating -e ${pkgs.ncdu}/bin/ncdu -x /home/${username}"; }; memory = { @@ -164,7 +164,7 @@ "format-ethernet" = "󰓢 {bandwidthDownBytes:>} {bandwidthUpBytes:>}"; "format-wifi" = "󰖩 {bandwidthDownBytes:>} {bandwidthUpBytes:>}"; "on-click" = "wifi-toggle"; - "on-right-click" = "$TERMINAL --class floating -e nmtui"; + "on-right-click" = "$TERMINAL -c floating -e nmtui"; "tooltip-format-ethernet" = "{ipaddr}"; "tooltip-format-wifi" = "{ipaddr}\n{essid}\n{signalStrength}"; }; @@ -200,7 +200,7 @@ format = "󰘚 {usage: 2}%"; "max-length" = 10; "min-length" = 4; - "on-click" = "$TERMINAL --class floating -e htop"; + "on-click" = "$TERMINAL -c floating -e htop"; }; temperature = { @@ -292,7 +292,7 @@ "return-type" = "json"; format = "{}"; tooltip = "{tooltip}"; - "on-click" = "$TERMINAL --class floating -e nvtop"; + "on-click" = "$TERMINAL -c floating -e nvtop"; }; "custom/nvidia-mem" = { @@ -301,7 +301,7 @@ "return-type" = "json"; format = "{}"; tooltip = "{tooltip}"; - "on-click" = "$TERMINAL --class floating -e nvtop"; + "on-click" = "$TERMINAL -c floating -e nvtop"; }; }; }; diff --git a/hyprland.nix b/hyprland.nix index 046f9c4..7b1244a 100644 --- a/hyprland.nix +++ b/hyprland.nix @@ -125,7 +125,8 @@ enable_swallow = true; mouse_move_enables_dpms = true; key_press_enables_dpms = true; - swallow_regex = "^(Alacritty)(.*)$"; + swallow_regex = "^st-256color$"; + # swallow_regex = "^(Alacritty)(.*)$"; # swallow_regex = "^(kitty)(.*)$"; }; @@ -135,7 +136,9 @@ "$mod" = "SUPER"; - bind = [ + bind = + let floating_terminal = "$TERMINAL -c floating"; in + [ "$mod, q, killactive" "$mod SHIFT, q, exec, kill -9 $(hyprctl activewindow | grep pid | grep -E -o '[0-9]+$')" "$mod, a, togglefloating" @@ -153,12 +156,12 @@ "$mod SHIFT, w, exec, firefox --private-window" "$mod SHIFT, s, exec, TMP=$(rofi -dmenu -p \"nix search\" -l 0) && $BROWSER \"https://search.nixos.org/packages?channel=unstable&query=$TMP\"" "$mod SHIFT, e, exec, $(rofi -dmenu -p \"command\" -l 0)" - "$mod, m, exec, $TERMINAL --class floating -e pulsemixer" + "$mod, m, exec, ${floating_terminal} -e pulsemixer" "$mod, d, exec, ~/.bin/runmenu" "$mod, x, exec, keepmenu" - "$mod, z, exec, tmux new -spopup_terminal -d; $TERMINAL --class floating -e tmux a -t popup_terminal" + "$mod, z, exec, tmux new -spopup_terminal -d; ${floating_terminal} -e tmux a -t popup_terminal" "$mod, f11, exec, ocrzone" - "$mod, f12, exec, $TERMINAL --class floating -e nmtui" + "$mod, f12, exec, ${floating_terminal} -e nmtui" "$mod, f2, exec, darkman toggle" "$mod, f3, exec, hyprctl reload" "$mod, f4, exec, rofi-udisk" @@ -369,7 +372,7 @@ env = WLR_DRM_DEVICES,/dev/dri/card0 env = AQ_WLR_DEVICES,/dev/dri/card0 env = AQ_DRM_DEVICES,/dev/dri/card0 - env = TERMINAL,alacritty + env = TERMINAL,st env = NIXOS_OZONE_WL,1 env = GDK_BACKEND,wayland,x11