From: Ian Kelling Date: Tue, 24 Feb 2026 11:44:16 +0000 (-0500) Subject: minor improvements X-Git-Url: https://iankelling.org/git/?a=commitdiff_plain;h=851a7bee300860b022af585bcd5f6e1833855a94;p=distro-setup minor improvements --- diff --git a/.bashrc b/.bashrc index f94a429..f5cb050 100644 --- a/.bashrc +++ b/.bashrc @@ -80,7 +80,7 @@ _ran_bashrc=t # i use it when for example, io on the remote host is really slow and my # bashrc is too slow. 3 SECONDS because if the shell is around longer # than that, I'm probably sourcing the file manually, not as part of -# shell startup. +# shell startup._ if [[ ( $SECONDS && $SECONDS -lt 3 ) && $LC_USEBASHRC != t && ( $SSH_CONNECTION || $TERM == linux ) ]]; then # Here we did not opt-in to running our .bashrc file so we just # return, but we still setup a function to source it without returning diff --git a/brc b/brc index c62b940..b47e4b8 100644 --- a/brc +++ b/brc @@ -927,6 +927,8 @@ sl-local-test() { e sync elif [[ $remote == *.b8.nz ]]; then e skip + elif [[ $remote != *.* ]] && host $remote | grep -qP '^ *\w+.b8.nz has addr'; then + e skip fi } export SL_LOCAL_TEST_CMD=sl-local-test diff --git a/distro-begin b/distro-begin index 639d5bb..c8ed590 100755 --- a/distro-begin +++ b/distro-begin @@ -555,8 +555,10 @@ sudo /a/exe/lnf -T /nocow/t /t # fi ###### end setup /i -##### setup /nocow. -# a nocow dir that is common to multiple distros installed on the same system +##### setup /nocow. ##### +## +# A nocow dir that is common to multiple distros installed on the same system. There is duplicate logic for nocow in /b/fai/fai/config/hooks/partition.DEFAULT +# dir=/nocow if has_btrfs; then if ! mountpoint $dir; then diff --git a/i3-sway/common.conf b/i3-sway/common.conf index 310c8d2..5fb5e23 100644 --- a/i3-sway/common.conf +++ b/i3-sway/common.conf @@ -59,7 +59,7 @@ bindsym $mod+shift+w fullscreen toggle bindsym $mod+e $ex "i3-emacs" # unused -bindsym $mod+shift+e $ex "sudo i3-misc1" +bindsym $mod+shift+e $ex "sudo /usr/local/bin/i3-misc1" bindsym $mod+r $ex "/a/bin/ds/xl" bindsym $mod+backslash $ex "scrot"