serguzim/.dotfiles
1
0
Fork 0
Code Issues Pull requests Activity

Compare commits

base: serguzim:a6e4ce98f00d308039ae7d9893eb5cc3c24f41b0
Branches Tags
serguzim:main
...
compare: serguzim:5cecab18eb21e835479bb045e88859689bdeb6b5
Branches Tags
serguzim:main

3 commits
a6e4ce98f0 ... 5cecab18eb

Author SHA1 Message Date
Tobias Reisinger
5cecab18eb
Improve yadm bootstrap script 2024-05-13 13:49:44 +02:00
Tobias Reisinger
8d4861b599
Restrict difftool to the aliases 2024-05-12 18:39:31 +02:00
Tobias Reisinger
9e0e4ac61f
Add haste-client 2024-05-12 18:38:33 +02:00
5 changed files with 29 additions and 15 deletions
Show stats Expand all files Collapse all files

8
.bin/ansible-vault-manager
View file

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

4
.config/env.d/30-services
View file

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

11
.config/git/config
View file

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

1
.config/home-manager/common.nix
View file

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

20
.config/yadm/bootstrap
View file

@ -1,9 +1,23 @@
#!/usr/bin/env sh #!/usr/bin/env sh
echo "Updating push-url to use ssh" 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
yadm remote set-url --push origin "git@git.serguzim.me:serguzim/.dotfiles.git" yadm remote set-url --push origin "git@git.serguzim.me:serguzim/.dotfiles.git"
echo "Autoinstall base" if [ ! -x "$(command -v autoinstall)" ];
autoinstall base 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 "Don't forget to decrypt yadm secrets" echo "Don't forget to decrypt yadm secrets"