From fde8ea13c0b0bbda827782ba9ffb326f821d0f85 Mon Sep 17 00:00:00 2001
From: Nathan Reiner <nathan@nathanreiner.xyz>
Date: Thu, 17 Oct 2024 18:20:11 +0200
Subject: add custom scripts dir

---
 common/home/default.nix | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

(limited to 'common/home/default.nix')

diff --git a/common/home/default.nix b/common/home/default.nix
index 1ae5ce9..ba35f9a 100644
--- a/common/home/default.nix
+++ b/common/home/default.nix
@@ -1,11 +1,14 @@
 {
+	lib,
 	config,
 	pkgs,
 	nixvim,
 	...
 }:
 let
-dirfilter = import ../../utils/dirfilter.nix;
+dirfilter = import ../../utils/dirfilter.nix { inherit lib; };
+scripts = map (n: pkgs.writeShellScriptBin n (builtins.readFile ./scripts/${n}))
+              (dirfilter { path = ./scripts; suffix = ""; type = "regular"; });
 programs = dirfilter { path = ./programs; type = "directory"; };
 services = dirfilter { path = ./services; type = "directory"; };
 packages = [
@@ -41,25 +44,17 @@ packages = [
 		programs = builtins.listToAttrs (
 				map (n: {
 					name = n;
-					value =
-					if builtins.pathExists ./programs/${n}/default.nix then
-					(import ./programs/${n} {
-					 inherit pkgs;
-					 home = config.home-manager.users.n8.home;
-					 })
-					else
-					{ enable = true; };
+					value = (import ./programs/${n} {
+							inherit pkgs;
+							home = config.home-manager.users.n8.home;
+						});
 					}) programs
 				);
 
 		services = builtins.listToAttrs (
 				map (n: {
-					name = n;
-					value =
-					if builtins.pathExists ./services/${n}/default.nix then
-					(import ./services/${n} { inherit pkgs; })
-					else
-					{ enable = true; };
+						name = n;
+						value = (import ./services/${n} { inherit pkgs; });
 					}) services
 				);
 
-- 
cgit v1.2.3-70-g09d2