.bin/ansible-vault-manager

@@ -11,10 +11,10 @@ url="$(git remote get-url origin)"
 re="^(https|git)(:\/\/|@)([^\/:]+)[\/:]([^\/:]+)\/(.+)(.git)*$"
 
 if [[ $url =~ $re ]]; then
-	#protocol=${BASH_REMATCH[1]}
-	#separator=${BASH_REMATCH[2]}
-	#hostname=${BASH_REMATCH[3]}
-	user=${BASH_REMATCH[4]}
+    #protocol=${BASH_REMATCH[1]}
+    #separator=${BASH_REMATCH[2]}
+    #hostname=${BASH_REMATCH[3]}
+    user=${BASH_REMATCH[4]}
 	repo=$(basename -s .git "${BASH_REMATCH[5]}")
 fi
 

.config/env.d/30-services

@@ -1,8 +1,6 @@
 #!/usr/bin/env sh
 
-export DRONE_SERVER="https://ci.serguzim.me"
-
-export HASTE_SERVER="https://haste.snrd.eu"
+export DRONE_SERVER='https://ci.serguzim.me'
 
 export LINKWARDEN_URL="https://bookmarks.serguzim.me"
 

.config/git/config

@@ -11,6 +11,7 @@
 
 [diff]
 	tool = difftastic
+	external = difft
 [difftool]
 	prompt = false
 [difftool "difftastic"]
@@ -23,10 +24,12 @@
 	b = branch -vv
 	ci = commit
 	cia = commit -C HEAD --amend
-	d = difftool
-	dc = difftool --cached
-	ds = difftool --stat
-	dw = difftool --word-diff=color
+	d = diff
+	dc = diff --cached
+	ds = diff --stat
+	dw = diff --word-diff=color
+	dt = difftool
+	dtc = difftool --cached
 	l = log --graph
 	lo = log --graph --decorate --pretty='format:%C(auto)%h <%as>%d %s' --abbrev-commit --all
 	s = status

.config/home-manager/common.nix

@@ -18,7 +18,6 @@
 		git # git
 		gitflow # tool for git workflow
 		git-lfs # git support for large files
-		haste-client # tool to paste files
 		hostname # tool to get hostname
 		jq # tool for json
 		moar # moar is less

.config/yadm/bootstrap

@@ -1,23 +1,9 @@
 #!/usr/bin/env sh
 
-echo "Loading environment variables"
-. "$HOME/.config/environment"
-
-echo "Configuring yadm"
-yadm gitconfig core.bare false
-yadm gitconfig core.worktree "$HOME"
-yadm gitconfig status.showUntrackedFiles no
+echo "Updating push-url to use ssh"
 yadm remote set-url --push origin "git@git.serguzim.me:serguzim/.dotfiles.git"
 
-if [ ! -x "$(command -v autoinstall)" ];
-then
-  echo "Installing autoinstall command"
-  mkdir -p "$HOME/.local/bin"
-  curl -Lo "$HOME/.local/bin/autoinstall" https://git.serguzim.me/serguzim/tools/releases/download/latest/autoinstall
-  chmod +x "$HOME/.local/bin/autoinstall"
-fi
-
-echo "Autoinstalling base"
-autoinstall run base
+echo "Autoinstall base"
+autoinstall base
 
 echo "Don't forget to decrypt yadm secrets"