From df7b5c1aeddf36c71c6f579ccc9c2487e04d54cb Mon Sep 17 00:00:00 2001
From: Aargh Rai <aargh.rai+git@gmail.com>
Date: Tue, 31 Mar 2026 15:43:42 +0530
Subject: battery mode widget fix + declaritive environment variables

---
 nixos/environment.nix | 17 +++++++++++++++++
 nixos/home.nix        | 12 ------------
 2 files changed, 17 insertions(+), 12 deletions(-)

(limited to 'nixos')

diff --git a/nixos/environment.nix b/nixos/environment.nix
index 0919898..0399eaa 100644
--- a/nixos/environment.nix
+++ b/nixos/environment.nix
@@ -1,5 +1,22 @@
 { config, pkgs, ... }:
 {
+  environment.variables = {
+    EDITOR = "nvim";
+    XDG_CONFIG_HOME = "$HOME/.config";
+    XDG_CACHE_HOME = "$HOME/.cache";
+    PATH = [
+      "$HOME/.bin"
+      "$HOME/.cargo/bin"
+      "/opt/android-sdk/cmdline-tools/latest/bin"
+      "/opt/android-sdk/platform-tools"
+      "/opt/android-sdk/emulator"
+    ];
+    PKG_CONFIG_PATH="$HOME/.local/lib/pkgconfig $HOME/.local/lib64/pkgconfig";
+    LD_LIBRARY_PATH="$HOME/.local/lib $HOME/.local/lib64";
+    ANDROID_NDK_HOME="/opt/android-ndk";
+    ANDROID_NDK_ROOT="/opt/android-ndk";
+    ANDROID_HOME="/opt/android-sdk";
+  };
   programs.nix-ld.enable = true;
   environment.systemPackages = with pkgs; [
     man-pages-posix
diff --git a/nixos/home.nix b/nixos/home.nix
index c0a7719..c37e743 100644
--- a/nixos/home.nix
+++ b/nixos/home.nix
@@ -73,18 +73,6 @@ function mkcd
     mkdir -p $argv[1]
     cd $argv[1]
 end
-
-set -x PKG_CONFIG_PATH $HOME/.local/lib/pkgconfig $HOME/.local/lib64/pkgconfig
-set -x LD_LIBRARY_PATH $HOME/.local/lib $HOME/.local/lib64
-set -U fish_user_paths /home/comet/.cargo/bin $fish_user_paths
-set -U fish_user_paths /opt/android-sdk/cmdline-tools/latest/bin $fish_user_paths
-set -U fish_user_paths /opt/android-sdk/platform-tools $fish_user_paths
-set -U fish_user_paths /opt/android-sdk/emulator $fish_user_paths
-set -U fish_user_paths $HOME/.bin $fish_user_paths
-
-set ANDROID_NDK_HOME /opt/android-ndk
-set ANDROID_NDK_ROOT /opt/android-ndk
-set ANDROID_HOME /opt/android-sdk
 '';
   };
   environment.systemPackages = with pkgs; [
-- 
cgit v1.2.3