diff --git a/system/greetd.nix b/system/greetd.nix index 73ea5c3..2b5f22f 100644 --- a/system/greetd.nix +++ b/system/greetd.nix @@ -37,6 +37,8 @@ in xdg.portal = { enable = true; wlr.enable = true; + # Always pick the first monitor, this is fine since I only ever use a single monitor + wlr.settings.screencast.chooser_type = "none"; # gtk portal needed to make gtk apps happy extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; }; @@ -72,7 +74,7 @@ in user = "lelgenio"; }; default_session = { - command = "dbus-run-session -- ${pkgs.sway}/bin/sway --config ${swayConfig}"; + command = "${pkgs.sway}/bin/sway --config ${swayConfig}"; }; }; }; diff --git a/user/sway/default.nix b/user/sway/default.nix index dfe7de9..bc53b36 100644 --- a/user/sway/default.nix +++ b/user/sway/default.nix @@ -76,19 +76,10 @@ in }; output = { "*" = { + adaptive_sync = "on"; bg = "${theme.background} fill"; - }; - "AOC 24G2W1G4 ATNM6XA004804" = { - position = "0,0"; - adaptive_sync = "on"; mode = "1920x1080@144.000Hz"; }; - "LG Electronics 25UM58G 0x01010101" = { - position = "1920,215"; - adaptive_sync = "on"; - scale = "1.2"; - mode = "2560x1080@74.991Hz"; - }; }; fonts = { names = [ font.interface ]; diff --git a/user/sway/kanshi.nix b/user/sway/kanshi.nix index ea42826..486a209 100644 --- a/user/sway/kanshi.nix +++ b/user/sway/kanshi.nix @@ -8,24 +8,6 @@ in config.services.kanshi = lib.mkIf cfg.enable { enable = true; settings = [ - { - profile = { - name = "home"; - outputs = [ - { - criteria = "AOC 24G2W1G4 ATNM6XA004804"; - position = "0,0"; - } - { - criteria = "LG Electronics 25UM58G 0x01010101"; - position = "1920,215"; - scale = 1.2; - mode = "2560x1080@74.991Hz"; - } - ]; - exec = [ "xrdb .Xresources" ]; - }; - } { profile = { name = "sedetary"; diff --git a/user/sway/sway-binds.nix b/user/sway/sway-binds.nix index 74cd842..27a27b4 100644 --- a/user/sway/sway-binds.nix +++ b/user/sway/sway-binds.nix @@ -110,8 +110,6 @@ let "${mod}+Control+${keyBind}" = "resize ${resize_cmd}"; # focus output "${mod}+mod1+${keyBind}" = "focus output ${direction}"; - # Move window to output - "${mod}+mod1+Control+${keyBind}" = "move window output ${direction}; focus output ${direction}"; # Move workspace to output "${mod}+mod1+Shift+${keyBind}" = "move workspace output ${direction}"; } @@ -127,8 +125,9 @@ let "${mod}+v" = "splitv"; "${mod}+a" = "focus parent"; - "${mod}+Shift+z" = "move scratchpad"; - "${mod}+z" = "scratchpad show"; + ## TODO: + # "${mod}+Shift+minus" = "move scratchpad"; + # "${mod}+minus" = "scratchpad show"; }; audio_binds = {