Merge remote-tracking branch 'origin/develop' into feature/100-documentation

Author: jcchikikomori

arch/init.sh

@@ -4,6 +4,10 @@
 # Source: https://gist.github.com/bouroo/b750d3fa357362772082407cfa21fb4a
 # Fork: https://gist.github.com/jcchikikomori/0984ae8111496ea7544b6452adbbe180
 
+# Backup mirrorlist
+cp -f /etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist.backup
+# Install essential packages
+pacman -Syy --noconfirm --noprogressbar sudo gvim nano htop iftop mtr dkms lz4 bash-completion base-devel pacman-contrib git zsh unzip
 # Init pacman mirror
 curl -s -L "https://archlinux.org/mirrorlist/?country=CN&country=JP&country=SG&country=KR&protocol=https&ip_version=4&use_mirror_status=on" | sed -e 's/^#Server/Server/' -e '/^#/d' > /etc/pacman.d/mirrorlist
 # Init key
@@ -12,8 +16,5 @@ pacman-key --init
 pacman-key --populate archlinux
 # Sync repo
 pacman -Syyu --noconfirm --noprogressbar
-# Install essential packages
-pacman -S --noconfirm --noprogressbar sudo gvim nano htop iftop mtr dkms lz4 bash-completion base-devel pacman-contrib git zsh unzip
-# Sort repo by speed
-cp -f /etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist.backup
+# Sort repo by speed (pacman-contrib package required)
 rankmirrors -n 5 /etc/pacman.d/mirrorlist.backup > /etc/pacman.d/mirrorlist

arch/setup.sh

@@ -13,14 +13,14 @@ mkdir -p temp && cd temp/
 # Install yay
 git clone https://aur.archlinux.org/yay.git $HOME/yay
 cd $HOME/yay
-sudo makepkg -si --noconfirm
+makepkg -si --noconfirm
 cd ../..
 rm -rf temp/
 
 # Chaotic AUR
 if ! grep -q "\[chaotic-aur\]" /etc/pacman.conf; then
   echo 'Importing essential keys...'
-  sudo pacman-key --recv-key 3056513887B78AEB --keyserver keyserver.ubuntu.com
+  sudo pacman-key --recv-key 3056513887B78AEB --keyserver hkp://keyserver.ubuntu.com:80
   echo 'Signing keys...'
   sudo pacman-key --lsign-key 3056513887B78AEB
   echo 'Begin installing Chaotic AUR...'

linux/systems/.local/bin/org.jcchikikomori.dotfiles/bin/dotfiles-cleanup

@@ -38,12 +38,12 @@ echo 'Cleaning up VSCode...'
 rm -rf $HOME/.vscode
 rm -rf $HOME/.vscode-server
 
-echo 'Cleaning up scripts...'
-if [ -f "$HOME/.local/bin/org.jcchikikomori.dotfiles/bin/dotfiles-cleanup-bin" ]; then
-  sh $HOME/.local/bin/org.jcchikikomori.dotfiles/bin/dotfiles-cleanup-bin
-else
-  echo "Warning: $HOME/.local/bin/org.jcchikikomori.dotfiles/bin/dotfiles-cleanup-bin does not exist. Skipping script cleanup."
-fi
+# echo 'Cleaning up scripts...'
+# if [ -f "$HOME/.local/bin/org.jcchikikomori.dotfiles/bin/dotfiles-cleanup-bin" ]; then
+#   sh $HOME/.local/bin/org.jcchikikomori.dotfiles/bin/dotfiles-cleanup-bin
+# else
+#   echo "Warning: $HOME/.local/bin/org.jcchikikomori.dotfiles/bin/dotfiles-cleanup-bin does not exist. Skipping script cleanup."
+# fi
 
 echo 'Cleaning up other files...'
 rm -f $HOME/.gitconfig

linux/systems/.local/bin/org.jcchikikomori.dotfiles/bin/dotfiles-nodejs

@@ -4,4 +4,4 @@ curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | zsh
 
 export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")"
 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
