cleanup code, migrate to modules + start rewriting ddt4all derivation

profiles/default.nix

@@ -1,6 +1,5 @@
 { self, impurity, inputs, ... }: {
 	home-manager = {
-    	verbose = true;
     	useGlobalPkgs = true;
     	useUserPackages = true;
     	backupFileExtension = "bak";

profiles/hulk/fish-functions.nix

@@ -0,0 +1,32 @@
+{
+	webcopy = ''
+		set -l domain (string trim $argv)
+		get --recursive \
+		--level 5 \
+		--no-clobber \
+		--page-requisites \
+		--adjust-extension \
+		--span-hosts \
+		--convert-links \
+		--domains $domain \
+		--no-parent \
+		$domain
+	'';
+
+	venv = ''
+		if [ -d .venv ]; then
+        	source .venv/bin/activate.fish
+      	else
+        	python -m venv .venv
+        	source .venv/bin/activate.fish
+      	fi
+	'';
+
+	thunderbird = ''
+		if pgrep -x birdtray > /dev/null
+        	birdtray -s
+      	else
+        	birdtray &
+    	end
+	'';
+}

profiles/hulk/fish/default.nix

@@ -1,77 +0,0 @@
-{
-  	imports = [
-		./starship.nix
-		./nix-index.nix
-	];
-
-  	programs.fish = {
-   		enable = true;
-    	interactiveShellInit = ''
-			set fish_greeting
-			cat ~/.cache/wal/sequences
-		'';
-		shellAliases = {
-			".." = "cd ..";
-			"..." = "cd ../..";
-			"...." = "cd ../../../";
-			"....." = "cd ../../../../";
-		  
-			"cp" = "cp -v";
-			"ddf" = "df -h";
-			"etc" = "erd -H";
-			"mkdir" = "mkdir -p";
-			"mv" = "mv -v";
-			"rm" = "rm -v";
-			"rr" = "rm -rf";
-
-			"neofetch" = "fastfetch";
-		};
-
-		shellAbbrs = {
-			gaa  = "git add -A";
-			ga   = "git add";
-			gbd  = "git branch --delete";
-			gb   = "git branch";
-			gc   = "git commit";
-			gcm  = "git commit -m";
-			gcob = "git checkout -b";
-			gco  = "git checkout";
-			gd   = "git diff";
-			gl   = "git log";
-			gp   = "git push";
-			gs   = "git status";
-		};
-	  
-		functions = {
-			webcopy = ''
-				function webcopy
-					set -l domain (string trim $argv)
-					wget --recursive \
-						--level 5 \
-						--no-clobber \
-						--page-requisites \
-						--adjust-extension \
-						--span-hosts \
-						--convert-links \
-						--domains $domain \
-						--no-parent \
-						$domain
-				end
-		  	'';
-
-		  	venv = ''
-				function venv 
-					source .venv/bin/activate.fish
-				end
-		  	'';
-
-			thunderbird = ''
-				if pgrep -x birdtray > /dev/null
-        			birdtray -s
-      			else
-        			birdtray &
-      			end
-			'';
-		};
-	};
-}

profiles/hulk/fish/nix-index.nix

@@ -1,6 +0,0 @@
-{
-	programs.nix-index = {
-  		enable = true;
-  		enableFishIntegration = true;
-	};
-}

profiles/hulk/fish/starship.nix

@@ -1,6 +0,0 @@
-{
-	programs.starship = {
-		enable = true;
-		enableFishIntegration = true;
-	};
-}

profiles/hulk/packages.nix

@@ -1,17 +1,6 @@
 { pkgs, inputs, ... }:
 
 {
-	imports = [
-		../../modules/home-manager/darkman.nix
-		inputs.ags.homeManagerModules.default
-	];
-
-    modules.darkman = {
-		enable = true;
-        customLightModeScript = "$HOME/.config/hypr/scripts/random-wallpaper.sh";
-        customDarkModeScript = "$HOME/.config/hypr/scripts/random-wallpaper.sh";
-    };
-	
 	home.packages = with pkgs; [
 		pywal pywalfox-native
 
@@ -20,7 +9,6 @@
 		]))
 
 		inputs.nordvpn.packages.${system}.nordvpn
-		(pkgs.callPackage ../../derivations/ddt4all.nix {})
 
 		(birdtray.overrideAttrs (_: {
   			cmakeFlags = [ "-DOPT_THUNDERBIRD_CMDLINE=${thunderbird}/bin/thunderbird" ];

profiles/hulk/programs.nix

@@ -1,8 +1,24 @@
 { inputs, pkgs, ... }: 
 
 {
-  	imports = [ ./fish ];
+	imports = [
+		../../modules/home-manager/darkman.nix
+		../../modules/home-manager/fish.nix
+		inputs.ags.homeManagerModules.default
+	];
+
+    modules.darkman = {
+		enable = true;
+        customLightModeScript = "$HOME/.config/hypr/scripts/random-wallpaper.sh";
+        customDarkModeScript = "$HOME/.config/hypr/scripts/random-wallpaper.sh";
+    };
 	
+	modules.fish = {
+		enable = true;
+		enableStarship = true;
+		functions = import ./fish-functions.nix;
+	};
+
 	programs.pywal.enable = true;
 	programs.ags = {
     	enable = true;
@@ -21,40 +37,8 @@
 			#advanced-scene-switcher
 			obs-tuna
 			obs-move-transition
-			droidcam-obs
 			waveform
 			wlrobs
 		];
 	};
-
-	services.darkman = {
-    	enable = true;
-    	darkModeScripts = {
-        	theme = ''
-				${pkgs.dconf}/bin/dconf write\
-          		/org/gnome/desktop/interface/color-scheme "'prefer-dark'"
-        	'';
-
-			wallpaper = ''
-				$HOME/.config/hypr/scripts/random-wallpaper.sh
-			'';
-
-			pywalfox = "command -v pywalfox &>/dev/null && pywalfox dark && pywalfox update";
-      	};
-
-      	lightModeScripts = {
-        	theme = ''
-          		${pkgs.dconf}/bin/dconf write\
-          		/org/gnome/desktop/interface/color-scheme "'prefer-light'"
-        	'';
-
-			wallpaper = ''
-				$HOME/.config/hypr/scripts/random-wallpaper.sh
-			'';
-
-			pywalfox = "command -v pywalfox &>/dev/null && pywalfox light && pywalfox update";
-      	};
-
-      	settings.usegeoclue = true;
-    };
 }