modules: make XDG_DATA_HOME writeable

Unlike HOME, I haven't found any benefit to making this non-writeable
and having to write modules for every program that might want to use
it.

14 files changed, 13 insertions, 74 deletions

diff --git a/modules/nix/default.nix b/modules/nix/default.nix
index 5b0f28620c54..c004e83b2217 100644
--- a/modules/nix/default.nix
+++ b/modules/nix/default.nix
@@ -34,9 +34,4 @@ in {
 
   services = lib.optionalAttrs isDarwin
     { nix-daemon.enable = true; };
-
-  systemd.tmpfiles.rules = [
-    "d ${config.users.users.qyliss.home}/state/nix 0700 qyliss qyliss"
-  ];
-
 }
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"
-  ];
 }
diff --git a/modules/users/default.nix b/modules/users/default.nix
index 5e61a63919f9..cce724aa1a95 100644
--- a/modules/users/default.nix
+++ b/modules/users/default.nix
@@ -21,7 +21,6 @@ in {
 
   systemd.tmpfiles.rules = [
     "d ${config.users.users.qyliss.home} 0555 qyliss qyliss"
-    "d ${config.users.users.qyliss.home}/state 0500 qyliss qyliss"
-    "d ${config.users.users.qyliss.home}/state/cache 0700 qyliss qyliss"
+    "d ${config.users.users.qyliss.home}/state 0700 qyliss qyliss"
   ];
 }
diff --git a/modules/workstation/default.nix b/modules/workstation/default.nix
index a6081ac12ee5..5ae018f80964 100644
--- a/modules/workstation/default.nix
+++ b/modules/workstation/default.nix
@@ -4,11 +4,11 @@
   imports = [
     ../nix ../shell ../users ../ssh
     ./documentation ./windowing ./fonts ./gh ./hardware ./locale
-    ./dict ./dino ./emacs ./gnupg ./lorri ./mail ./mpv ./weechat
+    ./dict ./emacs ./gnupg ./lorri ./mail ./mpv ./weechat
   ];
 
   environment.systemPackages = with pkgs; [
-    ffmpeg mosh mpv nix-index qemu youtube-dl
+    dino ffmpeg mosh mpv nix-index qemu youtube-dl
   ];
 
   services.getty.autologinUser = "qyliss";
diff --git a/modules/workstation/dino/default.nix b/modules/workstation/dino/default.nix
deleted file mode 100644
index 74b49b07f1d8..000000000000
--- a/modules/workstation/dino/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  environment.systemPackages = with pkgs; [ dino ];
-
-  systemd.tmpfiles.rules = [
-    "d ${config.users.users.qyliss.home}/state/dino 0700 qyliss qyliss"
-  ];
-}
diff --git a/modules/workstation/emacs/default.nix b/modules/workstation/emacs/default.nix
index 6d63ec70cd4d..85096eb81ef7 100644
--- a/modules/workstation/emacs/default.nix
+++ b/modules/workstation/emacs/default.nix
@@ -46,7 +46,6 @@
   ];
 
   systemd.tmpfiles.rules = [
-    "d ${config.users.users.qyliss.home}/state/emacs 0700 qyliss qyliss"
     "d ${config.users.users.qyliss.home}/notes 0700 qyliss qyliss"
   ];
 
diff --git a/modules/workstation/lorri/default.nix b/modules/workstation/lorri/default.nix
index 70d0c1e313fd..602fac6106f7 100644
--- a/modules/workstation/lorri/default.nix
+++ b/modules/workstation/lorri/default.nix
@@ -1,10 +1,6 @@
 { config, ... }:
 
 {
-  systemd.tmpfiles.rules = [
-    "d ${config.users.users.qyliss.home}/state/lorri 0700 qyliss qyliss"
-  ];
-
   services.lorri.enable = true;
 
   # FIXME: systemd should have this set globally.
diff --git a/modules/workstation/windowing/default.nix b/modules/workstation/windowing/default.nix
index 3c23a386f220..e2bedb1727f9 100644
--- a/modules/workstation/windowing/default.nix
+++ b/modules/workstation/windowing/default.nix
@@ -2,11 +2,12 @@
 
 {
   imports = [
-    ./alacritty ./firefox ./gnome-mines ./gnome-podcasts ./gtk ./sway
+    ./alacritty ./firefox ./gtk ./sway
   ];
 
   environment.systemPackages = with pkgs; [
-    breeze-icons chromium gnome3.adwaita-icon-theme hicolor-icon-theme
-    imv pinball playerctl wf-recorder
+    breeze-icons chromium gnome3.adwaita-icon-theme gnome3.gnome-mines
+    gnome-podcasts hicolor-icon-theme imv pinball playerctl
+    wf-recorder
   ];
 }
diff --git a/modules/workstation/windowing/gnome-mines/default.nix b/modules/workstation/windowing/gnome-mines/default.nix
deleted file mode 100644
index d9800142bc29..000000000000
--- a/modules/workstation/windowing/gnome-mines/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  environment.systemPackages = with pkgs; [ gnome3.gnome-mines ];
-
-  systemd.tmpfiles.rules = [
-    "d ${config.users.users.qyliss.home}/state/gnome-mines 0700 qyliss qyliss"
-  ];
-}
diff --git a/modules/workstation/windowing/gnome-podcasts/default.nix b/modules/workstation/windowing/gnome-podcasts/default.nix
deleted file mode 100644
index dc291273b6d2..000000000000
--- a/modules/workstation/windowing/gnome-podcasts/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  environment.systemPackages = with pkgs; [ gnome-podcasts ];
-
-  systemd.tmpfiles.rules = [
-    "d ${config.users.users.qyliss.home}/state/gnome-podcasts 0700 qyliss qyliss"
-  ];
-}