-nvm install 18 --lts
+nvm install 22 --lts

linux/systems/.local/bin/org.jcchikikomori.dotfiles/bin/dotfiles-post-setup

@@ -94,6 +94,7 @@ main() {
     git clone -q --depth 1 https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm || true
 
     echo 'Setting up Starship prompt...'
+    mkdir -p ~/.local/bin
     curl -fsSL https://starship.rs/install.sh | sh -s -- -b ~/.local/bin -f
 
     echo 'Setting up Antigen...'
@@ -104,8 +105,9 @@ main() {
     mkdir -p ~/.config/alacritty/themes
     git clone https://github.com/alacritty/alacritty-theme ~/.config/alacritty/themes
 
-    echo 'Setting up Nerd Fonts...'
-    sh $WORKDIR/dotfiles-nerf --all
+    echo 'Setting up some Nerd Fonts...'
+    sh $WORKDIR/dotfiles-nerf JetBrainsMono FiraCode
+    sh $WORKDIR/dotfiles-nerf --smoke-test
 
     prompt_installation "python with pyenv" "dotfiles-python"
     prompt_installation "pre-commit" "dotfiles-python--pre-commit"

linux/systems/.local/bin/org.jcchikikomori.dotfiles/bin/dotfiles-ruby

@@ -183,7 +183,6 @@ install_action() {
   distro=$(read_distro)
   log "Detected distribution from cache: $distro"
   install_ruby_for "$distro"
-  log "Ruby installation complete."
 }
 
 update_action() {

linux/tmux/.tmux.conf.local

@@ -233,14 +233,14 @@ tmux_conf_theme_window_status_last_bg="$tmux_conf_theme_colour_2"
 tmux_conf_theme_window_status_last_attr="none"
 
 # status left/right sections separators
-#tmux_conf_theme_left_separator_main=""
-#tmux_conf_theme_left_separator_sub="|"
-#tmux_conf_theme_right_separator_main=""
-#tmux_conf_theme_right_separator_sub="|"
-tmux_conf_theme_left_separator_main='\uE0B0'  # /!\ you don't need to install Powerline
-tmux_conf_theme_left_separator_sub='\uE0B1'   #   you only need fonts patched with
-tmux_conf_theme_right_separator_main='\uE0B2' #   Powerline symbols or the standalone
-tmux_conf_theme_right_separator_sub='\uE0B3'  #   PowerlineSymbols.otf font, see README.md
+tmux_conf_theme_left_separator_main=""
+tmux_conf_theme_left_separator_sub="|"
+tmux_conf_theme_right_separator_main=""
+tmux_conf_theme_right_separator_sub="|"
+#tmux_conf_theme_left_separator_main='\uE0B0'  # /!\ you don't need to install Powerline
+#tmux_conf_theme_left_separator_sub='\uE0B1'   #   you only need fonts patched with
+#tmux_conf_theme_right_separator_main='\uE0B2' #   Powerline symbols or the standalone
+#tmux_conf_theme_right_separator_sub='\uE0B3'  #   PowerlineSymbols.otf font, see README.md
 
 # status left/right content:
 #   - separate main sections with "|"
@@ -384,10 +384,10 @@ tmux_conf_urlscan_options="--compact --dedupe"
 # this is the place to override or undo settings
 
 # increase history size
-#set -g history-limit 10000
+set -g history-limit 10000
 
 # start with mouse mode enabled
-#set -g mouse on
+set -g mouse on
 
 # force Vi mode
 #   really you should export VISUAL or EDITOR environment variable, see manual

linux/zsh/.zshrc

@@ -71,7 +71,7 @@ COMPLETION_WAITING_DOTS="true"
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
 # Note: Ensure to execute ~/.dotfiles/git-flow.sh before using other plugins
-plugins=(git git-flow-completion zsh-autosuggestions fast-syntax-highlighting)
+plugins=(brew git globalias gradle grails git-flow-completion zsh-autosuggestions fast-syntax-highlighting)
 
 
 # User configuration