From 4a21e783d4989ce3f86dd3e2c0a1b8ee6dc3c515 Mon Sep 17 00:00:00 2001
From: Dan Anglin <daangling@gmail.com>
Date: Sat, 14 Sep 2024 18:28:21 +0100
Subject: [PATCH] refactor: utilise the rec keyword

Use the rec keyword for paths that are within any one of the XDG
directories.
---
 configuration.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 69eccd1..18f337f 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -89,7 +89,7 @@
       xdg-user-dirs
     ];
 
-    variables = {
+    variables = rec {
       # Tools
       BROWSER         = "firefox";
       EDITOR          = "nvim";
@@ -100,23 +100,24 @@
       XDG_CONFIG_HOME = "$HOME/.local/config";
       XDG_DATA_HOME   = "$HOME/.local/data";
       XDG_STATE_HOME  = "$HOME/.local/state";
-      LOG_HOME        = "$HOME/.local/state/logs";
+
+      LOG_HOME        = "${XDG_STATE_HOME}/logs";
 
       # Bash history configuration
-      HISTFILE       = "$HOME/.local/state/bash/history";
+      HISTFILE       = "${XDG_STATE_HOME}/bash/history";
       HISTCONTROL    = "ignoreboth";
       HISTFILESIZE   = "10000";
       HISTSIZE       = "1000";
       HISTTIMEFORMAT = "%d/%m/%y %T: ";
 
       # Less history configuration
-      LESSHISTFILE = "$HOME/.local/state/less/history";
+      LESSHISTFILE = "${XDG_STATE_HOME}/less/history";
 
       # GNUPG Configuration
-      GNUPGHOME = "$HOME/.local/data/gnupg";
+      GNUPGHOME = "${XDG_DATA_HOME}/gnupg";
 
       # Go configuration
-      GOPATH      = "$HOME/.local/data/go";
+      GOPATH      = "${XDG_DATA_HOME}/go";
       GOROOT      = "$HOME/.local/opt/go";
       GOBIN       = "$HOME/.local/goblin";
       GOOS        = "linux";
@@ -124,11 +125,11 @@
       CGO_ENABLED = "0";
 
       # Magefile configuration
-      MAGEFILE_CACHE        = "$HOME/.local/cache/magefile";
+      MAGEFILE_CACHE        = "${XDG_CACHE_HOME}/magefile";
       MAGEFILE_ENABLE_COLOR = "true";
 
       # Docker environment variables
-      DOCKER_CONFIG = "$HOME/.local/config/docker";
+      DOCKER_CONFIG = "${XDG_CONFIG_HOME}/docker";
     };
 
     localBinInPath = true;