From 9134428e9afea1b776b564c4cb476e150c776f80 Mon Sep 17 00:00:00 2001 From: Michel Date: Wed, 19 Jun 2024 11:59:51 +0200 Subject: [PATCH] minor updates --- .README.md | 2 +- .zshrc | 8 ++++++-- bin/.tool-versions | 4 ++-- bin/once-connected.zsh | 5 +++++ 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.README.md b/.README.md index 8f1ba77..03893d6 100644 --- a/.README.md +++ b/.README.md @@ -114,7 +114,7 @@ When the `fetch` configuration is not set, insert the following line in the _remote_ section of `.dotfiles/config`: ```config - fetch = +refs/heads/*:refs/remotes/origin/* + fetch = +refs/heads/*:refs/remotes//* ``` ### Install into `/etc/skel` diff --git a/.zshrc b/.zshrc index d9dce09..2c8f187 100644 --- a/.zshrc +++ b/.zshrc @@ -223,7 +223,12 @@ compdef colormake-short=make # Git # -alias dotfiles='/usr/bin/git --git-dir=$HOME/.dotfiles --work-tree=$HOME' +if [ -d $HOME/.dotfiles ]; then + alias dotfiles='/usr/bin/git --git-dir=$HOME/.dotfiles --work-tree=$HOME' +fi +if [ -d /etc/skel/.dotfiles ]; then + alias skelfiles='/usr/bin/git --git-dir=/etc/skel/.dotfiles --work-tree=/etc/skel' +fi lg() { @@ -446,7 +451,6 @@ zle -N globalias ### if [[ -r /etc/grc.zsh ]]; then - # ! Incompatible with P10K Transient source /etc/grc.zsh # I want the default behaviour for: diff --git a/bin/.tool-versions b/bin/.tool-versions index 410ae73..4a2e56f 100644 --- a/bin/.tool-versions +++ b/bin/.tool-versions @@ -1,2 +1,2 @@ -python 3.11.8 -direnv 2.33.0 +python 3.12.4 +direnv 2.34.0 diff --git a/bin/once-connected.zsh b/bin/once-connected.zsh index 277949a..e6959cc 100755 --- a/bin/once-connected.zsh +++ b/bin/once-connected.zsh @@ -12,6 +12,11 @@ alias xterm='xterm -bg black -fg white -fa Hack -fs 10' xterm -geometry 120x40 -title "Mount devices" -hold -e $HOME/bin/mount_dev.zsh +## Qubes Template +# +# sudo apt clean + + ## Start periodic actions #