5 files changed, 6 insertions, 30 deletions
diff --git a/modules/shell/cargo/default.nix b/modules/shell/cargo/default.nix
index db7a4306a663..523d2f992a78 100644
--- a/modules/shell/cargo/default.nix
+++ b/modules/shell/cargo/default.nix
@@ -1,11 +1,7 @@
-{ config, ... }:
+{ ... }:
 
 {
   environment.extraInit = ''
     export CARGO_HOME="$HOME/state/cargo"
   '';
-
-  systemd.tmpfiles.rules = [
-    "d ${config.users.users.qyliss.home}/state/cargo 0700 qyliss qyliss"
-  ];
 }
diff --git a/modules/shell/default.nix b/modules/shell/default.nix
index b213e9e1e0fd..47c4df19c7b8 100644
--- a/modules/shell/default.nix
+++ b/modules/shell/default.nix
@@ -2,8 +2,8 @@
 
 {
   imports = [
-    ./cargo ./cmake ./direnv ./git ./go ./kakoune ./less ./lynx ./pass
-    ./screen ./tmux ./zsh
+    ./cargo ./cmake ./git ./kakoune ./less ./lynx ./pass ./screen
+    ./tmux ./zsh
   ];
 
   environment.systemPackages = with pkgs; [
@@ -12,6 +12,7 @@
     binutils
     coreutils-prefixed
     curl
+    direnv
     execline
     file
     finger_bsd
@@ -54,6 +55,7 @@
   environment.variables.CLICOLOR = "1";
   environment.variables.EDITOR = "kak";
   environment.variables.EMAIL = "hi@alyssa.is";
+  environment.variables.GOPATH = "$XDG_DATA_HOME/go";
 
   security.sudo.package = pkgs.sudo.override { withInsults = true; };
   security.sudo.extraConfig = ''
diff --git a/modules/shell/direnv/default.nix b/modules/shell/direnv/default.nix
deleted file mode 100644
index 3ee1eeb2a012..000000000000
--- a/modules/shell/direnv/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  environment.systemPackages = with pkgs; [ direnv ];
-
-  systemd.tmpfiles.rules = [
-    "d ${config.users.users.qyliss.home}/state/direnv 0700 qyliss qyliss"
-  ];
-}
diff --git a/modules/shell/go/default.nix b/modules/shell/go/default.nix
deleted file mode 100644
index 8a4d272a808b..000000000000
--- a/modules/shell/go/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ config, ... }:
-
-{
-  environment.variables.GOPATH = "$XDG_DATA_HOME/go";
-
-  systemd.tmpfiles.rules = [
-    "d ${config.users.users.qyliss.home}/state/go 0700 qyliss qyliss"
-  ];
-}
diff --git a/modules/shell/pass/default.nix b/modules/shell/pass/default.nix
index 6c0d1fee55c4..0e4dff5eb928 100644
--- a/modules/shell/pass/default.nix
+++ b/modules/shell/pass/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 
 {
   environment.systemPackages = [
@@ -8,8 +8,4 @@
   environment.extraInit = ''
     export PASSWORD_STORE_DIR="$HOME/state/pass"
   '';
-
-  systemd.tmpfiles.rules = [
-    "d ${config.users.users.qyliss.home}/state/pass 0700 qyliss qyliss"
-  ];
 }