Cleanup

dotfiles/aliases

@@ -1,9 +1,6 @@
 # General aliases, should only be sourced in interactive shells
 # Try to keep in sync with ~/.config/fish/conf.d/aliases.fish
 
-# Cryptsetup alias
-alias luksFormat='cryptsetup luksFormat --type=luks2 --pbkdf-memory=2560000 --pbkdf=argon2id -i 15000 -s 512 -h sha256 -c aes-xts-plain64'
-
 # Timestamp in a machine-sortable form
 alias tstamp="date '+%Y%m%d-%H%M%S'"
 
@@ -13,12 +10,6 @@ alias mdcode="sed 's/^/    /'"
 # Intel format plz
 alias objdump="command objdump -M intel"
 
-# Drop caches for swap issues
-alias drop_caches="echo 3 | sudo /usr/bin/tee /proc/sys/vm/drop_caches"
-
-# dump acpi temperature
-alias gettemp='printf "%02.2f\n" "$(cat /sys/class/thermal/thermal_zone0/temp)e-3"'
-
 # get git working directory
 alias gitroot="git rev-parse --show-toplevel"
 
@@ -31,20 +22,37 @@ alias ipy="ipython3 --no-banner"
 # Skip the header on bc
 alias bc="command bc -q"
 
-# Get a decently readable df
-alias dfh="df -h -x tmpfs -x devtmpfs -x squashfs -x fuse -x efivarfs"
-
 # Clear the GPG agent
 alias clear-gpg-agent="echo RELOADAGENT | gpg-connect-agent"
 
-# Battery details
-alias bat-details='upower -i $(upower -e | grep battery)'
-
-# Nvidia refresh rate
-alias nvidia-refresh-rate='nvidia-settings --display=:0 -q RefreshRate -t'
-
 # Earthly ssh
 alias earthly='earthly --ssh-auth-sock ""'
 
-# to clipboard
-alias toclip='xclip -selection clipboard'
+if [ "$(uname)" = "Linux" ]; then
+  # Cryptsetup alias
+  alias luksFormat='cryptsetup luksFormat --type=luks2 --pbkdf-memory=2560000 --pbkdf=argon2id -i 15000 -s 512 -h sha256 -c aes-xts-plain64'
+
+  # Drop caches for swap issues
+  alias drop_caches="echo 3 | sudo /usr/bin/tee /proc/sys/vm/drop_caches"
+
+  # dump acpi temperature
+  alias gettemp='printf "%02.2f\n" "$(cat /sys/class/thermal/thermal_zone0/temp)e-3"'
+
+  # Get a decently readable df
+  alias dfh="df -h -x tmpfs -x devtmpfs -x squashfs -x fuse -x efivarfs"
+
+  # Battery details
+  alias bat-details='upower -i $(upower -e | grep battery)'
+
+  # Nvidia refresh rate
+  alias nvidia-refresh-rate='nvidia-settings --display=:0 -q RefreshRate -t'
+
+  # to clipboard
+  alias toclip='xclip -selection clipboard'
+elif [ "$(uname)" = "Darwin" ]; then
+  # Get a decently readable df
+  alias dfh="df -h"
+
+  # to clipboard
+  alias toclip='pbcopy'
+fi

dotfiles/config/fish/conf.d/aliases.fish

@@ -1,6 +1,3 @@
-# Cryptsetup alias
-alias luksFormat 'cryptsetup luksFormat --type=luks2 --pbkdf-memory=2560000 --pbkdf=argon2id -i 15000 -s 512 -h sha256 -c aes-xts-plain64'
-
 # Timestamp in a machine-sortable form
 alias tstamp "date '+%Y%m%d-%H%M%S'"
 
@@ -10,12 +7,6 @@ alias mdcode "sed 's/^/    /'"
 # Intel format plz
 alias objdump "command objdump -M intel"
 
-# Drop caches for swap issues
-alias drop_caches "echo 3 | sudo /usr/bin/tee /proc/sys/vm/drop_caches"
-
-# dump acpi temperature
-alias gettemp 'printf "%02.2f\n" (cat /sys/class/thermal/thermal_zone0/temp)e-3'
-
 # get git working directory
 alias gitroot "git rev-parse --show-toplevel"
 
@@ -28,23 +19,40 @@ alias ipy "ipython3 --no-banner"
 # Skip the header on bc
 alias bc "command bc -q"
 
