diff --git a/system/greetd.nix b/system/greetd.nix index 94d20e1..73ea5c3 100644 --- a/system/greetd.nix +++ b/system/greetd.nix @@ -42,13 +42,9 @@ in }; services.greetd = let - start-sway = pkgs.writeShellScriptBin "start-sway" '' - mkdir -p ~/.local/share/sway - exec sway 2>&1 | tee -a ~/.local/share/sway/sway.log - ''; greetd_main_script = pkgs.writeShellScriptBin "main" '' export XDG_CURRENT_DESKTOP=sway GTK_THEME="${theme.gtk_theme}" XCURSOR_THEME="${theme.cursor_theme}" - ${pkgs.greetd.gtkgreet}/bin/gtkgreet -l -c ${lib.getExe start-sway} + ${pkgs.greetd.gtkgreet}/bin/gtkgreet -l -c ${desktop} swaymsg exit ''; swayConfig = pkgs.writeText "greetd-sway-config" '' @@ -72,7 +68,7 @@ in enable = true; settings = { initial_session = { - command = lib.getExe start-sway; + command = desktop; user = "lelgenio"; }; default_session = { diff --git a/system/mouse.nix b/system/mouse.nix index b5d5b16..c09ccdd 100644 --- a/system/mouse.nix +++ b/system/mouse.nix @@ -1,15 +1,4 @@ { # Allow configuring Logitech Peripherals services.ratbagd.enable = true; - - # Sway does not undersand high resolution scroll wheels - # I don't need this, so I disable it - environment.etc."libinput/local-overrides.quirks".text = '' - [Logitech G502 X PLUS] - MatchUdevType=mouse - MatchBus=usb - MatchVendor=0x046D - MatchProduct=0x4099 - AttrEventCode=-REL_WHEEL_HI_RES - ''; }