From 52f27f4d55820b2ad4d2d8df09d597e8ba643d81 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Sat, 15 Oct 2022 08:25:49 +0200
Subject: Fix XDG environment variables

---
 user/settings/base.nix | 96 ++++++++++++++++++++++++--------------------------
 1 file changed, 46 insertions(+), 50 deletions(-)

diff --git a/user/settings/base.nix b/user/settings/base.nix
index 252d113f..74c759bb 100644
--- a/user/settings/base.nix
+++ b/user/settings/base.nix
@@ -35,57 +35,53 @@
       };
     };
   };
-  home.sessionVariables =
-    let
-      HOME = builtins.getEnv "HOME";
-    in
-    {
-      EMAIL = "alan@alanpearce.eu";
-      XDG_CACHE_HOME = if pkgs.stdenv.isDarwin then "${HOME}/Library/Caches/XDG" else "${HOME}/.cache";
-      XDG_CONFIG_HOME = "${HOME}/.config";
-      XDG_DATA_HOME = "${HOME}/.local/share";
-    };
+  home.sessionVariables = {
+    EMAIL = "alan@alanpearce.eu";
+    XDG_CACHE_HOME = if pkgs.stdenv.isDarwin then "$HOME/Library/Caches/XDG" else "$HOME/.cache";
+    XDG_CONFIG_HOME = "$HOME/.config";
+    XDG_DATA_HOME = "$HOME/.local/share";
+  };
 
-    programs.zsh.shellAliases = {
-      make = "${pkgs.remake}/bin/remake";
-    };
-    programs.htop = {
-      enable = true;
-      settings = {
-        header_margin = 0;
-        tree_view = 1;
-        hide_kernel_threads = 1;
-        hide_userland_threads = 1;
-      };
+  programs.zsh.shellAliases = {
+    make = "${pkgs.remake}/bin/remake";
+  };
+  programs.htop = {
+    enable = true;
+    settings = {
+      header_margin = 0;
+      tree_view = 1;
+      hide_kernel_threads = 1;
+      hide_userland_threads = 1;
     };
-    home.packages = with pkgs;
+  };
+  home.packages = with pkgs;
+  [
+    pv
+    fd
+    sd
+    entr
+    ripgrep
+    iftop
+    nmap
+    moreutils
+    mtr
+    tree
+    abduco
+    dvtm
+    vimv
+  ] ++
+  (
+    if !stdenv.isDarwin
+    then
+    [
+      file
+      ldns
+      lsof
+      unar
+      zip
+    ]
+    else
     [
-      pv
-      fd
-      sd
-      entr
-      ripgrep
-      iftop
-      nmap
-      moreutils
-      mtr
-      tree
-      abduco
-      dvtm
-      vimv
-    ] ++
-    (
-      if !stdenv.isDarwin
-      then
-      [
-        file
-        ldns
-        lsof
-        unar
-        zip
-      ]
-      else
-      [
-      ]
-    );
+    ]
+  );
 }
-- 
cgit 1.4.1