Fix up support for ubuntu + arch

Author: webpro

.github/workflows/dotfiles-installation.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-13, macos-14, macos-15]
+        os: [macos-14, macos-15, ubuntu-latest]
 
     steps:
       - name: Clean up installed software

Makefile

@@ -1,5 +1,5 @@
 DOTFILES_DIR := $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
-OS := $(shell bin/is-supported bin/is-macos macos bin/is-ubuntu ubuntu bin/is-arch arch linux)
+OS := $(shell bin/is-supported bin/is-macos macos $(shell bin/is-supported bin/is-ubuntu ubuntu $(shell bin/is-supported bin/is-arch arch linux)))
 HOMEBREW_PREFIX := $(shell bin/is-supported bin/is-arm64 /opt/homebrew /usr/local)
 export N_PREFIX = $(HOME)/.n
 PATH := $(HOMEBREW_PREFIX)/bin:$(DOTFILES_DIR)/bin:$(N_PREFIX)/bin:$(PATH)
@@ -14,27 +14,24 @@ export ACCEPT_EULA=Y
 
 all: $(OS)
 
-macos: sudo core-macos packages link duti bun
+macos: sudo core-macos packages-macos link duti bun
 
-linux: ubuntu
+ubuntu: core-ubuntu link
 
-ubuntu: core-ubuntu link bun
-
-arch: core-arch link bun
+arch: core-arch packages-arch link
 
 core-macos: brew bash git npm
 
 core-ubuntu:
-	sudo apt-get update
-	sudo apt-get upgrade -y
-	sudo apt-get dist-upgrade -f
+	apt-get update
+	apt-get upgrade -y
+	apt-get dist-upgrade -f
 
 stow-ubuntu: core-ubuntu
-	is-executable stow || sudo apt-get -y install stow
+	is-executable stow || apt-get -y install stow
 
 core-arch:
-	sudo pacman -Syu --noconfirm
-	sudo pacman -S --noconfirm git base-devel
+	pacman -Syu --noconfirm
 
 stow-arch: core-arch
 	is-executable stow || pacman -S --noconfirm stow
@@ -48,8 +45,6 @@ ifndef GITHUB_ACTION
 	while true; do sudo -n true; sleep 60; kill -0 "$$" || exit; done 2>/dev/null &
 endif
 
-packages: brew-packages cask-apps node-packages rust-packages
-
 link: stow-$(OS)
 	for FILE in $$(\ls -A runcom); do if [ -f $(HOME)/$$FILE -a ! -h $(HOME)/$$FILE ]; then \
 		mv -v $(HOME)/$$FILE{,.bak}; fi; done
@@ -66,7 +61,7 @@ unlink: stow-$(OS)
 		mv -v $(HOME)/$$FILE.bak $(HOME)/$${FILE%%.bak}; fi; done
 
 brew:
-	is-executable brew || curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh | bash
+	is-executable brew || curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh | bash
 
 bash: brew
 ifdef GITHUB_ACTION
@@ -89,6 +84,13 @@ git: brew
 npm: brew-packages
 	n install lts
 
+packages-macos: brew-packages cask-apps node-packages rust-packages
+
+packages-arch: pacman-packages
+
+pacman-packages:
+	pacman -S --noconfirm - < $(DOTFILES_DIR)/install/pacmanfile
+
 brew-packages: brew
 	brew bundle --file=$(DOTFILES_DIR)/install/Brewfile || true
 

README.md

@@ -2,7 +2,7 @@
 
 These are my dotfiles. Take anything you want, but at your own risk.
 
-It mainly targets macOS systems (should install on e.g. Ubuntu as well for many tools, config and aliases etc).
+Mainly targets macOS systems, but works on Ubuntu and Arch Linux as well.
 
 ## Highlights
 
