Housekeeping

- Update README
- Run shellcheck on .sh files
- Add helper scripts
- Remove eirene vm variant
- Add post-install checklist

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>

hosts/common/system/configs/impermanence/scripts/start.sh

@@ -1,19 +1,19 @@
-echo "Starting impermanence mount with source: $source, target: $target, path: $path."
+echo "Starting impermanence mount with source: ${source}, target: ${target}, path: ${path}."
 
-source_current="$source"
-target_current="$target"
+source_current="${source}"
+target_current="${target}"
 
-IFS='/' read -ra path_parts <<< "$path"
+IFS='/' read -ra path_parts <<< "${path}"
 unset "path_parts[-1]"
 
 for part in "${path_parts[@]}"; do
-  source_current="$source_current/$part"
-  target_current="$target_current/$part"
+  source_current="${source_current}/${part}"
+  target_current="${target_current}/${part}"
 
-  if [ ! -d "$source_current" ]; then
+  if [[ ! -d "${source_current}" ]]; then
     break
   fi
 
-  read -r mode owner group <<< "$(stat -c '%a %u %g' "$source_current")"
-  install -d -m "$mode" -o "$owner" -g "$group" "$target_current"
+  read -r mode owner group <<< "$(stat -c '%a %u %g' "${source_current}")"
+  install -d -m "${mode}" -o "${owner}" -g "${group}" "${target_current}"
 done

hosts/common/system/configs/impermanence/scripts/stop.sh

@@ -1,38 +1,38 @@
-echo "Stopping impermanence mount with source: $source, target: $target, path: $path."
+echo "Stopping impermanence mount with source: ${source}, target: ${target}, path: ${path}."
 
-source_current="$source"
-target_current="$target"
+source_current="${source}"
+target_current="${target}"
 
-IFS='/' read -ra path_parts <<< "$path"
+IFS='/' read -ra path_parts <<< "${path}"
 unset "path_parts[-1]"
 
 for part in "${path_parts[@]}"; do
-  source_current="$source_current/$part"
-  target_current="$target_current/$part"
+  source_current="${source_current}/${part}"
+  target_current="${target_current}/${part}"
 
-  if [ ! -d "$target_current" ]; then
+  if [[ ! -d "${target_current}" ]]; then
     break
   fi
 
-  if [ -d "$source_current" ]; then
+  if [[ -d "${source_current}" ]]; then
     continue
   fi
 
-  read -r mode owner group <<< "$(stat -c '%a %u %g' "$target_current")"
-  install -d -m "$mode" -o "$owner" -g "$group" "$source_current"
+  read -r mode owner group <<< "$(stat -c '%a %u %g' "${target_current}")"
+  install -d -m "${mode}" -o "${owner}" -g "${group}" "${source_current}"
 done
 
-source=$(realpath -m "$source/$path")
-target=$(realpath -m "$target/$path")
+source=$(realpath -m "${source}/${path}")
+target=$(realpath -m "${target}/${path}")
 
-if [ ! -e "$target" ] || { [ -d "$target" ] && [ -z "$(ls -A "$target")" ]; } || { [ -f "$target" ] && [ ! -s "$target" ]; }; then
+if [[ ! -e "${target}" ]] || { [[ -d "${target}" ]] && [[ -z "$(ls -A "${target}")" ]]; } || { [[ -f "${target}" ]] && [[ ! -s "${target}" ]]; }; then
   exit 0
 fi
 
-if [ -e "$source" ]; then
-  >&2 echo "Error: Source $source already exists. Cannot move $target to $source."
+if [[ -e "${source}" ]]; then
+  >&2 echo "Error: Source ${source} already exists. Cannot move ${target} to ${source}."
   exit 1
 fi
 
-echo "Moving target $target to source $source."
-mv "$target" "$source"
+echo "Moving target ${target} to source ${source}."
+mv "${target}" "${source}"

hosts/common/system/configs/impermanence/scripts/wipe.sh

@@ -1,7 +1,7 @@
 delete_subvolume_recursively() {
   IFS=$'\n'
   for i in $(btrfs subvolume list -o "$1" | cut -f 9- -d ' '); do
-    delete_subvolume_recursively "/mnt/btrfs/$i"
+    delete_subvolume_recursively "/mnt/btrfs/${i}"
   done
   btrfs subvolume delete "$1"
 }
