From 5af57de559b3fc9647a0af7158af7698cd55ea88 Mon Sep 17 00:00:00 2001
From: Dmitry Voronin <hi@voronind.com>
Date: Mon, 1 Jul 2024 08:15:31 +0300
Subject: [PATCH] Bash : Use program to setup.

---
 home/config/default.nix                       |  4 ----
 home/{config => program}/bash/default.nix     | 24 +++++++++----------
 .../bash/module/Android.nix                   |  0
 .../bash/module/Archive.nix                   |  0
 home/{config => program}/bash/module/Ask.nix  |  0
 .../bash/module/Autocomplete.nix              |  0
 .../bash/module/Battery.nix                   |  0
 .../bash/module/Bootstrap.nix                 |  0
 .../bash/module/Brightness.nix                |  0
 home/{config => program}/bash/module/Calc.nix |  0
 home/{config => program}/bash/module/Cd.nix   |  0
 .../bash/module/Checksum.nix                  |  0
 .../{config => program}/bash/module/Chmod.nix |  0
 .../{config => program}/bash/module/Color.nix |  0
 .../bash/module/Container.nix                 |  0
 .../bash/module/Copypaste.nix                 |  0
 home/{config => program}/bash/module/Cp.nix   |  0
 home/{config => program}/bash/module/Date.nix |  0
 .../{config => program}/bash/module/Dconf.nix |  0
 home/{config => program}/bash/module/Disk.nix |  0
 .../bash/module/Distrobox.nix                 |  0
 .../{config => program}/bash/module/Dmenu.nix |  0
 .../bash/module/Docker.nix                    |  0
 home/{config => program}/bash/module/Dvd.nix  |  0
 .../bash/module/Ffmpeg.nix                    |  0
 home/{config => program}/bash/module/File.nix |  0
 home/{config => program}/bash/module/Find.nix |  0
 home/{config => program}/bash/module/Fix.nix  |  0
 home/{config => program}/bash/module/Git.nix  |  0
 home/{config => program}/bash/module/Gpg.nix  |  0
 .../{config => program}/bash/module/Group.nix |  0
 home/{config => program}/bash/module/Help.nix |  0
 home/{config => program}/bash/module/Ls.nix   |  0
 .../bash/module/Markdown.nix                  |  0
 home/{config => program}/bash/module/Name.nix |  0
 .../bash/module/Network.nix                   |  0
 home/{config => program}/bash/module/Nix.nix  |  0
 .../bash/module/Notify.nix                    |  0
 home/{config => program}/bash/module/Own.nix  |  0
 home/{config => program}/bash/module/Pack.nix |  0
 .../{config => program}/bash/module/Parse.nix |  0
 .../bash/module/Permission.nix                |  0
 .../{config => program}/bash/module/Power.nix |  0
 .../{config => program}/bash/module/Prune.nix |  0
 home/{config => program}/bash/module/Ps.nix   |  0
 home/{config => program}/bash/module/Ps1.nix  |  0
 .../bash/module/Random.nix                    |  0
 .../bash/module/Recursive.nix                 |  0
 home/{config => program}/bash/module/Save.nix |  0
 .../{config => program}/bash/module/Shopt.nix |  0
 home/{config => program}/bash/module/Ssh.nix  |  0
 .../{config => program}/bash/module/Steam.nix |  0
 home/{config => program}/bash/module/Su.nix   |  0
 .../bash/module/Terminal.nix                  |  0
 home/{config => program}/bash/module/Tmp.nix  |  0
 home/{config => program}/bash/module/Tmux.nix |  0
 home/{config => program}/bash/module/Todo.nix |  0
 .../bash/module/Transcode.nix                 |  0
 home/{config => program}/bash/module/Try.nix  |  0
 home/{config => program}/bash/module/Util.nix |  0
 home/{config => program}/bash/module/Vdl.nix  |  0
 home/{config => program}/bash/module/Vi.nix   |  0
 .../{config => program}/bash/module/Watch.nix |  0
 home/program/default.nix                      |  9 ++++++-
 host/home/Backup.nix                          |  2 +-
 65 files changed, 21 insertions(+), 18 deletions(-)
 rename home/{config => program}/bash/default.nix (57%)
 rename home/{config => program}/bash/module/Android.nix (100%)
 rename home/{config => program}/bash/module/Archive.nix (100%)
 rename home/{config => program}/bash/module/Ask.nix (100%)
 rename home/{config => program}/bash/module/Autocomplete.nix (100%)
 rename home/{config => program}/bash/module/Battery.nix (100%)
 rename home/{config => program}/bash/module/Bootstrap.nix (100%)
 rename home/{config => program}/bash/module/Brightness.nix (100%)
 rename home/{config => program}/bash/module/Calc.nix (100%)
 rename home/{config => program}/bash/module/Cd.nix (100%)
 rename home/{config => program}/bash/module/Checksum.nix (100%)
 rename home/{config => program}/bash/module/Chmod.nix (100%)
 rename home/{config => program}/bash/module/Color.nix (100%)
 rename home/{config => program}/bash/module/Container.nix (100%)
 rename home/{config => program}/bash/module/Copypaste.nix (100%)
 rename home/{config => program}/bash/module/Cp.nix (100%)
 rename home/{config => program}/bash/module/Date.nix (100%)
 rename home/{config => program}/bash/module/Dconf.nix (100%)
 rename home/{config => program}/bash/module/Disk.nix (100%)
 rename home/{config => program}/bash/module/Distrobox.nix (100%)
 rename home/{config => program}/bash/module/Dmenu.nix (100%)
 rename home/{config => program}/bash/module/Docker.nix (100%)
 rename home/{config => program}/bash/module/Dvd.nix (100%)
 rename home/{config => program}/bash/module/Ffmpeg.nix (100%)
 rename home/{config => program}/bash/module/File.nix (100%)
 rename home/{config => program}/bash/module/Find.nix (100%)
 rename home/{config => program}/bash/module/Fix.nix (100%)
 rename home/{config => program}/bash/module/Git.nix (100%)
 rename home/{config => program}/bash/module/Gpg.nix (100%)
 rename home/{config => program}/bash/module/Group.nix (100%)
 rename home/{config => program}/bash/module/Help.nix (100%)
 rename home/{config => program}/bash/module/Ls.nix (100%)
 rename home/{config => program}/bash/module/Markdown.nix (100%)
 rename home/{config => program}/bash/module/Name.nix (100%)
 rename home/{config => program}/bash/module/Network.nix (100%)
 rename home/{config => program}/bash/module/Nix.nix (100%)
 rename home/{config => program}/bash/module/Notify.nix (100%)
 rename home/{config => program}/bash/module/Own.nix (100%)
 rename home/{config => program}/bash/module/Pack.nix (100%)
 rename home/{config => program}/bash/module/Parse.nix (100%)
 rename home/{config => program}/bash/module/Permission.nix (100%)
 rename home/{config => program}/bash/module/Power.nix (100%)
 rename home/{config => program}/bash/module/Prune.nix (100%)
 rename home/{config => program}/bash/module/Ps.nix (100%)
 rename home/{config => program}/bash/module/Ps1.nix (100%)
 rename home/{config => program}/bash/module/Random.nix (100%)
 rename home/{config => program}/bash/module/Recursive.nix (100%)
 rename home/{config => program}/bash/module/Save.nix (100%)
 rename home/{config => program}/bash/module/Shopt.nix (100%)
 rename home/{config => program}/bash/module/Ssh.nix (100%)
 rename home/{config => program}/bash/module/Steam.nix (100%)
 rename home/{config => program}/bash/module/Su.nix (100%)
 rename home/{config => program}/bash/module/Terminal.nix (100%)
 rename home/{config => program}/bash/module/Tmp.nix (100%)
 rename home/{config => program}/bash/module/Tmux.nix (100%)
 rename home/{config => program}/bash/module/Todo.nix (100%)
 rename home/{config => program}/bash/module/Transcode.nix (100%)
 rename home/{config => program}/bash/module/Try.nix (100%)
 rename home/{config => program}/bash/module/Util.nix (100%)
 rename home/{config => program}/bash/module/Vdl.nix (100%)
 rename home/{config => program}/bash/module/Vi.nix (100%)
 rename home/{config => program}/bash/module/Watch.nix (100%)