@@ -22,7 +22,7 @@ It mainly targets macOS systems (should install on e.g. Ubuntu as well for many
 - [homebrew-cask](https://github.com/Homebrew/homebrew-cask) (packages: [Caskfile](./install/Caskfile))
 - [Node.js + npm LTS](https://nodejs.org/en/download/) (packages: [npmfile](./install/npmfile))
 - Latest Git, Bash, Python, GNU coreutils, curl, Ruby
-- `$EDITOR` is [GNU nano](https://www.nano-editor.org) (`$VISUAL` is `code` and Git `core.editor` is `code --wait`)
+- Editors: VS Code and nano (`EDITOR`, `VISUAL` and Git `core.editor`)
 
 ## Installation
 

bin/git-editor

@@ -0,0 +1,6 @@
+#!/bin/sh
+if command -v code >/dev/null 2>&1; then
+    exec code --wait "$@"
+else
+    exec "$EDITOR" "$@"
+fi

config/git/config

@@ -7,7 +7,7 @@
 
 [core]
 	excludesfile = ~/.config/git/ignore
-	editor = code --wait
+	editor = git-editor
 	filemode = false
 	trustctime = false
 	autocrlf = input

install/pacmanfile

@@ -0,0 +1,8 @@
+base-devel
+bash-completion
+fd
+fzf
+git
+git-delta
+nano
+zoxide

runcom/.bash_profile

@@ -10,6 +10,8 @@ if [[ -n $CURRENT_SCRIPT && -x readlink ]]; then
   DOTFILES_DIR="${PWD}/$(dirname $(dirname $SCRIPT_PATH))"
 elif [ -d "$HOME/.dotfiles" ]; then
   DOTFILES_DIR="$HOME/.dotfiles"
+elif [ -d "$HOME/dotfiles" ]; then
+  DOTFILES_DIR="$HOME/dotfiles"
 else
   echo "Unable to find dotfiles, exiting."
   return
@@ -21,15 +23,16 @@ PATH="$DOTFILES_DIR/bin:$PATH"
 
 # Source the dotfiles (order matters)
 
+for DOTFILE in "$DOTFILES_DIR"/system/.{function,function_*,n,path,env,exports,alias,fzf,grep,prompt,completion,fix,pnpm,zoxide}; do
+  . "$DOTFILE"
+done
+
 if is-macos; then
-  for DOTFILE in "$DOTFILES_DIR"/system/.{env,alias,function,path}.macos; do
+  for DOTFILE in "$DOTFILES_DIR"/system/.{env,alias,function}.macos; do
     . "$DOTFILE"
   done
 fi
 
-for DOTFILE in "$DOTFILES_DIR"/system/.{function,function_*,n,env,exports,alias,fzf,grep,prompt,completion,fix,pnpm,zoxide}; do
-  . "$DOTFILE"
-done
 
 # Set LSCOLORS
 
@@ -38,4 +41,5 @@ eval "$(dircolors -b "$DOTFILES_DIR"/system/.dir_colors)"
 # Wrap up
 
 unset CURRENT_SCRIPT SCRIPT_PATH DOTFILE
+
 export DOTFILES_DIR

system/.completion

@@ -1,9 +1,13 @@
-BREW_PREFIX=$(brew --prefix)
+if [ -z "$HOMEBREW_PREFIX" ] && is-executable brew; then
+  HOMEBREW_PREFIX=$(brew --prefix)
+fi
 
 # Bash
 
-if is-executable brew; then
-  . "$BREW_PREFIX/share/bash-completion/bash_completion"
+if [ -f "/usr/share/bash-completion/bash_completion" ]; then
+  . "/usr/share/bash-completion/bash_completion"
+elif [ -n "$HOMEBREW_PREFIX" ] && [ -f "$HOMEBREW_PREFIX/share/bash-completion/bash_completion" ]; then
+  . "$HOMEBREW_PREFIX/share/bash-completion/bash_completion"
 fi
 
 # dot
@@ -17,8 +21,12 @@ complete -o default -F _dotfiles_completions dot
 
 # tmux
 
-if is-executable brew; then
-  . "$BREW_PREFIX/etc/bash_completion.d/tmux"
+if is-executable tmux; then
+  if [ -f "/usr/share/bash-completion/completions/tmux" ]; then
+    . "/usr/share/bash-completion/completions/tmux"
+  elif [ -n "$HOMEBREW_PREFIX" ] && [ -f "$HOMEBREW_PREFIX/etc/bash_completion.d/tmux" ]; then
+    . "$HOMEBREW_PREFIX/etc/bash_completion.d/tmux"
+  fi
 fi
 
 # npm (https://docs.npmjs.com/cli/completion)
@@ -30,7 +38,11 @@ fi
 # Git
 
 if is-executable git; then
-  . "$BREW_PREFIX/etc/bash_completion.d/git-completion.bash"
+  if [ -f "/usr/share/git/completion/git-completion.bash" ]; then
+    . "/usr/share/git/completion/git-completion.bash"
+  elif [ -n "$HOMEBREW_PREFIX" ] && [ -f "$HOMEBREW_PREFIX/etc/bash_completion.d/git-completion.bash" ]; then
+    . "$HOMEBREW_PREFIX/etc/bash_completion.d/git-completion.bash"
+  fi
 fi
 
 # pnpm (https://pnpm.io/completion)

system/.env

@@ -1,5 +1,5 @@
-export EDITOR="code"
-export VISUAL="code"
+export EDITOR="nano"
+export VISUAL="nano"
 
 # XDG Base Directory Specification (https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html)
 
@@ -23,7 +23,7 @@ export CLICOLOR=1
 # Prefer US English and use UTF-8
 
 export LC_ALL="en_US.UTF-8"
-export LANG="en_US"
+export LANG="en_US.UTF-8"
 
 # Highlight section titles in man pages
 

system/.env.macos

@@ -1,3 +1,5 @@
+export EDITOR="code"
+export VISUAL="code"
 export VISUAL_GIT="fork"
 
 # Some app locations