lelgenio/nixos-config
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

sway: remove obsolete systemd integration

Browse source
This commit is contained in:
Leonardo Eugênio 2024-06-11 01:18:02 -03:00
parent dfb3b88ada
commit 9cdb3eb489
4 changed files with 0 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
overlays/default.nix
View file

@ -2,7 +2,6 @@
rec { rec {
all = [ all = [
scripts scripts
sway
themes themes
new-packages new-packages
patches patches
@ -11,8 +10,6 @@ rec {
scripts = (import ../scripts); scripts = (import ../scripts);
sway = (import ./sway.nix);
themes = ( themes = (
final: prev: { final: prev: {
papirus_red = (final.papirus-icon-theme.override { color = "red"; }); papirus_red = (final.papirus-icon-theme.override { color = "red"; });

19
overlays/sway.nix
View file

@ -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
'';
};
})

1
system/greetd.nix
View file

@ -45,7 +45,6 @@ in
services.greetd = services.greetd =
let let
greetd_main_script = pkgs.writeShellScriptBin "main" '' 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}" export XDG_CURRENT_DESKTOP=sway GTK_THEME="${theme.gtk_theme}" XCURSOR_THEME="${theme.cursor_theme}"
${pkgs.greetd.gtkgreet}/bin/gtkgreet -l -c ${desktop} ${pkgs.greetd.gtkgreet}/bin/gtkgreet -l -c ${desktop}
swaymsg exit swaymsg exit

1
user/sway/default.nix
View file

@ -101,7 +101,6 @@ in
}; };
extraConfig = '' extraConfig = ''
for_window [title=.*] inhibit_idle fullscreen for_window [title=.*] inhibit_idle fullscreen
exec ${pkgs.dbus-sway-environment}/bin/dbus-sway-environment
exec swaymsg workspace 2 exec swaymsg workspace 2
exec_always systemctl --user restart waybar.service exec_always systemctl --user restart waybar.service
exec corectrl --minimize-systray exec corectrl --minimize-systray