-# Get a decently readable df
-alias dfh "df -h -x tmpfs -x devtmpfs -x squashfs -x fuse -x efivarfs"
-
 # Clear the GPG agent
 alias clear-gpg-agent "echo RELOADAGENT | gpg-connect-agent"
 
-# Battery details
-alias bat-details 'upower -i (upower -e | grep battery)'
-
-# Nvidia refresh rate
-alias nvidia-refresh-rate 'nvidia-settings --display=:0 -q RefreshRate -t'
-
 # Earthly ssh
 alias earthly 'earthly --ssh-auth-sock ""'
 
-# to clipboard
-alias toclip 'xclip -selection clipboard'
+if test (uname) = "Linux"
+  # Cryptsetup alias
+  alias luksFormat 'cryptsetup luksFormat --type=luks2 --pbkdf-memory=2560000 --pbkdf=argon2id -i 15000 -s 512 -h sha256 -c aes-xts-plain64'
+
+  # Drop caches for swap issues
+  alias drop_caches "echo 3 | sudo /usr/bin/tee /proc/sys/vm/drop_caches"
+
+  # dump acpi temperature
+  alias gettemp 'printf "%02.2f\n" (cat /sys/class/thermal/thermal_zone0/temp)e-3'
+
+  # Get a decently readable df
+  alias dfh "df -h -x tmpfs -x devtmpfs -x squashfs -x fuse -x efivarfs"
+
+  # Battery details
+  alias bat-details 'upower -i (upower -e | grep battery)'
+
+  # Nvidia refresh rate
+  alias nvidia-refresh-rate 'nvidia-settings --display=:0 -q RefreshRate -t'
+
+  # to clipboard
+  alias toclip 'xclip -selection clipboard'
+else if test (uname) = "Darwin"
+  # Get a decently readable df
+  alias dfh "df -h"
+
+  # to clipboard
+  alias toclip 'pbcopy'
+end
 
 # On some systems, bat is batcat
 if not command -v bat >/dev/null 2>&1

dotfiles/config/fish/config.fish

@@ -34,4 +34,6 @@ end
 fish_add_path --move --path {$HOME}/bin
 if test (uname) = "Darwin"
     fish_add_path --move --path {$HOME}/bin/macos
+else if test (uname) = "Linux"
+    fish_add_path --move --path {$HOME}/bin/linux
 end

dotfiles/shenv

@@ -194,6 +194,8 @@ if [ "$(uname)" = "Darwin" ] ; then
   export XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-$TMPDIR/runtime-$(id -u)}"
   export XDG_STATE_HOME="${XDG_STATE_HOME:-$HOME/.local/state}"
   export PATH="${HOME}/bin/macos:${PATH}"
+elif [ "$(uname)" = "Linux" ] ; then
+  export PATH="${HOME}/bin/linux:${PATH}"
 fi
 
 if test -e "$HOME/.localenv"; then

dotfiles/tmux.conf

@@ -45,7 +45,7 @@ set -g window-status-current-style fg=colour235,bg=colour33,bold
 set -g status-interval 60
 set -g status-left-length 30
 set -g status-left '/#h: #S/ '
-set -g status-right '#{?pane_title,/#{pane_title}/ ,}#(cut -d " " -f 1-3 /proc/loadavg)#[default] #[fg=colour166]%H:%M#[default]'
+set -g status-right '#{?pane_title,/#{pane_title}/ ,}#(uptime | rev | cut -d":" -f1 | rev | sed s/,//g)#[default] #[fg=colour166]%H:%M#[default]'
 
 # Advanced mouse mode from http://tangledhelix.com/blog/2012/07/16/tmux-and-mouse-mode/
 # Toggle mouse on
@@ -65,8 +65,9 @@ bind M \
     display 'Mouse: OFF'
 
 # tmux X clipboard integration
-bind C-c run "tmux show-buffer | xsel -i -b"
-bind C-v run "tmux set-buffer -- \"$(xsel -o -b)\"; tmux paste-buffer"
+if-shell 'test "$(uname)" = "Darwin"' \
+  'bind C-c run "tmux show-buffer | pbcopy"; bind C-v run "tmux set-buffer -- \"$(pbpaste)\"; tmux paste-buffer"' \
+  'bind C-c run "tmux show-buffer | xsel -i -b"; bind C-v run "tmux set-buffer -- \"$(xsel -o -b)\"; tmux paste-buffer"'
 
 # List of plugins
 set -g @plugin 'tmux-plugins/tpm'