@@ -12,11 +12,11 @@ mount /dev/mapper/luks /mnt/btrfs
 if [[ -e /mnt/btrfs/@ ]]; then
   mkdir -p /mnt/btrfs/@.bak
   timestamp=$(date --date="@$(stat -c %Y /mnt/btrfs/@)" "+%Y-%m-%d_%H:%M:%S")
-  mv /mnt/btrfs/@ "/mnt/btrfs/@.bak/$timestamp"
+  mv /mnt/btrfs/@ "/mnt/btrfs/@.bak/${timestamp}"
 fi
 
 find /mnt/btrfs/@.bak/ -maxdepth 1 -mtime +14 | while IFS= read -r i; do
-  delete_subvolume_recursively "$i"
+  delete_subvolume_recursively "${i}"
 done
 
 btrfs subvolume create /mnt/btrfs/@

hosts/common/system/configs/timezone/timezone.sh

@@ -1,7 +1,7 @@
 case "$2" in
   connectivity-change)
     if timezone=$(curl --fail https://ipapi.co/timezone); then
-      timedatectl set-timezone "$timezone"
+      timedatectl set-timezone "${timezone}"
     fi
     ;;
 esac

hosts/common/system/scripts/cleanup/cleanup.sh

@@ -1,4 +1,4 @@
-if [ "$(id -u)" -ne 0 ]; then
+if [[ "$(id -u)" -ne 0 ]]; then
   echo "This script must be run as root or with sudo privileges."
   exit 1
 fi
@@ -6,12 +6,12 @@ fi
 delete_subvolume_recursively() {
   IFS=$'\n'
   for i in $(btrfs subvolume list -o "$1" | cut -f 9- -d ' '); do
-    delete_subvolume_recursively "/mnt/btrfs/$i"
+    delete_subvolume_recursively "/mnt/btrfs/${i}"
   done
   btrfs subvolume delete "$1"
 }
 
-if [[ -e /mnt/btrfs && $(mountpoint -q /mnt/btrfs) ]]; then
+if [[ -e /mnt/btrfs && -n $(mountpoint -q /mnt/btrfs) ]]; then
   echo "/mnt/btrfs is already mounted. Exiting."
   exit 1
 fi
@@ -20,9 +20,9 @@ mkdir -p /mnt/btrfs
 mount /dev/mapper/luks /mnt/btrfs
 
 if [[ -e /mnt/btrfs/@.bak ]]; then
-  if [ "$(ls -A /mnt/btrfs/@.bak)" ]; then
+  if [[ -n "$(ls -A /mnt/btrfs/@.bak)" ]]; then
     for i in /mnt/btrfs/@.bak/*; do
-      delete_subvolume_recursively "$i"
+      delete_subvolume_recursively "${i}"
     done
   else
     echo "/mnt/btrfs/@.bak is empty. Nothing to delete."

hosts/common/user/configs/console/gpg-agent/import-gpg-keys.sh

@@ -1,21 +1,21 @@
-for dir in "$HOME"/.config/sops-nix/secrets/gpg-agent/*; do
-  keyfile="$dir/key"
-  passfile="$dir/pass"
+for dir in "${HOME}"/.config/sops-nix/secrets/gpg-agent/*; do
+  keyfile="${dir}/key"
+  passfile="${dir}/pass"
 
-  if [ ! -f "$keyfile" ]; then
+  if [[ ! -f "${keyfile}" ]]; then
     continue
   fi
 
-  if [ -f "$passfile" ]; then
-    gpg2 --batch --yes --pinentry-mode loopback --passphrase-file "$passfile" --import "$keyfile"
+  if [[ -f "${passfile}" ]]; then
+    gpg2 --batch --yes --pinentry-mode loopback --passphrase-file "${passfile}" --import "${keyfile}"
   else
-    gpg2 --batch --yes --import "$keyfile"
+    gpg2 --batch --yes --import "${keyfile}"
   fi
 
-  gpg2 --with-colons --import-options show-only --import "$keyfile" | grep '^fpr' | cut -d: -f10 | while read -r KEY_ID; do
-    echo "$KEY_ID:6:" >> "$GNUPGHOME"/otrust.txt
+  gpg2 --with-colons --import-options show-only --import "${keyfile}" | grep '^fpr' | cut -d: -f10 | while read -r KEY_ID; do
+    echo "${KEY_ID}:6:" >> "${GNUPGHOME}"/otrust.txt
   done
 done
 
-gpg2 --import-ownertrust "$GNUPGHOME"/otrust.txt
-rm "$GNUPGHOME"/otrust.txt
+gpg2 --import-ownertrust "${GNUPGHOME}"/otrust.txt
+rm "${GNUPGHOME}"/otrust.txt

hosts/common/user/configs/gui/cliphist/scripts/copy.sh

@@ -7,7 +7,7 @@ handle() {
   cliphist decode <<< "$1" | wl-copy
 }
 
-case $ROFI_RETV in
+case ${ROFI_RETV} in
   0) list ;;
   1) handle "$@" ;;
 esac

hosts/common/user/configs/gui/cliphist/scripts/delete.sh

@@ -7,7 +7,7 @@ handle() {
   cliphist delete <<< "$1"
 }
 
-case $ROFI_RETV in
+case ${ROFI_RETV} in
   0) list ;;
   1) handle "$@" && list ;;
 esac

hosts/common/user/configs/gui/spicetify/config/merge.sh

@@ -1,19 +1,19 @@
 SOURCE_FILE=$(realpath -m "$1")
 TARGET_FILE=$(realpath -m "$2")
 
-mkdir -p "$(dirname "$TARGET_FILE")"
+mkdir -p "$(dirname "${TARGET_FILE}")"
 
 TEMP_FILE=$(mktemp)
-cat "$SOURCE_FILE" > "$TEMP_FILE"
+cat "${SOURCE_FILE}" > "${TEMP_FILE}"
 
-if [ -f "$TARGET_FILE" ]; then
+if [[ -f "${TARGET_FILE}" ]]; then
   while IFS='=' read -r key value; do
-    if ! grep -q "^${key}=" "$TEMP_FILE"; then
-      echo "${key}=${value}" >> "$TEMP_FILE"
+    if ! grep -q "^${key}=" "${TEMP_FILE}"; then
+      echo "${key}=${value}" >> "${TEMP_FILE}"
     fi
-  done < "$TARGET_FILE"
+  done < "${TARGET_FILE}"
 fi
 
-mv "$TEMP_FILE" "$TARGET_FILE"
+mv "${TEMP_FILE}" "${TARGET_FILE}"
 
-echo "Configuration file $TARGET_FILE has been updated."
+echo "Configuration file ${TARGET_FILE} has been updated."

hosts/common/user/configs/gui/theme/theme.sh

@@ -1,11 +1,11 @@
-[ ! -L "$CONFIG"/wallpaper ] && ln -sf "$DEFAULT_WALLPAPER" "$CONFIG"/wallpaper
-[ ! -f "$CONFIG"/mode ] && echo "$DEFAULT_MODE" > "$CONFIG"/mode
+[[ ! -L "${CONFIG}"/wallpaper ]] && ln -sf "${DEFAULT_WALLPAPER}" "${CONFIG}"/wallpaper
+[[ ! -f "${CONFIG}"/mode ]] && echo "${DEFAULT_MODE}" > "${CONFIG}"/mode
 
 WALLPAPER=""
 MODE=""
 
 set_wallpaper() {
-  if [ -f "$1" ]; then
+  if [[ -f "$1" ]]; then
     WALLPAPER="$1"
   else
     echo "Invalid wallpaper path: $1"
@@ -14,7 +14,7 @@ set_wallpaper() {
 }
 
 set_mode() {
-  if [ "$1" = "light" ] || [ "$1" = "dark" ]; then
+  if [[ "$1" = "light" ]] || [[ "$1" = "dark" ]]; then
     MODE="$1"
   else
     echo "Invalid mode: $1. Use 'light' or 'dark'."
@@ -23,7 +23,7 @@ set_mode() {
 }
 
 toggle_mode() {
-  if [ "$(cat "$CONFIG"/mode)" = "light" ]; then
+  if [[ "$(cat "${CONFIG}"/mode)" = "light" ]]; then
     MODE="dark"
   else
     MODE="light"
@@ -35,18 +35,18 @@ show_usage() {
 }
 
 finish() {
-  [ -n "$WALLPAPER" ] && ln -sf "$WALLPAPER" "$CONFIG"/wallpaper
-  [ -n "$MODE" ] && echo "$MODE" > "$CONFIG"/mode
+  [[ -n "${WALLPAPER}" ]] && ln -sf "${WALLPAPER}" "${CONFIG}"/wallpaper
+  [[ -n "${MODE}" ]] && echo "${MODE}" > "${CONFIG}"/mode
 
-  "$ACTIVATION" > /dev/null
+  "${ACTIVATION}" > /dev/null
 }
 
-if [ $# -eq 0 ]; then
+if [[ $# -eq 0 ]]; then
   finish
 else
   case "$1" in
     toggle)
-      if [ $# -eq 1 ]; then
+      if [[ $# -eq 1 ]]; then
         toggle_mode
       else
         show_usage
@@ -54,7 +54,7 @@ else
       fi
       ;;
     light)
-      if [ $# -eq 1 ]; then
+      if [[ $# -eq 1 ]]; then
         set_mode "light"
       else
         show_usage
@@ -62,7 +62,7 @@ else
       fi
       ;;
     dark)
-      if [ $# -eq 1 ]; then
+      if [[ $# -eq 1 ]]; then
         set_mode "dark"
       else
         show_usage
@@ -70,7 +70,7 @@ else
       fi
       ;;
     mode)
-      if [ $# -eq 2 ]; then
+      if [[ $# -eq 2 ]]; then
         set_mode "$2"
       else
         show_usage
@@ -78,9 +78,9 @@ else
       fi
       ;;
     wallpaper)
-      if [ $# -ge 2 ] && [ $# -le 3 ]; then
+      if [[ $# -ge 2 ]] && [[ $# -le 3 ]]; then
         set_wallpaper "$2"
-        [ $# -eq 3 ] && set_mode "$3"
+        [[ $# -eq 3 ]] && set_mode "$3"
       else
         show_usage
         exit 1

hosts/eirene/README.md

@@ -0,0 +1,14 @@
+# eirene
+
+## Post-Install Checklist
+
+### Networking
+
+- [ ] Add NetworkManager connections
+- [ ] Connect Bluetooth devices
+- [ ] Add printers
+
+### Third-party Services
+
+- [ ] Firefox
+- [ ] Spotify

hosts/eirene/base/card.sh

@@ -1,10 +0,0 @@
-AMD=/dev/dri/by-path/pci-0000:06:00.0-card
-NVIDIA=/dev/dri/by-path/pci-0000:01:00.0-card
-
-if [ -e $AMD ]; then
-  CARD=$AMD
-else
-  CARD=$NVIDIA
-fi
-
-ln -sf $CARD $HOME/.config/hypr/card

hosts/eirene/base/default.nix

@@ -1,101 +0,0 @@
-{
-  config,
-  inputs,
-  lib,
-  pkgs,
-  ...
-}:
-{
-  imports = [
-    inputs.disko.nixosModules.disko
-    (import ../format.nix {
-      device = "/dev/disk/by-id/nvme-SAMSUNG_MZVL22T0HBLB-00BL2_S64RNE0R602762";
-    })
-    ./hardware-configuration.nix
-    ../../common/system/configs/tlp
-    ../.
-  ];
-
-  networking.hostName = "eirene";
-
-  # https://github.com/NixOS/nixos-hardware/tree/master/lenovo/legion/16achg6
-  hardware = {
-    enableAllFirmware = true;
-
-    cpu = {
-      cores = 8;
-      threads = 16;
-      amd.updateMicrocode = true;
-    };
-
-    nvidia = {
-      modesetting.enable = true;
-      powerManagement.enable = true;
-      open = false;
-
-      prime = {
-        offload = {
-          enable = true;
-          enableOffloadCmd = true;
-        };
-        nvidiaBusId = "PCI:1:0:0";
-        amdgpuBusId = "PCI:6:0:0";
-      };
-    };
-
-    graphics = {
-      enable32Bit = true;
-      extraPackages = with pkgs; [
-        amdvlk
-        driversi686Linux.amdvlk
-        rocmPackages.clr
-        rocmPackages.clr.icd
-      ];
-    };
-  };
-
-  services = {
-    xserver.videoDrivers = [ "nvidia" ];
-    fstrim.enable = true;
-    tlp.settings.DISK_DEVICES = "nvme0n1 nvme1n1";
-  };
-
-  boot = {
-    kernelParams = [
-      "amd_pstate=active"
-      "video=eDP-1:2560x1600@165"
-    ];
-    initrd.kernelModules = [ "amdgpu" ];
-  };
-
-  home-manager.sharedModules = lib.mkIf config.programs.hyprland.enable [
-    {
-      wayland.windowManager.hyprland.settings = {
-        monitor = "eDP-1, 2560x1600@165, 0x0, 1.25";
-        env = [ "WLR_DRM_DEVICES,$HOME/.config/hypr/card" ];
-        device = [
-          {
-            name = "syna2ba6:00-06cb:ce44-touchpad";
-            sensitivity = 0.5;
-          }
-        ];
-        gestures.workspace_swipe_distance = 600;
-      };
-
-      programs = {
-        zsh.loginExtra = lib.mkBefore (builtins.readFile ./card.sh);
-        # VSCode does not play well with fractional scaling
-        vscode.userSettings."window.zoomLevel" = (1.25 - 1) / 0.2;
-      };
-
-      theme = {
-        cursor.size = 24;
-      };
-    }
-  ];
-
-  nixpkgs.config = {
-    cudaSupport = true;
-    rocmSupport = true;
-  };
-}

hosts/eirene/default.nix

@@ -1,5 +1,14 @@
+{
+  inputs,
+  lib,
+  pkgs,
+  ...
+}:
 {
   imports = [
+    inputs.disko.nixosModules.disko
+    (import ./format.nix { device = "/dev/disk/by-id/nvme-SAMSUNG_MZVL22T0HBLB-00BL2_S64RNE0R602762"; })
+    ./hardware-configuration.nix
     ../common/system/configs/bluetooth
     ../common/system/configs/boot
     ../common/system/configs/brightnessctl
@@ -27,15 +36,98 @@
     ../common/system/configs/ssh
     ../common/system/configs/system
     ../common/system/configs/timezone
+    ../common/system/configs/tlp
     ../common/system/configs/tmux
     ../common/system/configs/tree
     ../common/system/configs/users
     ../common/system/configs/wget
     ../common/system/configs/zsh
     ../common/system/scripts/cleanup
-    ./nick.nix
+    ./users/nick.nix
   ];
 
+  # https://github.com/NixOS/nixos-hardware/tree/master/lenovo/legion/16achg6
+  hardware = {
+    enableAllFirmware = true;
+
+    cpu = {
+      cores = 8;
+      threads = 16;
+      amd.updateMicrocode = true;
+    };
+
+    nvidia = {
+      modesetting.enable = true;
+      powerManagement.enable = true;
+      open = false;
+
+      prime = {
+        offload = {
+          enable = true;
+          enableOffloadCmd = true;
+        };
+        nvidiaBusId = "PCI:1:0:0";
+        amdgpuBusId = "PCI:6:0:0";
+      };
+    };
+
+    graphics = {
+      enable32Bit = true;
+      extraPackages = with pkgs; [
+        amdvlk
+        driversi686Linux.amdvlk
+        rocmPackages.clr
+        rocmPackages.clr.icd
+      ];
+    };
+  };
+
+  networking.hostName = "eirene";
   i18n.defaultLocale = "en_US.UTF-8";
   sops.defaultSopsFile = ./secrets/secrets.yaml;
+
+  services = {
+    xserver.videoDrivers = [ "nvidia" ];
+    fstrim.enable = true;
+    tlp.settings.DISK_DEVICES = "nvme0n1 nvme1n1";
+  };
+
+  boot = {
+    kernelParams = [
+      "amd_pstate=active"
+      "video=eDP-1:2560x1600@165"
+    ];
+    initrd.kernelModules = [ "amdgpu" ];
+  };
+
+  nixpkgs.config = {
+    cudaSupport = true;
+    rocmSupport = true;
+  };
+
+  home-manager.sharedModules = [
+    {
+      wayland.windowManager.hyprland.settings = {
+        monitor = "eDP-1, 2560x1600@165, 0x0, 1.25";
+        env = [ "WLR_DRM_DEVICES,$HOME/.config/hypr/card" ];
+        device = [
+          {
+            name = "syna2ba6:00-06cb:ce44-touchpad";
+            sensitivity = 0.5;
+          }
+        ];
+        gestures.workspace_swipe_distance = 600;
+      };
+
+      programs = {
+        zsh.loginExtra = lib.mkBefore (builtins.readFile ./scripts/card.sh);
+        # VSCode does not play well with fractional scaling
+        vscode.userSettings."window.zoomLevel" = (1.25 - 1) / 0.2;
+      };
+
+      theme = {
+        cursor.size = 24;
+      };
+    }
+  ];
 }

hosts/eirene/nick.nix

@@ -1,115 +0,0 @@
-{ config, ... }:
-let
-  # https://github.com/NixOS/nixpkgs/issues/24570
-  # https://github.com/NixOS/nixpkgs/issues/305643
-  user = "nick";
-  home = "/home/nick";
-in
-{
-  imports = [
-    ../common/user/configs/options.nix
-    (import ../common/user/configs/console/android { inherit user home; })
-    (import ../common/user/configs/console/bluetooth { inherit user home; })
-    (import ../common/user/configs/console/brightnessctl { inherit user home; })
-    (import ../common/user/configs/console/btop { inherit user home; })
-    (import ../common/user/configs/console/docker { inherit user home; })
-    (import ../common/user/configs/console/fastfetch { inherit user home; })
-    (import ../common/user/configs/console/ffmpeg { inherit user home; })
-    (import ../common/user/configs/console/git { inherit user home; })
-    (import ../common/user/configs/console/gpg-agent { inherit user home; })
-    (import ../common/user/configs/console/home-manager { inherit user home; })
-    (import ../common/user/configs/console/imagemagick { inherit user home; })
-    (import ../common/user/configs/console/ncdu { inherit user home; })
-    (import ../common/user/configs/console/neovim { inherit user home; })
-    (import ../common/user/configs/console/nixpkgs { inherit user home; })
-    (import ../common/user/configs/console/pipewire { inherit user home; })
-    (import ../common/user/configs/console/ranger { inherit user home; })
-    (import ../common/user/configs/console/sops { inherit user home; })
-    (import ../common/user/configs/console/syncthing { inherit user home; })
-    (import ../common/user/configs/console/tmux { inherit user home; })
-    (import ../common/user/configs/console/tree { inherit user home; })
-    (import ../common/user/configs/console/wget { inherit user home; })
-    (import ../common/user/configs/console/xdg { inherit user home; })
-    (import ../common/user/configs/console/yt-dlp { inherit user home; })
-    (import ../common/user/configs/console/zsh { inherit user home; })
-    (import ../common/user/configs/gui/ags { inherit user home; })
-    (import ../common/user/configs/gui/bluetooth { inherit user home; })
-    (import ../common/user/configs/gui/brightnessctl { inherit user home; })
-    (import ../common/user/configs/gui/btop { inherit user home; })
-    (import ../common/user/configs/gui/chromium { inherit user home; })
-    (import ../common/user/configs/gui/cliphist { inherit user home; })
-    (import ../common/user/configs/gui/emoji { inherit user home; })
-    (import ../common/user/configs/gui/firefox { inherit user home; })
-    (import ../common/user/configs/gui/gtk { inherit user home; })
-    (import ../common/user/configs/gui/hyprland { inherit user home; })
-    (import ../common/user/configs/gui/hyprshot { inherit user home; })
-    (import ../common/user/configs/gui/kitty { inherit user home; })
-    (import ../common/user/configs/gui/libreoffice { inherit user home; })
-    (import ../common/user/configs/gui/networking { inherit user home; })
-    (import ../common/user/configs/gui/obsidian { inherit user home; })
-    (import ../common/user/configs/gui/pipewire { inherit user home; })
-    (import ../common/user/configs/gui/qalculate { inherit user home; })
-    (import ../common/user/configs/gui/qt { inherit user home; })
-    (import ../common/user/configs/gui/rofi { inherit user home; })
-    (import ../common/user/configs/gui/spicetify { inherit user home; })
-    (import ../common/user/configs/gui/swww { inherit user home; })
-    (import ../common/user/configs/gui/theme { inherit user home; })
-    (import ../common/user/configs/gui/transmission { inherit user home; })
-    (import ../common/user/configs/gui/vscode { inherit user home; })
-    (import ../common/user/configs/gui/wev { inherit user home; })
-    (import ../common/user/configs/gui/x11 { inherit user home; })
-  ];
-
-  sops.secrets."${user}-password" = {
-    sopsFile = ../../users/${user}/secrets/secrets.yaml;
-    key = "password";
-    neededForUsers = true;
-  };
-
-  users.users.${user} = {
-    inherit home;
-    isNormalUser = true;
-    email = "nick@karaolidis.com";
-    fullName = "Nikolaos Karaolidis";
-    description = "Nikolaos Karaolidis";
-    hashedPasswordFile = config.sops.secrets."${user}-password".path;
-    extraGroups = [ "wheel" ];
-    linger = true;
-    uid = 1000;
-  };
-
-  services.getty.autologinUser = user;
-
-  home-manager.users.${user} = {
-    home = {
-      username = user;
-      homeDirectory = home;
-    };
-
-    sops.defaultSopsFile = ../../users/${user}/secrets/secrets.yaml;
-    theme.wallpaper = ../../users/${user}/secrets/wallpapers/clouds.png;
-
-    programs.obsidian.vaults."Documents/Obsidian/master".enable = true;
-
-    services.syncthing.settings.folders = {
-      obsidian = {
-        label = "Obsidian";
-        path = "Documents/Obsidian";
-        devices = [
-          "amalthea"
-          "ganymede"
-        ];
-      };
-      official = {
-        label = "Official";
-        path = "Documents/Official";
-        devices = [
-          "amalthea"
-          "ganymede"
-        ];
-      };
-    };
-
-    home.file."Documents/Obsidian/.stignore".source = ../common/user/configs/gui/obsidian/config/.stignore;
-  };
-}

hosts/eirene/scripts/card.sh

@@ -0,0 +1,10 @@
+AMD=/dev/dri/by-path/pci-0000:06:00.0-card
+NVIDIA=/dev/dri/by-path/pci-0000:01:00.0-card
+
+if [[ -e "${AMD}" ]]; then
+  CARD=${AMD}
+else
+  CARD=${NVIDIA}
+fi
+
+ln -sf "${CARD}" "${HOME}"/.config/hypr/card

hosts/eirene/users/nick.nix

@@ -0,0 +1,115 @@
+{ config, ... }:
+let
+  # https://github.com/NixOS/nixpkgs/issues/24570
+  # https://github.com/NixOS/nixpkgs/issues/305643
+  user = "nick";
+  home = "/home/nick";
+in
+{
+  imports = [
+    ../../common/user/configs/options.nix
+    (import ../../common/user/configs/console/android { inherit user home; })
+    (import ../../common/user/configs/console/bluetooth { inherit user home; })
+    (import ../../common/user/configs/console/brightnessctl { inherit user home; })
+    (import ../../common/user/configs/console/btop { inherit user home; })
+    (import ../../common/user/configs/console/docker { inherit user home; })
+    (import ../../common/user/configs/console/fastfetch { inherit user home; })
+    (import ../../common/user/configs/console/ffmpeg { inherit user home; })
+    (import ../../common/user/configs/console/git { inherit user home; })
+    (import ../../common/user/configs/console/gpg-agent { inherit user home; })
+    (import ../../common/user/configs/console/home-manager { inherit user home; })
+    (import ../../common/user/configs/console/imagemagick { inherit user home; })
+    (import ../../common/user/configs/console/ncdu { inherit user home; })
+    (import ../../common/user/configs/console/neovim { inherit user home; })
+    (import ../../common/user/configs/console/nixpkgs { inherit user home; })
+    (import ../../common/user/configs/console/pipewire { inherit user home; })
+    (import ../../common/user/configs/console/ranger { inherit user home; })
+    (import ../../common/user/configs/console/sops { inherit user home; })
+    (import ../../common/user/configs/console/syncthing { inherit user home; })
+    (import ../../common/user/configs/console/tmux { inherit user home; })
+    (import ../../common/user/configs/console/tree { inherit user home; })
+    (import ../../common/user/configs/console/wget { inherit user home; })
+    (import ../../common/user/configs/console/xdg { inherit user home; })
+    (import ../../common/user/configs/console/yt-dlp { inherit user home; })
+    (import ../../common/user/configs/console/zsh { inherit user home; })
+    (import ../../common/user/configs/gui/ags { inherit user home; })
+    (import ../../common/user/configs/gui/bluetooth { inherit user home; })
+    (import ../../common/user/configs/gui/brightnessctl { inherit user home; })
+    (import ../../common/user/configs/gui/btop { inherit user home; })
+    (import ../../common/user/configs/gui/chromium { inherit user home; })
+    (import ../../common/user/configs/gui/cliphist { inherit user home; })
+    (import ../../common/user/configs/gui/emoji { inherit user home; })
+    (import ../../common/user/configs/gui/firefox { inherit user home; })
+    (import ../../common/user/configs/gui/gtk { inherit user home; })
+    (import ../../common/user/configs/gui/hyprland { inherit user home; })
+    (import ../../common/user/configs/gui/hyprshot { inherit user home; })
+    (import ../../common/user/configs/gui/kitty { inherit user home; })
+    (import ../../common/user/configs/gui/libreoffice { inherit user home; })
+    (import ../../common/user/configs/gui/networking { inherit user home; })
+    (import ../../common/user/configs/gui/obsidian { inherit user home; })
+    (import ../../common/user/configs/gui/pipewire { inherit user home; })
+    (import ../../common/user/configs/gui/qalculate { inherit user home; })
+    (import ../../common/user/configs/gui/qt { inherit user home; })
+    (import ../../common/user/configs/gui/rofi { inherit user home; })
+    (import ../../common/user/configs/gui/spicetify { inherit user home; })
+    (import ../../common/user/configs/gui/swww { inherit user home; })
+    (import ../../common/user/configs/gui/theme { inherit user home; })
+    (import ../../common/user/configs/gui/transmission { inherit user home; })
+    (import ../../common/user/configs/gui/vscode { inherit user home; })
+    (import ../../common/user/configs/gui/wev { inherit user home; })
+    (import ../../common/user/configs/gui/x11 { inherit user home; })
+  ];
+
+  sops.secrets."${user}-password" = {
+    sopsFile = ../../../users/${user}/secrets/secrets.yaml;
+    key = "password";
+    neededForUsers = true;
+  };
+
+  users.users.${user} = {
+    inherit home;
+    isNormalUser = true;
+    email = "nick@karaolidis.com";
+    fullName = "Nikolaos Karaolidis";
+    description = "Nikolaos Karaolidis";
+    hashedPasswordFile = config.sops.secrets."${user}-password".path;
+    extraGroups = [ "wheel" ];
+    linger = true;
+    uid = 1000;
+  };
+
+  services.getty.autologinUser = user;
+
+  home-manager.users.${user} = {
+    home = {
+      username = user;
+      homeDirectory = home;
+    };
+
+    sops.defaultSopsFile = ../../../users/${user}/secrets/secrets.yaml;
+    theme.wallpaper = ../../../users/${user}/secrets/wallpapers/clouds.png;
+
+    programs.obsidian.vaults."Documents/Obsidian/master".enable = true;
+
+    services.syncthing.settings.folders = {
+      obsidian = {
+        label = "Obsidian";
+        path = "Documents/Obsidian";
+        devices = [
+          "amalthea"
+          "ganymede"
+        ];
+      };
+      official = {
+        label = "Official";
+        path = "Documents/Official";
+        devices = [
+          "amalthea"
+          "ganymede"
+        ];
+      };
+    };
+
+    home.file."Documents/Obsidian/.stignore".source = ../../common/user/configs/gui/obsidian/config/.stignore;
+  };
+}

hosts/eirene/vm/default.nix

@@ -1,27 +0,0 @@
-{
-  config,
-  inputs,
-  lib,
-  ...
-}:
-{
-  imports = [
-    inputs.disko.nixosModules.disko
-    (import ../format.nix { device = "/dev/vda"; })
-    ./hardware-configuration.nix
-    ../.
-  ];
-
-  networking.hostName = "eirene-vm";
-
-  boot.kernelParams = [ "video=Virtual-1:2560x1600@60" ];
-
-  fileSystems."/host" = {
-    device = "host";
-    fsType = "virtiofs";
-  };
-
-  home-manager.sharedModules = lib.mkIf config.programs.hyprland.enable [
-    { wayland.windowManager.hyprland.settings.monitor = "Virtual-1, 2560x1600@60, 0x0, 1"; }
-  ];
-}

hosts/eirene/vm/hardware-configuration.nix

@@ -1,18 +0,0 @@
-{ lib, modulesPath, ... }:
-{
-  imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
-
-  boot = {
-    initrd.availableKernelModules = [
-      "ahci"
-      "xhci_pci"
-      "virtio_pci"
-      "virtio_scsi"
-      "sr_mod"
-      "virtio_blk"
-    ];
-    kernelModules = [ "kvm-amd" ];
-  };
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-}