7 files changed, 6 insertions, 37 deletions
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"
-  ];
-}