dotfiles/zshrc

@@ -289,6 +289,8 @@ fi
 PATH="${HOME}/bin:${PATH}"
 if [[ "$(uname)" == "Darwin" ]]; then
   PATH="${HOME}/bin/macos:${PATH}"
+elif [[ "$(uname)" == "Linux" ]]; then
+  PATH="${HOME}/bin/linux:${PATH}"
 fi
 
 # Load any local settings

dotfiles/zshrc.d/alert.zsh

@@ -18,8 +18,15 @@ alert() {
     icon="error"
   fi
   
-  # Send the notification with the executed command
-  notify-send --urgency=low -i "$icon" "Finished: '$@'"
+  if [ "$(uname)" = "Darwin" ]; then
+    # macOS notification
+    local title="Finished: '$*'"
+    local msg="Exit code: $ret"
+    osascript -e "display notification \"$msg\" with title \"$title\""
+  else
+    # Send the notification with the executed command
+    notify-send --urgency=low -i "$icon" "Finished: '$@'"
+  fi
   
   # Return the original exit code
   return $ret

dotfiles/zshrc.d/android.zsh

@@ -1,7 +1,12 @@
-ANDROID_HOME=$HOME/Library/Android/sdk
+if [ "$(uname)" = "Darwin" ]; then
+  ANDROID_HOME=$HOME/Library/Android/sdk
+else
+  ANDROID_HOME=$HOME/Android/Sdk
+fi
 
-if test -d $ANDROID_HOME ; then
-  PATH=$PATH:$ANDROID_HOME/emulator:$ANDROID_HOME/platform-tools
+if test -d "${ANDROID_HOME}" ; then
+  export ANDROID_HOME
+  PATH="${PATH}:${ANDROID_HOME}/emulator:${ANDROID_HOME}/platform-tools"
 else
   unset ANDROID_HOME
 fi

dotfiles/zshrc.d/assemble.zsh

@@ -6,7 +6,11 @@ if have_command nasm && have_command objdump ; then
     local TMPF=`mktemp`
     local bytes
     local byte
-    $NASM -f elf -o $TMPF $1
+    local format="elf"
+    if [[ "$OSTYPE" == darwin* ]]; then
+      format="macho64"
+    fi
+    $NASM -f $format -o $TMPF $1
     $OBJDUMP -M intel -d $TMPF | grep '^ ' | cut -f2 | while read -A bytes ; do
       for byte in $bytes ; do
         echo -n "\\\\x$byte"

dotfiles/zshrc.d/functions.zsh

@@ -1,5 +1,11 @@
 function dumpenv {
-  tr '\0' '\n' < /proc/${1}/environ
+  if [ "$(uname)" = "Linux" ]; then
+    tr '\0' '\n' < /proc/${1}/environ
+  elif [ "$(uname)" = "Darwin" ]; then
+    # macOS doesn't have /proc, use ps instead. 
+    # Note: this may truncate if environment is very large.
+    ps -p ${1} -wwwe -o command= | tr ' ' '\n' | grep '='
+  fi
 }
 
 if test -x "/sbin/starship" ; then

dotfiles/zshrc.d/lesshighlight.zsh

@@ -1,8 +1,20 @@
-test -f /usr/share/source-highlight/src-hilite-lesspipe.sh && \
+# Find src-hilite-lesspipe.sh
+_SRCHILITE=""
+for _p in /usr/share/source-highlight/src-hilite-lesspipe.sh /opt/homebrew/bin/src-hilite-lesspipe.sh /usr/local/bin/src-hilite-lesspipe.sh ; do
+  if [ -f "$_p" ] ; then
+    _SRCHILITE="$_p"
+    break
+  fi
+done
+
+if [ -n "$_SRCHILITE" ] ; then
   function srcless {
     if [ $# -ne 1 ] ; then
-      echo "$0 <what>" > /dev/stderr
+      echo "Usage: srcless <file>" > /dev/stderr
       return 1
     fi
-    /usr/share/source-highlight/src-hilite-lesspipe.sh $1 | less -R
+    "$_SRCHILITE" "$1" | less -R
   }
+fi
+
+unset _SRCHILITE _p