From 2c8ff253087c43d06b79b4ea1d1dc8bb5112ef0f Mon Sep 17 00:00:00 2001 From: Jet Date: Sun, 3 May 2026 17:59:58 -0700 Subject: [PATCH] fix: improve sway browser integration --- home-modules/core.nix | 6 +++++- home-modules/packages.nix | 1 + home-modules/sway.nix | 10 ++++++++++ home-modules/terminal.nix | 2 +- 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/home-modules/core.nix b/home-modules/core.nix index 6a399b1..c6e38ac 100644 --- a/home-modules/core.nix +++ b/home-modules/core.nix @@ -13,7 +13,11 @@ home.stateVersion = "25.05"; home.sessionVariables = { - BROWSER = "zen"; + BROWSER = "${pkgs.xdg-utils}/bin/xdg-open"; + GH_BROWSER = "${pkgs.xdg-utils}/bin/xdg-open"; + GIT_BROWSER = "${pkgs.xdg-utils}/bin/xdg-open"; + MOZ_ENABLE_WAYLAND = "1"; + NIXOS_OZONE_WL = "1"; TERMINAL = "ghostty"; }; diff --git a/home-modules/packages.nix b/home-modules/packages.nix index 16058e5..088f4c8 100644 --- a/home-modules/packages.nix +++ b/home-modules/packages.nix @@ -72,6 +72,7 @@ swaylock waybar wl-clipboard + xdg-utils nerd-fonts.commit-mono ]; diff --git a/home-modules/sway.nix b/home-modules/sway.nix index 766b418..a6fab4d 100644 --- a/home-modules/sway.nix +++ b/home-modules/sway.nix @@ -8,6 +8,7 @@ let apodCurrent = "${config.home.homeDirectory}/.local/state/nasa-apod/current"; + swayOutputs = "${config.home.homeDirectory}/.config/sway/outputs"; lockCommand = pkgs.writeShellScript "sway-lock-apod" '' set -euo pipefail @@ -87,9 +88,11 @@ in dwt disabled } + include ${swayOutputs} output * bg #000000 solid_color bindsym $mod+d exec ${pkgs.fuzzel}/bin/fuzzel + bindsym $mod+p exec ${pkgs.nwg-displays}/bin/nwg-displays bindsym $mod+b exec ${pkgs.procps}/bin/pkill -SIGUSR1 waybar bindsym $mod+l exec ${lockCommand} bindsym $mod+Shift+e exec ${pkgs.sway}/bin/swaymsg exit @@ -294,4 +297,11 @@ in }; Install.WantedBy = [ "timers.target" ]; }; + + home.activation.ensureSwayOutputs = config.lib.dag.entryAfter [ "writeBoundary" ] '' + $DRY_RUN_CMD mkdir -p ${config.home.homeDirectory}/.config/sway + if [ ! -e ${swayOutputs} ]; then + $DRY_RUN_CMD touch ${swayOutputs} + fi + ''; } diff --git a/home-modules/terminal.nix b/home-modules/terminal.nix index a8aa931..de7d527 100644 --- a/home-modules/terminal.nix +++ b/home-modules/terminal.nix @@ -31,7 +31,7 @@ default_layout = "zoxide-picker"; pane_frames = false; simplified_ui = true; - mouse_mode = true; + mouse_mode = false; copy_on_select = true; show_startup_tips = false; show_release_notes = false;