From 944ee0e6e7a7539b26533e298acbc963db35ff9e Mon Sep 17 00:00:00 2001
From: Christoph Schmatzler <christoph@schmatzler.com>
Date: Thu, 19 Mar 2026 19:57:48 +0100
Subject: [PATCH] refactor

---
 modules/chidi.nix   | 15 ++++++++++++++-
 modules/darwin.nix  |  2 ++
 modules/desktop.nix |  2 +-
 modules/jason.nix   | 15 ++++++++++++++-
 modules/tahani.nix  | 15 +++++++++++++++
 modules/user.nix    | 23 -----------------------
 6 files changed, 46 insertions(+), 26 deletions(-)

diff --git a/modules/chidi.nix b/modules/chidi.nix
index cc89519..8c08550 100644
--- a/modules/chidi.nix
+++ b/modules/chidi.nix
@@ -17,7 +17,20 @@
 				};
 			})
 		(den.lib.perUser {
-				includes = [den.aspects.desktop];
+				includes = [
+					den.aspects.cschmatzler
+					den.aspects.shell
+					den.aspects.ssh-client
+					den.aspects.terminal
+					den.aspects.atuin
+					den.aspects.dev-tools
+					den.aspects.neovim
+					den.aspects.ai-tools
+					den.aspects.secrets
+					den.aspects.zellij
+					den.aspects.zk
+					den.aspects.desktop
+				];
 
 				homeManager = {...}: {
 					fonts.fontconfig.enable = true;
diff --git a/modules/darwin.nix b/modules/darwin.nix
index 6af1c57..62bd2bf 100644
--- a/modules/darwin.nix
+++ b/modules/darwin.nix
@@ -141,6 +141,8 @@
 		homebrew = {
 			enable = true;
 			casks = [
+				"alcove"
+				"aqua-voice"
 				"ghostty@tip"
 				"helium-browser"
 				"tidal"
diff --git a/modules/desktop.nix b/modules/desktop.nix
index 520baf9..0442a9f 100644
--- a/modules/desktop.nix
+++ b/modules/desktop.nix
@@ -1,7 +1,7 @@
 {...}: {
 	den.aspects.desktop.homeManager = {
-		pkgs,
 		lib,
+		pkgs,
 		...
 	}: {
 		home.packages = with pkgs;
diff --git a/modules/jason.nix b/modules/jason.nix
index d6fc5d0..01a1e15 100644
--- a/modules/jason.nix
+++ b/modules/jason.nix
@@ -13,7 +13,20 @@
 				};
 			})
 		(den.lib.perUser {
-				includes = [den.aspects.desktop];
+				includes = [
+					den.aspects.cschmatzler
+					den.aspects.shell
+					den.aspects.ssh-client
+					den.aspects.terminal
+					den.aspects.atuin
+					den.aspects.dev-tools
+					den.aspects.neovim
+					den.aspects.ai-tools
+					den.aspects.secrets
+					den.aspects.zellij
+					den.aspects.zk
+					den.aspects.desktop
+				];
 
 				homeManager = {...}: {
 					fonts.fontconfig.enable = true;
diff --git a/modules/tahani.nix b/modules/tahani.nix
index ebd1ff6..9526458 100644
--- a/modules/tahani.nix
+++ b/modules/tahani.nix
@@ -52,6 +52,21 @@
 				};
 			})
 		(den.lib.perUser {
+				includes = [
+					den.aspects.cschmatzler
+					den.aspects.shell
+					den.aspects.ssh-client
+					den.aspects.terminal
+					den.aspects.atuin
+					den.aspects.dev-tools
+					den.aspects.neovim
+					den.aspects.ai-tools
+					den.aspects.secrets
+					den.aspects.zellij
+					den.aspects.zk
+					den.aspects.email
+				];
+
 				homeManager = {
 					config,
 					inputs',
diff --git a/modules/user.nix b/modules/user.nix
index 52e8fee..70161e2 100644
--- a/modules/user.nix
+++ b/modules/user.nix
@@ -1,34 +1,11 @@
 {den, ...}: {
 	den.aspects.cschmatzler.includes = [
-		den._.bidirectional
 		den.provides.primary-user
-		den.aspects.shell
-		den.aspects.ssh-client
-		den.aspects.terminal
-		den.aspects.email
-		den.aspects.atuin
-		den.aspects.dev-tools
-		den.aspects.neovim
-		den.aspects.ai-tools
-		den.aspects.secrets
-		den.aspects.zellij
-		den.aspects.zk
 	];
 
 	den.aspects.cschmatzler.homeManager = {
-		lib,
-		pkgs,
 		...
 	}: {
 		programs.home-manager.enable = true;
-
-		home.activation =
-			lib.mkIf pkgs.stdenv.isDarwin {
-				"setWallpaper" =
-					lib.hm.dag.entryAfter ["revealHomeLibraryDirectory"] ''
-						echo "[+] Setting wallpaper"
-						${import ./_lib/wallpaper.nix {inherit pkgs;}}/bin/set-wallpaper-script
-					'';
-			};
 	};
 }