diff --git a/overlays/default.nix b/overlays/default.nix index 3de7b1a..e83ed4c 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -2,7 +2,6 @@ rec { all = [ scripts - sway themes new-packages patches @@ -11,8 +10,6 @@ rec { scripts = (import ../scripts); - sway = (import ./sway.nix); - themes = ( final: prev: { papirus_red = (final.papirus-icon-theme.override { color = "red"; }); diff --git a/overlays/sway.nix b/overlays/sway.nix deleted file mode 100644 index c6d8d5e..0000000 --- a/overlays/sway.nix +++ /dev/null @@ -1,19 +0,0 @@ -(pkgs: _: { - # bash script to let dbus know about important env variables and - # propogate them to relevent services run at the end of sway config - # see - # https://github.com/emersion/xdg-desktop-portal-wlr/wiki/"It-doesn't-work"-Troubleshooting-Checklist - # note: this is pretty much the same as /etc/sway/config.d/nixos.conf but also restarts - # some user services to make sure they have the correct environment variables - dbus-sway-environment = pkgs.writeTextFile { - name = "dbus-sway-environment"; - destination = "/bin/dbus-sway-environment"; - executable = true; - text = '' - systemctl --user import-environment - dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway SWAYSOCK - # systemctl --user stop pipewire wireplumber xdg-desktop-portal xdg-desktop-portal-wlr - # systemctl --user start pipewire wireplumber xdg-desktop-portal xdg-desktop-portal-wlr - ''; - }; -}) diff --git a/system/greetd.nix b/system/greetd.nix index b152c72..2b5f22f 100644 --- a/system/greetd.nix +++ b/system/greetd.nix @@ -45,7 +45,6 @@ in services.greetd = let greetd_main_script = pkgs.writeShellScriptBin "main" '' - ${pkgs.dbus-sway-environment}/bin/dbus-sway-environment export XDG_CURRENT_DESKTOP=sway GTK_THEME="${theme.gtk_theme}" XCURSOR_THEME="${theme.cursor_theme}" ${pkgs.greetd.gtkgreet}/bin/gtkgreet -l -c ${desktop} swaymsg exit diff --git a/user/sway/default.nix b/user/sway/default.nix index 0ad5a6b..988453d 100644 --- a/user/sway/default.nix +++ b/user/sway/default.nix @@ -101,7 +101,6 @@ in }; extraConfig = '' for_window [title=.*] inhibit_idle fullscreen - exec ${pkgs.dbus-sway-environment}/bin/dbus-sway-environment exec swaymsg workspace 2 exec_always systemctl --user restart waybar.service exec corectrl --minimize-systray