Improve yadm and other configs

.bin/.e

@@ -8,9 +8,8 @@ declare -A mapper=(
 	["autostart.toml"]="$HOME/.config/autostart.toml"
 	["bash"]="$HOME/.bashrc"
 	["bspwm"]="$HOME/.config/bspwm/bspwmrc"
-	["environment"]="$HOME/.config/environment"
-	["environment.d"]="$HOME/.config/environment.d/"
-	["environment.local"]="$HOME/.config/environment.d/99-local"
+	["env"]="$HOME/.config/environment"
+	["env.d"]="$HOME/.config/env.d/"
 	["git"]="$HOME/.config/git/config"
 	["git-ignore"]="$HOME/.config/git/ignore"
 	["home-manager"]="$HOME/.config/home-manager/home.nix"

.bin/autoinstall

@@ -12,10 +12,17 @@ _autoinstall_base () {
 	[ ! -x "$(command -v starship)" ] \
 		&& curl -sS "https://starship.rs/install.sh" | BIN_DIR="$HOME/.local/bin" FORCE=1 sh
 
-	_autoinstall_file \
+	[ ! -x "$(command -v "git-fire")" ] \
+		&& _autoinstall_exe \
 			"https://raw.githubusercontent.com/qw3rtman/git-fire/master/git-fire" \
 			"$HOME/.local/bin/git-fire"
 
+	[ ! -x "$(command -v "yadm")" ] \
+		&& _autoinstall_exe \
+			"https://github.com/TheLocehiliosan/yadm/raw/master/yadm" \
+			"$HOME/.local/bin/yadm" \
+		&& yadm alt
+
 	return 0
 }
 
@@ -80,6 +87,10 @@ _autoinstall_file () {
 	return 1
 }
 
+_autoinstall_exe () {
+	_autoinstall_file "$1" "$2" && chmod +x "$2"
+}
+
 _autoinstall_archive () {
 	if [ ! -f "$2" ]
 	then

.config/aliasrc

@@ -82,6 +82,6 @@ alias xdebug='XDEBUG_CONFIG="remote_host=127.0.0.1 remote_port=9003"'
 [ -x "$(command -v rmtrash)" ] && alias rm='rmtrash -I --one-file-system -v'
 [ -x "$(command -v rmdirtrash)" ] && alias rmdir='rmdirtrash'
 
-[ -x "$(command -v yadm)" ] || alias yadm='git --git-dir="$HOME/.local/share/yadm/repo.git"'
+[ ! -x "$(command -v yadm)" ] && alias yadm='git --git-dir="$HOME/.local/share/yadm/repo.git"'
 
 [ -f "$HOME/.config/aliasrc.local" ] && . "$HOME/.config/aliasrc.local"

.config/env.d/.gitignore

@@ -0,0 +1,2 @@
+99-local
+99-secrets

.config/home-manager/common.nix

@@ -26,6 +26,7 @@
 		ripgrep # grep-alternative
 		rmtrash # rm wrapper to use trash
 		shellcheck # tool for shell-syntax
+		starship # shell prompt
 		tokei # project-language statistics
 		trash-cli # trash utils
 		unzip # unzip

.config/yadm/bootstrap

@@ -5,3 +5,5 @@ yadm remote set-url --push origin "git@git.serguzim.me:serguzim/.dotfiles.git"
 
 echo "Autoinstall base"
 autoinstall base
+
+echo "Don't forget to decrypt yadm secrets"

.npmrc

@@ -0,0 +1,2 @@
+@fortawesome:registry=https://npm.fontawesome.com/
+//npm.fontawesome.com/:_authToken=${FONTAWESOME_NPM_AUTH_TOKEN}