diff --git a/home/config/default.nix b/home/config/default.nix
index 414c04b..c8bfa6e 100644
--- a/home/config/default.nix
+++ b/home/config/default.nix
@@ -1,5 +1,4 @@
 { self, config, ... } @args: let
-	bash     = import ./bash         args;
 	btop     = import ./top/btop     args;
 	editor   = import ./editorconfig args;
 	foot     = import ./foot         args;
@@ -17,9 +16,6 @@
 	waybar   = import ./waybar       args;
 	yazi     = import ./yazi         args;
 in {
-	".bashrc".text                          = bash.bashrc;
-	".bash_profile".text                    = bash.bash_profile;
-	".profile".text                         = bash.profile;
 	".config/MangoHud/MangoHud.conf".text   = mangohud.config;
 	".config/MangoHud/presets.conf".text    = mangohud.presets;
 	".config/btop/btop.conf".text           = btop.text;
diff --git a/home/config/bash/default.nix b/home/program/bash/default.nix
similarity index 57%
rename from home/config/bash/default.nix
rename to home/program/bash/default.nix
index 6373b5c..40467e1 100644
--- a/home/config/bash/default.nix
+++ b/home/program/bash/default.nix
@@ -20,19 +20,19 @@ in {
 		fi
 	'';
 
-	bash_profile = util.trimTabs ''
-		# Home manager.
-		[ -e ~/.nix-profile/etc/profile.d/nix.sh ] && source ~/.nix-profile/etc/profile.d/nix.sh
+	# bash_profile = util.trimTabs ''
+	# 	# Home manager.
+	# 	[ -e ~/.nix-profile/etc/profile.d/nix.sh ] && source ~/.nix-profile/etc/profile.d/nix.sh
 
-		# Bashrc.
-		[ -f ~/.bashrc ] && source ~/.bashrc
+	# 	# Bashrc.
+	# 	[ -f ~/.bashrc ] && source ~/.bashrc
 
-		# Profile.
-		[ -f ~/.profile ] && source ~/.profile
-	'';
+	# 	# Profile.
+	# 	[ -f ~/.profile ] && source ~/.profile
+	# '';
 
-	profile = util.trimTabs ''
-		# Load HM vars.
-		[ -e ~/.nix-profile/etc/profile.d/hm-session-vars.sh ] && source ~/.nix-profile/etc/profile.d/hm-session-vars.sh
-	'';
+	# profile = util.trimTabs ''
+	# 	# Load HM vars.
+	# 	[ -e ~/.nix-profile/etc/profile.d/hm-session-vars.sh ] && source ~/.nix-profile/etc/profile.d/hm-session-vars.sh
+	# '';
 }
diff --git a/home/config/bash/module/Android.nix b/home/program/bash/module/Android.nix
similarity index 100%
rename from home/config/bash/module/Android.nix
rename to home/program/bash/module/Android.nix
diff --git a/home/config/bash/module/Archive.nix b/home/program/bash/module/Archive.nix
similarity index 100%
rename from home/config/bash/module/Archive.nix
rename to home/program/bash/module/Archive.nix
diff --git a/home/config/bash/module/Ask.nix b/home/program/bash/module/Ask.nix
similarity index 100%
rename from home/config/bash/module/Ask.nix
rename to home/program/bash/module/Ask.nix
diff --git a/home/config/bash/module/Autocomplete.nix b/home/program/bash/module/Autocomplete.nix
similarity index 100%
rename from home/config/bash/module/Autocomplete.nix
rename to home/program/bash/module/Autocomplete.nix
diff --git a/home/config/bash/module/Battery.nix b/home/program/bash/module/Battery.nix
similarity index 100%
rename from home/config/bash/module/Battery.nix
rename to home/program/bash/module/Battery.nix
diff --git a/home/config/bash/module/Bootstrap.nix b/home/program/bash/module/Bootstrap.nix
similarity index 100%
rename from home/config/bash/module/Bootstrap.nix
rename to home/program/bash/module/Bootstrap.nix
diff --git a/home/config/bash/module/Brightness.nix b/home/program/bash/module/Brightness.nix
similarity index 100%
rename from home/config/bash/module/Brightness.nix
rename to home/program/bash/module/Brightness.nix
diff --git a/home/config/bash/module/Calc.nix b/home/program/bash/module/Calc.nix
similarity index 100%
rename from home/config/bash/module/Calc.nix
rename to home/program/bash/module/Calc.nix
diff --git a/home/config/bash/module/Cd.nix b/home/program/bash/module/Cd.nix
similarity index 100%
rename from home/config/bash/module/Cd.nix
rename to home/program/bash/module/Cd.nix
diff --git a/home/config/bash/module/Checksum.nix b/home/program/bash/module/Checksum.nix
similarity index 100%
rename from home/config/bash/module/Checksum.nix
rename to home/program/bash/module/Checksum.nix
diff --git a/home/config/bash/module/Chmod.nix b/home/program/bash/module/Chmod.nix
similarity index 100%
rename from home/config/bash/module/Chmod.nix
rename to home/program/bash/module/Chmod.nix
diff --git a/home/config/bash/module/Color.nix b/home/program/bash/module/Color.nix
similarity index 100%
rename from home/config/bash/module/Color.nix
rename to home/program/bash/module/Color.nix
diff --git a/home/config/bash/module/Container.nix b/home/program/bash/module/Container.nix
similarity index 100%
rename from home/config/bash/module/Container.nix
rename to home/program/bash/module/Container.nix
diff --git a/home/config/bash/module/Copypaste.nix b/home/program/bash/module/Copypaste.nix
similarity index 100%
rename from home/config/bash/module/Copypaste.nix
rename to home/program/bash/module/Copypaste.nix
diff --git a/home/config/bash/module/Cp.nix b/home/program/bash/module/Cp.nix
similarity index 100%
rename from home/config/bash/module/Cp.nix
rename to home/program/bash/module/Cp.nix
diff --git a/home/config/bash/module/Date.nix b/home/program/bash/module/Date.nix
similarity index 100%
rename from home/config/bash/module/Date.nix
rename to home/program/bash/module/Date.nix
diff --git a/home/config/bash/module/Dconf.nix b/home/program/bash/module/Dconf.nix
similarity index 100%
rename from home/config/bash/module/Dconf.nix
rename to home/program/bash/module/Dconf.nix
diff --git a/home/config/bash/module/Disk.nix b/home/program/bash/module/Disk.nix
similarity index 100%
rename from home/config/bash/module/Disk.nix
rename to home/program/bash/module/Disk.nix
diff --git a/home/config/bash/module/Distrobox.nix b/home/program/bash/module/Distrobox.nix
similarity index 100%
rename from home/config/bash/module/Distrobox.nix
rename to home/program/bash/module/Distrobox.nix
diff --git a/home/config/bash/module/Dmenu.nix b/home/program/bash/module/Dmenu.nix
similarity index 100%
rename from home/config/bash/module/Dmenu.nix
rename to home/program/bash/module/Dmenu.nix
diff --git a/home/config/bash/module/Docker.nix b/home/program/bash/module/Docker.nix
similarity index 100%
rename from home/config/bash/module/Docker.nix
rename to home/program/bash/module/Docker.nix
diff --git a/home/config/bash/module/Dvd.nix b/home/program/bash/module/Dvd.nix
similarity index 100%
rename from home/config/bash/module/Dvd.nix
rename to home/program/bash/module/Dvd.nix
diff --git a/home/config/bash/module/Ffmpeg.nix b/home/program/bash/module/Ffmpeg.nix
similarity index 100%
rename from home/config/bash/module/Ffmpeg.nix
rename to home/program/bash/module/Ffmpeg.nix
diff --git a/home/config/bash/module/File.nix b/home/program/bash/module/File.nix
similarity index 100%
rename from home/config/bash/module/File.nix
rename to home/program/bash/module/File.nix
diff --git a/home/config/bash/module/Find.nix b/home/program/bash/module/Find.nix
similarity index 100%
rename from home/config/bash/module/Find.nix
rename to home/program/bash/module/Find.nix
diff --git a/home/config/bash/module/Fix.nix b/home/program/bash/module/Fix.nix
similarity index 100%
rename from home/config/bash/module/Fix.nix
rename to home/program/bash/module/Fix.nix
diff --git a/home/config/bash/module/Git.nix b/home/program/bash/module/Git.nix
similarity index 100%
rename from home/config/bash/module/Git.nix
rename to home/program/bash/module/Git.nix
diff --git a/home/config/bash/module/Gpg.nix b/home/program/bash/module/Gpg.nix
similarity index 100%
rename from home/config/bash/module/Gpg.nix
rename to home/program/bash/module/Gpg.nix
diff --git a/home/config/bash/module/Group.nix b/home/program/bash/module/Group.nix
similarity index 100%
rename from home/config/bash/module/Group.nix
rename to home/program/bash/module/Group.nix
diff --git a/home/config/bash/module/Help.nix b/home/program/bash/module/Help.nix
similarity index 100%
rename from home/config/bash/module/Help.nix
rename to home/program/bash/module/Help.nix
diff --git a/home/config/bash/module/Ls.nix b/home/program/bash/module/Ls.nix
similarity index 100%
rename from home/config/bash/module/Ls.nix
rename to home/program/bash/module/Ls.nix
diff --git a/home/config/bash/module/Markdown.nix b/home/program/bash/module/Markdown.nix
similarity index 100%
rename from home/config/bash/module/Markdown.nix
rename to home/program/bash/module/Markdown.nix
diff --git a/home/config/bash/module/Name.nix b/home/program/bash/module/Name.nix
similarity index 100%
rename from home/config/bash/module/Name.nix
rename to home/program/bash/module/Name.nix
diff --git a/home/config/bash/module/Network.nix b/home/program/bash/module/Network.nix
similarity index 100%
rename from home/config/bash/module/Network.nix
rename to home/program/bash/module/Network.nix
diff --git a/home/config/bash/module/Nix.nix b/home/program/bash/module/Nix.nix
similarity index 100%
rename from home/config/bash/module/Nix.nix
rename to home/program/bash/module/Nix.nix
diff --git a/home/config/bash/module/Notify.nix b/home/program/bash/module/Notify.nix
similarity index 100%
rename from home/config/bash/module/Notify.nix
rename to home/program/bash/module/Notify.nix
diff --git a/home/config/bash/module/Own.nix b/home/program/bash/module/Own.nix
similarity index 100%
rename from home/config/bash/module/Own.nix
rename to home/program/bash/module/Own.nix
diff --git a/home/config/bash/module/Pack.nix b/home/program/bash/module/Pack.nix
similarity index 100%
rename from home/config/bash/module/Pack.nix
rename to home/program/bash/module/Pack.nix
diff --git a/home/config/bash/module/Parse.nix b/home/program/bash/module/Parse.nix
similarity index 100%
rename from home/config/bash/module/Parse.nix
rename to home/program/bash/module/Parse.nix
diff --git a/home/config/bash/module/Permission.nix b/home/program/bash/module/Permission.nix
similarity index 100%
rename from home/config/bash/module/Permission.nix
rename to home/program/bash/module/Permission.nix
diff --git a/home/config/bash/module/Power.nix b/home/program/bash/module/Power.nix
similarity index 100%
rename from home/config/bash/module/Power.nix
rename to home/program/bash/module/Power.nix
diff --git a/home/config/bash/module/Prune.nix b/home/program/bash/module/Prune.nix
similarity index 100%
rename from home/config/bash/module/Prune.nix
rename to home/program/bash/module/Prune.nix
diff --git a/home/config/bash/module/Ps.nix b/home/program/bash/module/Ps.nix
similarity index 100%
rename from home/config/bash/module/Ps.nix
rename to home/program/bash/module/Ps.nix
diff --git a/home/config/bash/module/Ps1.nix b/home/program/bash/module/Ps1.nix
similarity index 100%
rename from home/config/bash/module/Ps1.nix
rename to home/program/bash/module/Ps1.nix
diff --git a/home/config/bash/module/Random.nix b/home/program/bash/module/Random.nix
similarity index 100%
rename from home/config/bash/module/Random.nix
rename to home/program/bash/module/Random.nix
diff --git a/home/config/bash/module/Recursive.nix b/home/program/bash/module/Recursive.nix
similarity index 100%
rename from home/config/bash/module/Recursive.nix
rename to home/program/bash/module/Recursive.nix
diff --git a/home/config/bash/module/Save.nix b/home/program/bash/module/Save.nix
similarity index 100%
rename from home/config/bash/module/Save.nix
rename to home/program/bash/module/Save.nix
diff --git a/home/config/bash/module/Shopt.nix b/home/program/bash/module/Shopt.nix
similarity index 100%
rename from home/config/bash/module/Shopt.nix
rename to home/program/bash/module/Shopt.nix
diff --git a/home/config/bash/module/Ssh.nix b/home/program/bash/module/Ssh.nix
similarity index 100%
rename from home/config/bash/module/Ssh.nix
rename to home/program/bash/module/Ssh.nix
diff --git a/home/config/bash/module/Steam.nix b/home/program/bash/module/Steam.nix
similarity index 100%
rename from home/config/bash/module/Steam.nix
rename to home/program/bash/module/Steam.nix
diff --git a/home/config/bash/module/Su.nix b/home/program/bash/module/Su.nix
similarity index 100%
rename from home/config/bash/module/Su.nix
rename to home/program/bash/module/Su.nix
diff --git a/home/config/bash/module/Terminal.nix b/home/program/bash/module/Terminal.nix
similarity index 100%
rename from home/config/bash/module/Terminal.nix
rename to home/program/bash/module/Terminal.nix
diff --git a/home/config/bash/module/Tmp.nix b/home/program/bash/module/Tmp.nix
similarity index 100%
rename from home/config/bash/module/Tmp.nix
rename to home/program/bash/module/Tmp.nix
diff --git a/home/config/bash/module/Tmux.nix b/home/program/bash/module/Tmux.nix
similarity index 100%
rename from home/config/bash/module/Tmux.nix
rename to home/program/bash/module/Tmux.nix
diff --git a/home/config/bash/module/Todo.nix b/home/program/bash/module/Todo.nix
similarity index 100%
rename from home/config/bash/module/Todo.nix
rename to home/program/bash/module/Todo.nix
diff --git a/home/config/bash/module/Transcode.nix b/home/program/bash/module/Transcode.nix
similarity index 100%
rename from home/config/bash/module/Transcode.nix
rename to home/program/bash/module/Transcode.nix
diff --git a/home/config/bash/module/Try.nix b/home/program/bash/module/Try.nix
similarity index 100%
rename from home/config/bash/module/Try.nix
rename to home/program/bash/module/Try.nix
diff --git a/home/config/bash/module/Util.nix b/home/program/bash/module/Util.nix
similarity index 100%
rename from home/config/bash/module/Util.nix
rename to home/program/bash/module/Util.nix
diff --git a/home/config/bash/module/Vdl.nix b/home/program/bash/module/Vdl.nix
similarity index 100%
rename from home/config/bash/module/Vdl.nix
rename to home/program/bash/module/Vdl.nix
diff --git a/home/config/bash/module/Vi.nix b/home/program/bash/module/Vi.nix
similarity index 100%
rename from home/config/bash/module/Vi.nix
rename to home/program/bash/module/Vi.nix
diff --git a/home/config/bash/module/Watch.nix b/home/program/bash/module/Watch.nix
similarity index 100%
rename from home/config/bash/module/Watch.nix
rename to home/program/bash/module/Watch.nix
diff --git a/home/program/default.nix b/home/program/default.nix
index 124c4f0..89ebd00 100644
--- a/home/program/default.nix
+++ b/home/program/default.nix
@@ -1,4 +1,6 @@
-{ secret, ... } @args: {
+{ secret, ... } @args: let
+	bash = import ./bash args;
+in {
 	home-manager.enable = true;
 
 	gpg = {
@@ -7,4 +9,9 @@
 	};
 
 	firefox = import ./firefox args;
+
+	bash = {
+		enable = true;
+		initExtra = bash.bashrc;
+	};
 }
diff --git a/host/home/Backup.nix b/host/home/Backup.nix
index b59e9ad..331461d 100644
--- a/host/home/Backup.nix
+++ b/host/home/Backup.nix
@@ -1,5 +1,5 @@
 { pkgs, util, __findFile, ... } @args: let
-	bash = import <home/config/bash> args;
+	bash = import <home/program/bash> args;
 	script = pkgs.writeText "backupScript" ''
 		source ${bash.modulesFile}