From d475f895a03a387fd9c439e24cff046f79985ca8 Mon Sep 17 00:00:00 2001
From: jeirmeister <jeir@jeirslab.xyz>
Date: Fri, 1 Nov 2024 00:49:26 -0700
Subject: [PATCH] Minor changes

---
 home.nix                                      |  1 -
 hosts/steamdeck/configuration.nix             |  2 +-
 .../programs/communication/default.nix        |  6 ---
 .../programs/development/env/common/paths.nix | 46 +++++++------------
 .../poetry/packages/default.nix               |  9 +++-
 .../development/env/languages/rust/cargo.nix  |  4 --
 6 files changed, 24 insertions(+), 44 deletions(-)

diff --git a/home.nix b/home.nix
index e6187b6..0c55821 100644
--- a/home.nix
+++ b/home.nix
@@ -15,7 +15,6 @@ in
 
     packages = with pkgs; [
       fortune
-      (customPackages.repo-to-text)
     ];
   };
 
diff --git a/hosts/steamdeck/configuration.nix b/hosts/steamdeck/configuration.nix
index eed5bba..62f4621 100644
--- a/hosts/steamdeck/configuration.nix
+++ b/hosts/steamdeck/configuration.nix
@@ -86,7 +86,7 @@ in
   services.xserver = {
     enable = true;
     xkb.layout = "us";
-    videoDrives = [ "displaylink" "modesetting" ];
+    videoDrivers = [ "displaylink" "modesetting" ];
     desktopManager.plasma6 = {
       enable = true;
       extraSessionCommands = ''
diff --git a/users/jeirmeister/programs/communication/default.nix b/users/jeirmeister/programs/communication/default.nix
index 630b1ce..f2582b7 100644
--- a/users/jeirmeister/programs/communication/default.nix
+++ b/users/jeirmeister/programs/communication/default.nix
@@ -1,12 +1,6 @@
 { config, pkgs, ... }:
 {
   home.packages = with pkgs; [
-    # Matrix/Mautrix bridges
-    element-desktop-wayland
-    mautrix-whatsapp
-    mautrix-signal
-    mautrix-telegram
-
     # Signal
     signal-cli
     signal-export
diff --git a/users/jeirmeister/programs/development/env/common/paths.nix b/users/jeirmeister/programs/development/env/common/paths.nix
index 1e00dc5..b9c417b 100644
--- a/users/jeirmeister/programs/development/env/common/paths.nix
+++ b/users/jeirmeister/programs/development/env/common/paths.nix
@@ -1,35 +1,29 @@
+# users/jeirmeister/programs/development/env/common/paths.nix
 { config, pkgs, ... }:
 
 {
   home.sessionVariables = {
-    # XDG Base Directories
-    XDG_CACHE_HOME = "$HOME/.cache";
-    XDG_CONFIG_HOME = "$HOME/.config";
-    XDG_DATA_HOME = "$HOME/.local/share";
-    XDG_STATE_HOME = "$HOME/.local/state";
-    XDG_RUNTIME_DIR = "/run/user/${toString config.home.uid}";
-
     # Tool-specific paths
-    DEVELOPMENT_TOOLS_HOME = "$XDG_DATA_HOME/dev-tools";
-    VIRTUALENV_HOME = "$XDG_DATA_HOME/virtualenvs";
-    NODE_PACKAGES_DIR = "$XDG_DATA_HOME/node-packages";
-    CARGO_HOME = "$XDG_DATA_HOME/cargo";
-    GO_PATH = "$XDG_DATA_HOME/go";
+    DEVELOPMENT_TOOLS_HOME = "${config.xdg.dataHome}/dev-tools";
+    VIRTUALENV_HOME = "${config.xdg.dataHome}/virtualenvs";
+    NODE_PACKAGES_DIR = "${config.xdg.dataHome}/node-packages";
+    CARGO_HOME = "${config.xdg.dataHome}/cargo";
+    GO_PATH = "${config.xdg.dataHome}/go";
   };
 
   # Ensure directories exist
   home.file = {
-    "${config.home.sessionVariables.DEVELOPMENT_TOOLS_HOME}/.keep".text = "";
-    "${config.home.sessionVariables.VIRTUALENV_HOME}/.keep".text = "";
-    "${config.home.sessionVariables.NODE_PACKAGES_DIR}/.keep".text = "";
+    "${config.xdg.dataHome}/dev-tools/.keep".text = "";
+    "${config.xdg.dataHome}/virtualenvs/.keep".text = "";
+    "${config.xdg.dataHome}/node-packages/.keep".text = "";
     # Add standard cache directories
-    "${config.home.sessionVariables.XDG_CACHE_HOME}/yarn/.keep".text = "";
-    "${config.home.sessionVariables.XDG_CACHE_HOME}/pnpm/.keep".text = "";
+    "${config.xdg.cacheHome}/yarn/.keep".text = "";
+    "${config.xdg.cacheHome}/pnpm/.keep".text = "";
 
     # Add standard data directories
-    "${config.home.sessionVariables.XDG_DATA_HOME}/node/.keep".text = "";
-    "${config.home.sessionVariables.XDG_DATA_HOME}/python/.keep".text = "";
-    "${config.home.sessionVariables.XDG_DATA_HOME}/cargo/.keep".text = "";
+    "${config.xdg.dataHome}/node/.keep".text = "";
+    "${config.xdg.dataHome}/python/.keep".text = "";
+    "${config.xdg.dataHome}/cargo/.keep".text = "";
   };
 
   # Add to env/common/paths.nix
@@ -42,16 +36,8 @@
 
   assertions = [
     {
-      assertion = config.home.sessionVariables.XDG_CACHE_HOME != "";
-      message = "XDG_CACHE_HOME must be set";
-    }
-    {
-      assertion = config.home.sessionVariables.XDG_DATA_HOME != "";
-      message = "XDG_DATA_HOME must be set";
-    }
-    {
-      assertion = config.home.sessionVariables.XDG_CONFIG_HOME != "";
-      message = "XDG_CONFIG_HOME must be set";
+      assertion = config.xdg.enable;
+      message = "XDG Base Directory support must be enabled";
     }
   ];
 }
\ No newline at end of file
diff --git a/users/jeirmeister/programs/development/env/languages/python/package-managers/poetry/packages/default.nix b/users/jeirmeister/programs/development/env/languages/python/package-managers/poetry/packages/default.nix
index eb2fb4b..0f38540 100644
--- a/users/jeirmeister/programs/development/env/languages/python/package-managers/poetry/packages/default.nix
+++ b/users/jeirmeister/programs/development/env/languages/python/package-managers/poetry/packages/default.nix
@@ -1,5 +1,10 @@
-{ pkgs, ... }:
+{ config, pkgs, ... }:
 
-{
+let
   repo-to-text = pkgs.callPackage ./repo-to-text.nix {};
+in
+{
+  home.packages = [
+    repo-to-text
+  ];
 }
\ No newline at end of file
diff --git a/users/jeirmeister/programs/development/env/languages/rust/cargo.nix b/users/jeirmeister/programs/development/env/languages/rust/cargo.nix
index 1fc6275..1c7001f 100644
--- a/users/jeirmeister/programs/development/env/languages/rust/cargo.nix
+++ b/users/jeirmeister/programs/development/env/languages/rust/cargo.nix
@@ -8,10 +8,6 @@
     cargo-tarpaulin
   ];
 
-  home.sessionVariables = {
-    CARGO_HOME = "${config.home.sessionVariables.CARGO_HOME}";
-  };
-
   home.file.".cargo/config.toml".text = ''
     [build]
     target-dir = "target"