From 71e574a156484fc3e0d063e4e44dfa6e169cd28f Mon Sep 17 00:00:00 2001 From: Johannes Rothe Date: Fri, 8 Mar 2024 23:35:20 +0100 Subject: [PATCH] Remove workarounds for sway --- configuration.nix | 43 ------------------------------------------- 1 file changed, 43 deletions(-) diff --git a/configuration.nix b/configuration.nix index 0ec3e9b..a1c53dd 100644 --- a/configuration.nix +++ b/configuration.nix @@ -4,47 +4,6 @@ { config, pkgs, lib, ... }: - let - # bash script to let dbus know about important env variables and - # propagate 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 = '' - dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway - systemctl --user stop pipewire pipewire-media-session xdg-desktop-portal xdg-desktop-portal-wlr - systemctl --user start pipewire pipewire-media-session xdg-desktop-portal xdg-desktop-portal-wlr - ''; - }; - - # currently, there is some friction between sway and gtk: - # https://github.com/swaywm/sway/wiki/GTK-3-settings-on-Wayland - # the suggested way to set gtk settings is with gsettings - # for gsettings to work, we need to tell it where the schemas are - # using the XDG_DATA_DIR environment variable - # run at the end of sway config - configure-gtk = pkgs.writeTextFile { - name = "configure-gtk"; - destination = "/bin/configure-gtk"; - executable = true; - text = let - schema = pkgs.gsettings-desktop-schemas; - datadir = "${schema}/share/gsettings-schemas/${schema.name}"; - in '' - export XDG_DATA_DIRS=${datadir}:$XDG_DATA_DIRS - gnome_schema=org.gnome.desktop.interface - gsettings set $gnome_schema gtk-theme 'Dracula' - ''; - }; - - in - { imports = [ # Include the results of the hardware scan. @@ -130,11 +89,9 @@ bind black # code formatting calibre - configure-gtk cmake cryptsetup curl - dbus-sway-environment dracula-theme dmenu docker-compose