From 77bae34361af93f34d0caabda9494112e5dcffb5 Mon Sep 17 00:00:00 2001
From: Nydragon <contact@ccnlc.eu>
Date: Mon, 17 Jun 2024 21:04:33 +0900
Subject: [PATCH] fix: change env var declarations to propagate to sway

---
 home/default.nix             | 6 ------
 home/neovim/default.nix      | 2 +-
 hosts/marr/configuration.nix | 7 +++++++
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/home/default.nix b/home/default.nix
index de5d038..4ff3d57 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -117,11 +117,5 @@ rec {
         ];
       in
       scripts ++ pk;
-
-    sessionVariables = {
-      EDITOR = "nvim";
-      MOZ_ENABLE_WAYLAND = 1;
-      ELECTRON_OZONE_PLATFORM_HINT = "auto";
-    };
   };
 }
diff --git a/home/neovim/default.nix b/home/neovim/default.nix
index b817a1d..360d0cb 100644
--- a/home/neovim/default.nix
+++ b/home/neovim/default.nix
@@ -12,7 +12,7 @@
       rust-analyzer
       nixd
       pyright
-      nodePackages_latest.bash-language-server
+      bash-language-server
       lua-language-server
       zls
       #rPackages.languageserver
diff --git a/hosts/marr/configuration.nix b/hosts/marr/configuration.nix
index b2fd1c2..f828ae2 100644
--- a/hosts/marr/configuration.nix
+++ b/hosts/marr/configuration.nix
@@ -197,6 +197,13 @@ in
     MANPAGER = "sh -c 'col -bx | ${pkgs.bat}/bin/bat -l man -p'";
   };
 
+  environment.variables = {
+    ELECTRON_OZONE_PLATFORM_HINT = "auto";
+    MOZ_ENABLE_WAYLAND = 1;
+  };
+
+  security.polkit.enable = true;
+
   services.pipewire = {
     enable = true;
     alsa.enable = true;