Util : Use catAllText.

flake.nix

@@ -109,13 +109,13 @@
 
 		# Common modules used across all hosts.
 		nixosModules.common = let
-			ls = path: map (f: "${path}/${f}") (
+			lsFiles = path: map (f: "${path}/${f}") (
 				builtins.filter (i: builtins.readFileType "${path}/${i}" == "regular") (
 					builtins.attrNames (builtins.readDir path)
 				)
 			);
 		in {
-			imports = (ls ./module/common) ++ (ls ./overlay) ++ [ ./user/Root.nix ];
+			imports = (lsFiles ./module/common) ++ (lsFiles ./overlay) ++ [ ./user/Root.nix ];
 		};
 
 		# Function to create a host.

module/common/bash/default.nix

@@ -1,7 +1,6 @@
 { style, util, pkgs, ... } @args: let
-	modules = pkgs.writeText "bashModules" (util.trimTabs (builtins.foldl' (acc: mod:
+	modules     = util.catAllText ./module args;
-		acc + (import mod args).text
+	modulesFile = pkgs.writeText "bashModules" modules;
-	) "" (util.ls ./module)));
 in {
 	inherit modules;
 
@@ -9,11 +8,11 @@ in {
 		# If not running interactively, don't do anything.
 		# [[ "$-" != *i* ]] && return
 
-		'') + builtins.readFile modules + util.trimTabs (''
+		'') + modules + util.trimTabs (''
 
 		# Find all functions.
 		function find_function() {
-			/usr/bin/env cat ${modules} | /usr/bin/env grep "^function.*()" | /usr/bin/env sed -e "s/^function //" -e "s/().*//"
+			/usr/bin/env cat ${modulesFile} | /usr/bin/env grep "^function.*()" | /usr/bin/env sed -e "s/^function //" -e "s/().*//"
 		}
 
 		# Export all functions.

part/Util.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }: {
+{ pkgs, ... }: rec {
 	# Remove tabs indentation,
 	trimTabs = text: let
 		shouldStripTab = lines: builtins.all (line: (line == "") || (pkgs.lib.strings.hasPrefix "	" line)) lines;
@@ -9,4 +9,11 @@
 
 	# List all files in a dir.
 	ls = path: map (f: "${path}/${f}") (builtins.attrNames (builtins.readDir path));
+
+	# Concat all files by `text` key.
+	catAllText = path: args: trimTabs (
+		(builtins.foldl' (acc: mod:
+			acc + (import mod args).text
+		) "" (ls path))
+	);
 }

user/common/keyd/default.nix

@@ -1,44 +1,3 @@
-{ util, ... }: {
+{ util, ... } @args: {
-	config = util.trimTabs ''
+	config = util.catAllText ./module args;
-		[firefox]
-		alt.q = C-S-tab
-		alt.e = C-tab
-		alt.x = C-w
-		alt.t = C-t
-		alt.r = C-f5
-		alt.u = C-S-t
-		alt.f = C-f
-		alt.n = f3
-		alt.p = S-f3
-		alt.w = up
-		alt.a = left
-		alt.s = down
-		alt.d = right
-		alt.space = f6
-
-		[steam-app-548430]
-		alt.w = macro(enter 10ms r enter)
-		alt.a = macro(enter 10ms N o enter)
-		alt.s = macro(enter 10ms W a i t enter)
-		alt.d = macro(enter 10ms Y e s enter)
-		alt.q = macro(enter 10ms S o r r y ! enter)
-		alt.e = macro(enter 10ms T h a n k s ! enter)
-		alt.g = macro(enter 10ms g g enter)
-		alt.z = macro(enter 10ms < space L e f t enter)
-		alt.x = macro(enter 10ms > space H e r e space < enter)
-		alt.c = macro(enter 10ms > space R i g h t enter)
-		alt.r = macro(enter 10ms N e e d space m o r e space a m m o enter)
-		alt.t = macro(enter 10ms M a y space I space t a k e space e x t r a ? enter)
-		alt.v = macro(enter 10ms A F K enter)
-		alt.f = macro(enter 10ms I space n e e d space h e l p ! enter)
-		alt.b = macro(enter 10ms I ' m space b a c k enter)
-		alt.l = macro(enter 10ms L e a f space l o v e r enter)
-		alt.j = macro(enter 10ms G o o d space j o b enter)
-		alt.k = macro(enter 10ms O k a y enter)
-		alt.1 = macro(enter 10ms L e t ' s space d o space t h i s space T e x a s space s t y l e ! enter)
-		alt.2 = macro(enter 10ms H e c k space y e s ! enter)
-		alt.3 = macro(enter 10ms < 3 enter)
-		alt.4 = macro(enter 10ms J u s t space a space s i d e - j o b space w h i l e space w a i t i n g space f o r space a space s e x space u p d a t e . enter)
-		alt.m = macro(enter 10ms I space r e p l y space u s i n g space m a c r o s . space U s e space s o f t w a r e space l i k e space k e y d , space o r space b u y space a space Q M K space k e y b o a r d . enter)
-	'';
 }

user/common/keyd/module/DRG.nix

@@ -0,0 +1,29 @@
+{ ... }: {
+	text = ''
+		[steam-app-548430]
+		space = macro(space leftcontrol)
+		alt.w = macro(enter 10ms r enter)
+		alt.a = macro(enter 10ms N o enter)
+		alt.s = macro(enter 10ms W a i t enter)
+		alt.d = macro(enter 10ms Y e s enter)
+		alt.q = macro(enter 10ms S o r r y ! enter)
+		alt.e = macro(enter 10ms T h a n k s ! enter)
+		alt.g = macro(enter 10ms g g enter)
+		alt.z = macro(enter 10ms < space L e f t enter)
+		alt.x = macro(enter 10ms > space H e r e space < enter)
+		alt.c = macro(enter 10ms > space R i g h t enter)
+		alt.r = macro(enter 10ms N e e d space m o r e space a m m o enter)
+		alt.t = macro(enter 10ms M a y space I space t a k e space e x t r a ? enter)
+		alt.v = macro(enter 10ms A F K enter)
+		alt.f = macro(enter 10ms I space n e e d space h e l p ! enter)
+		alt.b = macro(enter 10ms I ' m space b a c k enter)
+		alt.l = macro(enter 10ms L e a f space l o v e r enter)
+		alt.j = macro(enter 10ms G o o d space j o b enter)
+		alt.k = macro(enter 10ms O k a y enter)
+		alt.1 = macro(enter 10ms L e t ' s space d o space t h i s space T e x a s space s t y l e ! enter)
+		alt.2 = macro(enter 10ms H e c k space y e s ! enter)
+		alt.3 = macro(enter 10ms < 3 enter)
+		alt.4 = macro(enter 10ms J u s t space a space s i d e - j o b space w h i l e space w a i t i n g space f o r space a space s e x space u p d a t e . enter)
+		alt.m = macro(enter 10ms I space r e p l y space u s i n g space m a c r o s . space U s e space s o f t w a r e space l i k e space k e y d , space o r space b u y space a space Q M K space k e y b o a r d . enter)
+	'';
+}

user/common/keyd/module/Firefox.nix

@@ -0,0 +1,19 @@
+{ ... }: {
+	text = ''
+		[firefox]
+		alt.q = C-S-tab
+		alt.e = C-tab
+		alt.x = C-w
+		alt.t = C-t
+		alt.r = C-f5
+		alt.u = C-S-t
+		alt.f = C-f
+		alt.n = f3
+		alt.p = S-f3
+		alt.w = up
+		alt.a = left
+		alt.s = down
+		alt.d = right
+		alt.space = f6
+	'';
+}