Upgrade .zshrc

.zshrc

@@ -1,11 +1,11 @@
 # If you come from bash you might have to change your $PATH.
-# export PATH=$HOME/bin:/usr/local/bin:$PATH
+# export PATH=$HOME/bin:$HOME/.local/bin:/usr/local/bin:$PATH
 
-# Path to your oh-my-zsh installation.
+# Path to your Oh My Zsh installation.
 export ZSH="$HOME/.oh-my-zsh"
 
 # Set name of the theme to load --- if set to "random", it will
-# load a random theme each time oh-my-zsh is loaded, in which case,
+# load a random theme each time Oh My Zsh is loaded, in which case,
 # to know which specific one was loaded, run: echo $RANDOM_THEME
 # See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes
 ZSH_THEME="oke"
@@ -85,21 +85,24 @@ source $ZSH/oh-my-zsh.sh
 # if [[ -n $SSH_CONNECTION ]]; then
 #   export EDITOR='vim'
 # else
-#   export EDITOR='mvim'
+#   export EDITOR='nvim'
 # fi
 
 # Compilation flags
-# export ARCHFLAGS="-arch x86_64"
+# export ARCHFLAGS="-arch $(uname -m)"
 
-# Set personal aliases, overriding those provided by oh-my-zsh libs,
-# plugins, and themes. Aliases can be placed here, though oh-my-zsh
-# users are encouraged to define aliases within the ZSH_CUSTOM folder.
+# Set personal aliases, overriding those provided by Oh My Zsh libs,
+# plugins, and themes. Aliases can be placed here, though Oh My Zsh
+# users are encouraged to define aliases within a top-level file in
+# the $ZSH_CUSTOM folder, with .zsh extension. Examples:
+# - $ZSH_CUSTOM/aliases.zsh
+# - $ZSH_CUSTOM/macos.zsh
 # For a full list of active aliases, run `alias`.
 #
 # Example aliases
 # alias zshconfig="mate ~/.zshrc"
 # alias ohmyzsh="mate ~/.oh-my-zsh"
-#
+
 if [[ -z $DISPLAY ]] && [[ $(tty) = /dev/tty1 ]]; then exec startx; fi
 
 PATH="$HOME/.dotfiles/scripts:${PATH}"

common.sh

@@ -5,6 +5,7 @@ CORE=0
 DEV=0
 EXTRA=0
 WORKSTATION=0
+SYSTEM=0
 
 
 if [[ -n "$DISPLAY" ]] && command -v meld &> /dev/null;
@@ -43,6 +44,9 @@ while true; do
     -w | --workstation)
         WORKSTATION=1
         ;;
+    -s | --system)
+        SYSTEM=1
+        ;;
     --)
         shift
         break
@@ -56,4 +60,5 @@ if [ "${ALL}" -eq 1 ]; then
     WORKSTATION=1
     EXTRA=1
     DEV=1
+    SYSTEM=1
 fi

install_dotfiles.sh

@@ -134,17 +134,22 @@ if [ "${WORKSTATION}" -eq 1 ]; then
     install .xinitrc
     install .config/i3/config
     install .config/i3status-rust/config.toml
+fi
+
+if [ "${SYSTEM}" -eq 1 ] && [ "${WORKSTATION}" -eq 1 ]; then
     install -r etc/modprobe.d/nobeep.conf
     install -r etc/systemd/logind.conf
     install -r etc/acpi/handler.sh
     install -r etc/acpi/toggle_mute.sh
     install -r etc/acpi/volume.sh
-    install -r usr/share/X11/xorg.conf.d/40-libinput.conf
+    install -r usr/share/X11/xorg.conf.d/40-libinput.confxml
+    install -r etc/udev/rules.d/backlight.rules
+fi
 
+if [ "${EXTRA}" -eq 1 ] && [ "${WORKSTATION}" -eq 1 ]; then
     install .config/darktable/darktablerc
     install -r usr/share/darktable/noiseprofiles.json
-    install -r usr/share/lensfun/version_1/compact-sony.xml
-    install -r etc/udev/rules.d/backlight.rules
+    install -r usr/share/lensfun/version_1/compact-sony.
 fi
 
 if [ "${DEV}" -eq 1 ] && [ "${WORKSTATION}" -eq 1 ]; then

install_packages_arch.sh

@@ -40,18 +40,18 @@ declare -ar pkgs_system_workstation=(
 )
 
 declare -ar pkgs_tools_dev=(
-    llvm
     man-db
     man-pages
-    perf
-    ninja
 )
 
 declare -ar pkgs_tools_dev_extra=(
     cargo
     go
+    llvm
+    ninja
     nodejs
     npm
+    perf
     rust
 )
 
@@ -77,11 +77,8 @@ declare -ar pkgs_i3_environment=(
 declare -ar pkgs_apps_core=(
     chromium
     firefox
-    nextcloud-client
     pavucontrol
-    protonmail-bridge-bin
     thunar gvfs gvfs-mtp thunar-archive-plugin thunar-media-tags-plugin tumbler ffmpegthumbnailer
-    thunderbird
 )
 
 declare -ar pkgs_apps_dev=(
@@ -96,7 +93,10 @@ declare -ar pkgs_apps_extra=(
     gimp
     gnucash
     keepassxc
+    nextcloud-client
+    protonmail-bridge-bin
     spotify
+    thunderbird
     vlc
 )