General: switch to Snowfall lib

2024-12-06 13:04:47 -05:00 · 2024-12-06 13:04:47 -05:00 · c1506c5118
parent 2fbee2adb5
commit c1506c5118
91 changed files with 28232 additions and 28134 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -1 +1 @@
-modules/secrets/** filter=crypt diff=crypt merge=crypt
+modules/nixos/secrets/** filter=crypt diff=crypt merge=crypt
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -3,5 +3,5 @@
  "direnv.restart.automatic": true,
  "nix.enableLanguageServer": true,
  "nix.serverPath": "/run/current-system/sw/bin/nil",
-    "nix.formatterPath": "/run/current-system/sw/bin/nix fmt",
+  "nix.formatterPath": "/run/current-system/sw/bin/nix fmt"
 }
--- a/README.md
+++ b/README.md
@ -1,6 +1,6 @@
 # NixOS Configuration

-A full set of configuration files managed via NixOS. This project is an **unofficial** extension of the [Auxolotl system template](https://git.auxolotl.org/auxolotl/templates).
+A full set of configuration files managed via NixOS. This project uses the [Snowfall library](https://snowfall.org/guides/lib/quickstart).

 > [!WARNING]
 > DO NOT DOWNLOAD AND RUN `nixos-rebuild` ON THIS REPOSITORY! These are my personal configuration files. I invite you to look through them, modify them, and take inspiration from them, but if you run `nixos-rebuild`, it _will completely overwrite your current system_!
@ -9,7 +9,7 @@ A full set of configuration files managed via NixOS. This project is an **unoffi

 ### Note on secrets management

-Secrets are managed using [git-crypt](https://github.com/AGWA/git-crypt). To unlock the repo, use `git-crypt unlock [path to key file]`. git-crypt will transparently encrypt/decrypt files stored in `modules/secrets` going forward, but you'll need this key file on all hosts that are using secrets.
+Secrets are managed using [transcrypt](https://github.com/elasticdog/transcrypt). To unlock the repo, use `transcrypt -c [cipher] -p '[password]'`. Transcrypt will transparently encrypt/decrypt files stored in `modules/nixos/secrets` going forward. You can get the cipher and password from a host with transcrypt already configured by running `transcrypt --display`.

 > [!NOTE]
 > This is a poor man's secret management solution. If you use this, your secrets will be world-readable in the `/nix/store/`.
@ -22,9 +22,9 @@ When installing on a brand new system, partition the main drive into two partiti
 ./bin/format-drives.sh --boot /dev/nvme0n1p1 --luks /dev/nvme0n1p2
 ```

-Next, set up the host's config under in the `hosts` folder by copying `configuration.nix.template` and `hardware-configuration.nix.template` into a new folder. Running `format-drives.sh` also generates a `hardware-configuration.nix` file you can use.
+Next, set up the host's config in the `systems/[architecture]` folder by copying `default.nix.template` and `hardware-configuration.nix.template` into a new folder named after the hostname. Running `format-drives.sh` also generates a `hardware-configuration.nix` file you can use.

-Then, add the host to `flake.nix` under the `nixosConfigurations` section.
+If necessary, import modules by adding the host to `flake.nix` under the `outputs.systems.hosts` section.

 Finally, run the NixOS installer, replacing `host` with your actual hostname:

@ -41,10 +41,10 @@ To update a system, run `nixos-operations-script` (or just `nos`). To commit upd

 #### Automatic updates

-To enable automatic updates for a host, set `aux.system.services.autoUpgrade = true;`. You can configure the autoUpgrade module with additional settings, e.g.:
+To enable automatic updates for a host, set `config.${namespace}.services.autoUpgrade = true;`. You can configure the autoUpgrade module with additional settings, e.g.:

 ```nix
-aux.system.services.autoUpgrade = {
+services.autoUpgrade = {
  enable = true;
  configDir = config.secrets.nixConfigFolder;
  onCalendar = "daily";
@ -52,7 +52,7 @@ aux.system.services.autoUpgrade = {
 };
 ```

-Automatic updates work by running `nos`. There's an additional `pushUpdates` option that, when enabled, updates the `flake.lock` file and pushes it back up to the Git repository. Only one host needs to do this (in this case, it's [Hevana](./hosts/Hevana), but you can safely enable it on multiple hosts as long as they use the same repository and update at different times.
+Automatic updates work by running `nos`. There's an additional `pushUpdates` option that, when enabled, updates the `flake.lock` file and pushes it back up to the Git repository. Only one host needs to do this (in this case, it's [Hevana](./systems/x86_64-linux/Hevana)), but you can safely enable it on multiple hosts as long as they use the same repository and update at different times.

 #### Manually updating

@ -127,18 +127,7 @@ nixos-rebuild build-vm --flake .

 ## About this repository

-### Layout
-
-This config uses a custom templating system built off of the [Auxolotl system templates](https://git.auxolotl.org/auxolotl/templates).
- Flakes are the entrypoint, via `flake.nix`. This is where Flake inputs and Flake-specific options get defined.
- Hosts are defined in the `hosts` folder.
- Modules are defined in `modules`. All of these files are automatically imported (except home-manager modules). You simply enable the ones you want to use, and disable the ones you don't. For example, to install Flatpak support, set `aux.system.ui.flatpak.enable = true;`.
-    - After adding a new module, make sure to `git add` it before running `nixos-rebuild`.
- Home-manager configs live in the `users/` folders.
-
-### Features
-
-This Nix config features:
+This config uses the [Snowfall lib](https://snowfall.org/), along with some default options and settings for common software. It features:

 - Flakes
 - Home Manager
--- a/bin/compile-manuscript.sh
+++ b/bin/compile-manuscript.sh
@ -53,7 +53,6 @@ while [[ $# -gt 0 ]]; do
      ;;
  esac
 done
-remainingArgs=${POSITIONAL_ARGS[@]}
 set -- "${POSITIONAL_ARGS[@]}" # restore positional parameters

 # If this is a git repo and no name has been provided, name the draft after the current branch
@ -63,9 +62,9 @@ fi

 # Check if this directory already exists
 outDir="$outDir/${draftName}"
-if [ -d $outDir ]; then
+if [ -d "$outDir" ]; then
  echo "The folder $outDir already exists."
-    read -p "Enter YES to overwrite, or Ctrl-C to cancel: " confirm && [ $confirm = "YES" ] || exit 1
+  read -rp "Enter YES to overwrite, or Ctrl-C to cancel: " confirm && [ "$confirm" = "YES" ] || exit 1
 fi

 draftFile="$outDir/${draftName}"
@ -73,20 +72,20 @@ draftFile="$outDir/${draftName}"
 echo "Compiling draft \"${draftName}\"..."

 # Create the draft directory if it doesn't already exist
-mkdir -p $outDir
+mkdir -p "$outDir"

 # Initialize merged file
-echo > $draftFile.md
+echo > "$draftFile".md

 # Grab content files and add a page break to the end of each one.
 # Obsidian specifically creates "folder notes," which are named for the directory, so we make sure to exclude it.
-find "$inDir" -type f -wholename "* *.md" ! -name content.md -print0 | sort -z | while read -d $'\0' file
+find "$inDir" -type f -wholename "* *.md" ! -name content.md -print0 | sort -z | while read -rd $'\0' file
 do
  # Add newline to Markdown doc
-    echo >> $draftFile.md
+  echo >> "$draftFile".md
  # Clean up incoming Markdown and append it to final doc
-    sed "s|(../|($inDir/../|g" "$file" >> $draftFile.md
-    echo "\\newpage" >> $draftFile.md
+  sed "s|(../|($inDir/../|g" "$file" >> "$draftFile".md
+  echo "\\newpage" >> "$draftFile".md
 done

 # Generate the output files:
@ -94,9 +93,9 @@ done
 #		Markdown -> EPUB
 #		Markdown -> PDF (A4 size)
 #		Markdown -> PDF (B6/Standard book size)
-pandoc -t docx $draftFile.md -o $draftFile.docx --metadata-file "$metadataFile"
-pandoc -t epub $draftFile.md -o $draftFile.epub --metadata-file "$metadataFile"
-pandoc $draftFile.md -o ${draftFile}-a4.pdf --metadata-file "$metadataFile" -V geometry:"a4paper" -V fontsize:"12pt"
-pandoc $draftFile.md -o ${draftFile}-b6.pdf --metadata-file "$metadataFile" -V geometry:"b6paper" -V fontsize:"10pt"
+pandoc -t docx "$draftFile".md -o "$draftFile".docx --metadata-file "$metadataFile"
+pandoc -t epub "$draftFile".md -o "$draftFile".epub --metadata-file "$metadataFile"
+pandoc "$draftFile".md -o "$draftFile"-a4.pdf --metadata-file "$metadataFile" -V geometry:"a4paper" -V fontsize:"12pt"
+pandoc "$draftFile".md -o "$draftFile"-b6.pdf --metadata-file "$metadataFile" -V geometry:"b6paper" -V fontsize:"10pt"

 echo "Done! Your new draft is in $outDir"
--- a/bin/format-drives.sh
+++ b/bin/format-drives.sh
@ -46,7 +46,6 @@ while [[ $# -gt 0 ]]; do
      ;;
    --help|-h)
      usage
-		shift
      ;;
    *)
      POSITIONAL_ARGS+=("$1") # save positional arg
@ -57,8 +56,8 @@ done

 set -- "${POSITIONAL_ARGS[@]}" # restore positional parameters

-cryptsetup luksOpen $luks_partition nixos-crypt
-mkfs.btrfs -L nixos $root_partition
+cryptsetup luksOpen "$luks_partition" nixos-crypt
+mkfs.btrfs -L nixos "$root_partition"
 mount /dev/mapper/nixos-crypt /mnt
 btrfs subvolume create /mnt/@
 btrfs subvolume create /mnt/@home
@ -67,13 +66,13 @@ btrfs subvolume create /mnt/@nix
 btrfs subvolume create /mnt/@swap
 umount /mnt

-mount -o subvol=@ $root_partition /mnt
+mount -o subvol=@ "$root_partition" /mnt
 mkdir -p /mnt/{boot,home,var/log,nix,swap}
-mount $boot_partition /mnt/boot
-mount -o subvol=@home $root_partition /mnt/home
-mount -o subvol=@log $root_partition /mnt/var/log
-mount -o subvol=@nix $root_partition /mnt/nix
-mount -o subvol=@swap $root_partition /mnt/swap
+mount "$boot_partition" /mnt/boot
+mount -o subvol=@home "$root_partition" /mnt/home
+mount -o subvol=@log "$root_partition" /mnt/var/log
+mount -o subvol=@nix "$root_partition" /mnt/nix
+mount -o subvol=@swap "$root_partition" /mnt/swap
 echo "Disks partitioned and mounted to /mnt."

 # Generate hardware-configuration.nix
--- a/bin/nixos-operations-script.sh
+++ b/bin/nixos-operations-script.sh
@ -73,7 +73,7 @@ while [[ $# -gt 0 ]]; do
      ;;
  esac
 done
-remainingArgs=${POSITIONAL_ARGS[@]}
+remainingArgs=${POSITIONAL_ARGS[*]}
 set -- "${POSITIONAL_ARGS[@]}" # restore positional parameters

 if [ -z "${flakeDir}" ]; then
@ -81,28 +81,28 @@ if [ -z "${flakeDir}" ]; then
  exit 1
 fi

-cd $flakeDir
+cd "$flakeDir" || exit 1

 echo "Pulling the latest version of the repository..."
-/run/wrappers/bin/sudo -u $user /run/current-system/sw/bin/git pull
+/run/wrappers/bin/sudo -u "$user" /run/current-system/sw/bin/git pull

 if [ $update = true ]; then
  echo "Updating flake.lock..."
-	/run/wrappers/bin/sudo -u $user /run/current-system/sw/bin/nix flake update --commit-lock-file
-	/run/wrappers/bin/sudo -u $user git push
+  /run/wrappers/bin/sudo -u "$user" /run/current-system/sw/bin/nix flake update --commit-lock-file
+  /run/wrappers/bin/sudo -u "$user" git push
 else
  echo "Skipping 'nix flake update'..."
 fi

 options="--flake ${flakeDir}#${hostname} ${remainingArgs} --use-remote-sudo --log-format multiline-with-logs"

-if [[ -n "${buildHost}" && $operation != "build" && $operation != *"dry"* ]]; then
+if [[ -n "${buildHost}" && "$operation" != "build" && "$operation" != *"dry"* ]]; then
  echo "Remote build detected, running this operation first: nixos-rebuild build ${options} --build-host $buildHost"
-	/run/current-system/sw/bin/nixos-rebuild build $options --build-host $buildHost
+  /run/current-system/sw/bin/nixos-rebuild build "$options" --build-host "$buildHost"
  echo "Remote build complete!"
 fi

 echo "Running this operation: nixos-rebuild ${operation} ${options}"
-/run/current-system/sw/bin/nixos-rebuild $operation $options
+/run/current-system/sw/bin/nixos-rebuild "$operation" "$options"

 exit 0
--- a/flake.lock
+++ b/flake.lock
@ -58,6 +58,22 @@
        "type": "github"
      }
    },
+    "flake-compat_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1650374568,
+        "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "b4a34015c698c7793d592d66adbab377907a2be8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
    "flake-parts": {
      "inputs": {
        "nixpkgs-lib": [
@ -97,6 +113,25 @@
        "type": "github"
      }
    },
+    "flake-utils-plus": {
+      "inputs": {
+        "flake-utils": "flake-utils_3"
+      },
+      "locked": {
+        "lastModified": 1715533576,
+        "narHash": "sha256-fT4ppWeCJ0uR300EH3i7kmgRZnAVxrH+XtK09jQWihk=",
+        "owner": "gytis-ivaskevicius",
+        "repo": "flake-utils-plus",
+        "rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "gytis-ivaskevicius",
+        "repo": "flake-utils-plus",
+        "rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f",
+        "type": "github"
+      }
+    },
    "flake-utils_2": {
      "inputs": {
        "systems": "systems_2"
@ -115,6 +150,24 @@
        "type": "github"
      }
    },
+    "flake-utils_3": {
+      "inputs": {
+        "systems": "systems_3"
+      },
+      "locked": {
+        "lastModified": 1694529238,
+        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
    "flakey-profile": {
      "locked": {
        "lastModified": 1712898590,
@ -130,6 +183,22 @@
        "type": "github"
      }
    },
+    "flatpak": {
+      "locked": {
+        "lastModified": 1732285094,
+        "narHash": "sha256-OD9tu/QN71OnEWtgvm9pXuQs+SGQtKnLHOGVRG5f9CU=",
+        "owner": "gmodena",
+        "repo": "nix-flatpak",
+        "rev": "d3a763532be5d223bb3474642f089667a8091cdf",
+        "type": "github"
+      },
+      "original": {
+        "owner": "gmodena",
+        "ref": "v0.5.0",
+        "repo": "nix-flatpak",
+        "type": "github"
+      }
+    },
    "gitignore": {
      "inputs": {
        "nixpkgs": [
@ -159,11 +228,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1733050161,
-        "narHash": "sha256-lYnT+EYE47f5yY3KS/Kd4pJ6CO9fhCqumkYYkQ3TK20=",
+        "lastModified": 1733482664,
+        "narHash": "sha256-ZD+h1fwvZs+Xvg46lzTWveAqyDe18h9m7wZnTIJfFZ4=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "62d536255879be574ebfe9b87c4ac194febf47c5",
+        "rev": "e38d3dd1d355a003cc63e8fe6ff66ef2257509ed",
        "type": "github"
      },
      "original": {
@ -198,40 +267,11 @@
        "type": "github"
      }
    },
-    "lib": {
-      "locked": {
-        "dir": "lib",
-        "lastModified": 1728413071,
-        "narHash": "sha256-5WHctvz0R9N9oBGda1ROuJ/V/m/tZsEXloGWDrd9G7Y=",
-        "rev": "866b8902c975a1aaec547445976dd39d60def4ab",
-        "type": "tarball",
-        "url": "https://git.auxolotl.org/api/v1/repos/auxolotl/labs/archive/866b8902c975a1aaec547445976dd39d60def4ab.tar.gz?rev=866b8902c975a1aaec547445976dd39d60def4ab"
-      },
-      "original": {
-        "dir": "lib",
-        "type": "tarball",
-        "url": "https://git.auxolotl.org/auxolotl/labs/archive/main.tar.gz"
-      }
-    },
    "lix": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1729298361,
-        "narHash": "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U=",
-        "rev": "ad9d06f7838a25beec425ff406fe68721fef73be",
-        "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ad9d06f7838a25beec425ff406fe68721fef73be.tar.gz?rev=ad9d06f7838a25beec425ff406fe68721fef73be"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz"
-      }
-    },
-    "lix-module": {
      "inputs": {
        "flake-utils": "flake-utils_2",
        "flakey-profile": "flakey-profile",
-        "lix": "lix",
+        "lix": "lix_2",
        "nixpkgs": [
          "nixpkgs"
        ]
@ -251,29 +291,27 @@
        "url": "https://git.lix.systems/lix-project/nixos-module"
      }
    },
-    "nix-flatpak": {
+    "lix_2": {
+      "flake": false,
      "locked": {
-        "lastModified": 1732285094,
-        "narHash": "sha256-OD9tu/QN71OnEWtgvm9pXuQs+SGQtKnLHOGVRG5f9CU=",
-        "owner": "gmodena",
-        "repo": "nix-flatpak",
-        "rev": "d3a763532be5d223bb3474642f089667a8091cdf",
-        "type": "github"
+        "lastModified": 1729298361,
+        "narHash": "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U=",
+        "rev": "ad9d06f7838a25beec425ff406fe68721fef73be",
+        "type": "tarball",
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ad9d06f7838a25beec425ff406fe68721fef73be.tar.gz?rev=ad9d06f7838a25beec425ff406fe68721fef73be"
      },
      "original": {
-        "owner": "gmodena",
-        "ref": "v0.5.0",
-        "repo": "nix-flatpak",
-        "type": "github"
+        "type": "tarball",
+        "url": "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz"
      }
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1733217105,
-        "narHash": "sha256-fc6jTzIwCIVWTX50FtW6AZpuukuQWSEbPiyg6ZRGWFY=",
+        "lastModified": 1733481457,
+        "narHash": "sha256-IS3bxa4N1VMSh3/P6vhEAHQZecQ3oAlKCDvzCQSO5Is=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "cceee0a31d2f01bcc98b2fbd591327c06a4ea4f9",
+        "rev": "e563803af3526852b6b1d77107a81908c66a9fcf",
        "type": "github"
      },
      "original": {
@ -317,11 +355,11 @@
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1733212471,
-        "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=",
+        "lastModified": 1733392399,
+        "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776",
+        "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661",
        "type": "github"
      },
      "original": {
@ -377,14 +415,15 @@
    "root": {
      "inputs": {
        "auto-cpufreq": "auto-cpufreq",
+        "flatpak": "flatpak",
        "home-manager": "home-manager",
        "lanzaboote": "lanzaboote",
-        "lib": "lib",
-        "lix-module": "lix-module",
-        "nix-flatpak": "nix-flatpak",
+        "lix": "lix",
        "nixos-hardware": "nixos-hardware",
        "nixpkgs": "nixpkgs_2",
-        "nixpkgs-unstable": "nixpkgs-unstable"
+        "nixpkgs-unstable": "nixpkgs-unstable",
+        "snowfall-lib": "snowfall-lib",
+        "treefmt": "treefmt"
      }
    },
    "rust-overlay": {
@ -412,6 +451,28 @@
        "type": "github"
      }
    },
+    "snowfall-lib": {
+      "inputs": {
+        "flake-compat": "flake-compat_2",
+        "flake-utils-plus": "flake-utils-plus",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1732544274,
+        "narHash": "sha256-qvzLIxuqukl0nxpXHEh5+iw1BLeLxYOwRC0+7cFUbPo=",
+        "owner": "snowfallorg",
+        "repo": "lib",
+        "rev": "cfeacd055545ab5de0ecfd41e09324dcd8fb2bbb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "snowfallorg",
+        "repo": "lib",
+        "type": "github"
+      }
+    },
    "systems": {
      "locked": {
        "lastModified": 1681028828,
@ -441,6 +502,41 @@
        "repo": "default",
        "type": "github"
      }
+    },
+    "systems_3": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "treefmt": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1733440889,
+        "narHash": "sha256-qKL3vjO+IXFQ0nTinFDqNq/sbbnnS5bMI1y0xX215fU=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "50862ba6a8a0255b87377b9d2d4565e96f29b410",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
    }
  },
  "root": "root",
--- a/flake.nix
+++ b/flake.nix
@ -1,4 +1,4 @@
-# Based on the Auxolotl template: https://github.com/auxolotl/templates
+# Uses Snowfall: https://snowfall.org/
 # For info on Flakes, see: https://nixos-and-flakes.thiscute.world/nixos-with-flakes/nixos-with-flakes-enabled
 {
  description = "Aires' system Flake";
@ -16,6 +16,9 @@
      inputs.nixpkgs.follows = "nixpkgs";
    };

+    # Flatpak support
+    flatpak.url = "github:gmodena/nix-flatpak/v0.5.0";
+
    # Home-manager support
    home-manager = {
      url = "github:nix-community/home-manager/release-24.11";
@ -25,50 +28,67 @@
    # SecureBoot support
    lanzaboote.url = "github:nix-community/lanzaboote/v0.4.1";

-    # Aux lib
-    lib.url = "https://git.auxolotl.org/auxolotl/labs/archive/main.tar.gz?dir=lib";
-
    # Use Lix in place of Nix.
    #   If you'd rather use regular Nix, remove `lix-module.nixosModules.default` from the `modules` section below.
    #   To learn more about Lix, see https://lix.systems/
-    lix-module = {
+    lix = {
      url = "git+https://git.lix.systems/lix-project/nixos-module?ref=release-2.91";
      inputs.nixpkgs.follows = "nixpkgs";
    };

-    # Flatpak support
-    nix-flatpak.url = "github:gmodena/nix-flatpak/v0.5.0";
-
    # NixOS hardware quirks
    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
+
+    # Snowfall lib: https://snowfall.org/guides/lib/quickstart/
+    # Jake's reference config: https://github.com/jakehamilton/config
+    snowfall-lib = {
+      url = "github:snowfallorg/lib";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    treefmt = {
+      url = "github:numtide/treefmt-nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
  };

  outputs =
-    inputs@{
-      auto-cpufreq,
-      home-manager,
-      lanzaboote,
-      lix-module,
-      nix-flatpak,
-      nixos-hardware,
-      nixpkgs,
-      ...
-    }:
+    inputs:
    let
-      forAllSystems =
-        function:
-        nixpkgs.lib.genAttrs [
-          "x86_64-linux"
-          "aarch64-linux"
-        ] (system: function nixpkgs.legacyPackages.${system});
+      lib = inputs.snowfall-lib.mkLib {
+        inherit inputs;

-      # Define shared modules and imports
-      defaultModules = [
-        ./modules/autoimport.nix
+        # Root dir for flake.nix
+        src = ./.;
+
+        # Configure Snowfall
+        snowfall = {
+          # Choose a namespace to use for your flake's packages, library, and overlays.
+          namespace = "Sapana";
+
+          # Add flake metadata that can be processed by tools like Snowfall Frost.
+          meta = {
+            # A slug to use in documentation when displaying things like file paths.
+            name = "aires-flake";
+
+            # A title to show for your flake, typically the name.
+            title = "Aires' Flake";
+          };
+        };
+      };
+    in
+    lib.mkFlake {
+      # Configure Nix channels
+      channels-config.allowUnfree = true;
+
+      # Define systems
+      systems = {
+        # Modules to import for all systems
+        modules.nixos = with inputs; [
          auto-cpufreq.nixosModules.default
-        lix-module.nixosModules.default
+          lix.nixosModules.default
          lanzaboote.nixosModules.lanzaboote
-        nix-flatpak.nixosModules.nix-flatpak
+          flatpak.nixosModules.nix-flatpak
          home-manager.nixosModules.home-manager
          {
            _module.args = {
@ -86,51 +106,45 @@
            };
          }
        ];
-    in
-    {
-      formatter = forAllSystems (pkgs: pkgs.nixfmt-rfc-style);

-      nixosConfigurations = {
-
-        Dimaga = nixpkgs.lib.nixosSystem {
-          system = "x86_64-linux";
-          modules = defaultModules ++ [
+        # Individual host configurations
+        hosts = {
+          Dimaga.modules = with inputs; [
            nixos-hardware.nixosModules.common-cpu-intel
-            ./hosts/Dimaga
          ];
-        };

-        Hevana = nixpkgs.lib.nixosSystem {
-          system = "x86_64-linux";
-          modules = defaultModules ++ [
+          Hevana.modules = with inputs; [
            nixos-hardware.nixosModules.common-cpu-amd-pstate
            nixos-hardware.nixosModules.common-gpu-amd
-            ./hosts/Hevana
          ];
-        };

-        Khanda = nixpkgs.lib.nixosSystem {
-          system = "x86_64-linux";
-          modules = defaultModules ++ [
+          Khanda.modules = with inputs; [
            nixos-hardware.nixosModules.microsoft-surface-pro-9
-            ./hosts/Khanda
          ];
-        };

-        Pihole = nixpkgs.lib.nixosSystem {
-          system = "aarch64-linux";
-          modules = defaultModules ++ [
+          Pihole.modules = with inputs; [
            nixos-hardware.nixosModules.raspberry-pi-4
-            ./hosts/Pihole
+          ];
+
+          Shura.modules = with inputs; [
+            nixos-hardware.nixosModules.lenovo-legion-16arha7
          ];
        };
+      };

-        Shura = nixpkgs.lib.nixosSystem {
-          system = "x86_64-linux";
-          modules = defaultModules ++ [
-            nixos-hardware.nixosModules.lenovo-legion-16arha7
-            ./hosts/Shura
-          ];
+      # Use treefmt to format project repo
+      outputs-builder =
+        channels:
+        let
+          treefmtEval = inputs.treefmt.lib.evalModule channels.nixpkgs ./treefmt.nix;
+        in
+        {
+          # For `nix fmt`
+          formatter = treefmtEval.config.build.wrapper;
+
+          # For `nix flake check`
+          checks = {
+            formatting = treefmtEval.config.build.check inputs.self;
          };
        };
    };
--- a/lib/default.nix
+++ b/lib/default.nix
@ -0,0 +1,15 @@
+{
+  lib,
+}:
+{
+  # Parses the domain from a URI
+  getDomainFromURI =
+    url:
+    let
+      parsedURL = (lib.strings.splitString "." url);
+    in
+    builtins.concatStringsSep "." [
+      (builtins.elemAt parsedURL 1)
+      (builtins.elemAt parsedURL 2)
+    ];
+}
--- a/modules/apps/bluetooth/vitrix-pdp-pro
+++ b/modules/apps/bluetooth/vitrix-pdp-pro
@ -1,42 +0,0 @@
-[General]
-Name=Victrix Pro BFG
-Appearance=0x03c4
-AddressType=public
-SupportedTechnologies=LE;
-Trusted=true
-Blocked=false
-WakeAllowed=true
-Services=00001800-0000-1000-8000-00805f9b34fb;00001801-0000-1000-8000-00805f9b34fb;0000180a-0000-1000-8000-00805f9b34fb;0000180f-0000-1000-8000-00805f9b34fb;00001812-0000-1000-8000-00805f9b34fb;00001813-0000-1000-8000-00805f9b34fb;f95a48e6-a721-11e9-a2a3-022ae2dbcce4;
-
-[LongTermKey]
-Key=F12268049C72EA0561E2E77DEA02AC12
-Authenticated=0
-EncSize=16
-EDiv=29996
-Rand=5139827239406697411
-
-[PeripheralLongTermKey]
-Key=CC60B7A9080383302B61EC2127E0D5CD
-Authenticated=0
-EncSize=16
-EDiv=59630
-Rand=6653202288716901387
-
-[SlaveLongTermKey]
-Key=CC60B7A9080383302B61EC2127E0D5CD
-Authenticated=0
-EncSize=16
-EDiv=59630
-Rand=6653202288716901387
-
-[DeviceID]
-Source=2
-Vendor=3695
-Product=587
-Version=768
-
-[ConnectionParameters]
-MinInterval=6
-MaxInterval=6
-Latency=0
-Timeout=300
--- a/modules/apps/dj.nix
+++ b/modules/apps/dj.nix
@ -1,17 +0,0 @@
-{ config, lib, ... }:
-
-let
-  cfg = config.aux.system.apps.dj;
-in
-{
-  options = {
-    aux.system.apps.dj.enable = lib.mkEnableOption "Enables DJing tools (i.e. Mixxx)";
-  };
-
-  config = lib.mkIf cfg.enable {
-    aux.system.ui.flatpak = {
-      enable = true;
-      packages = [ "org.mixxx.Mixxx" ];
-    };
-  };
-}
--- a/modules/apps/office.nix
+++ b/modules/apps/office.nix
@ -1,20 +0,0 @@
-{ config, lib, ... }:
-
-let
-  cfg = config.aux.system.apps.office;
-in
-{
-  options = {
-    aux.system.apps.office.enable = lib.mkEnableOption "Enables office and workstation apps";
-  };
-
-  config = lib.mkIf cfg.enable {
-    aux.system.ui.flatpak = {
-      enable = true;
-      packages = [
-        "org.onlyoffice.desktopeditors"
-        "us.zoom.Zoom"
-      ];
-    };
-  };
-}
--- a/modules/autoimport.nix
+++ b/modules/autoimport.nix
@ -1,31 +0,0 @@
-# Auto-import modules in this folder, recursively.
-# Sourced from https://github.com/evanjs/nixos_cfg/blob/4bb5b0b84a221b25cf50853c12b9f66f0cad3ea4/config/new-modules/default.nix
-{ lib, ... }:
-let
-  # Recursively constructs an attrset of a given folder, recursing on directories, value of attrs is the filetype
-  getDir =
-    dir:
-    lib.mapAttrs (file: type: if type == "directory" then getDir "${dir}/${file}" else type) (
-      builtins.readDir dir
-    );
-
-  # Collects all files of a directory as a list of strings of paths
-  files =
-    dir:
-    lib.collect lib.isString (
-      lib.mapAttrsRecursive (path: type: lib.concatStringsSep "/" path) (getDir dir)
-    );
-
-  # Search all files and folders within and below the current directory.
-  # Filters out directories that belong to home-manager, and don't end with .nix or are this file.
-  validFiles =
-    dir:
-    map (file: ./. + "/${file}") (
-      lib.filter (
-        file: !lib.hasInfix "home-manager" file && file != "autoimport.nix" && lib.hasSuffix ".nix" file
-      ) (files dir)
-    );
-in
-{
-  imports = validFiles ./.;
-}
--- a/modules/common.nix
+++ b/modules/common.nix
@ -1,45 +0,0 @@
-# Modules common to all systems
-{
-  inputs,
-  pkgs,
-  ...
-}:
-
-{
-  # Install base packages
-  aux.system.packages = with pkgs; [
-    fastfetch # Show a neat system statistics screen when opening a terminal
-    htop # System monitor
-    lm_sensors # System temperature monitoring
-    zellij # Terminal multiplexer
-  ];
-
-  # Install the nos helper script
-  aux.system.nixos-operations-script.enable = true;
-
-  # Allow packages from the unstable repo by using 'pkgs.unstable'
-  nixpkgs.overlays = [
-    (final: _prev: {
-      unstable = import inputs.nixpkgs-unstable {
-        system = final.system;
-        config.allowUnfree = true;
-      };
-    })
-  ];
-
-  programs = {
-    # Install ZSH for all users
-    zsh.enable = true;
-
-    # Configure nano
-    nano.nanorc = ''
-      set tabsize 4
-      set softwrap
-      set autoindent
-      set indicator
-    '';
-  };
-
-  # Set ZSH as the default shell
-  users.defaultUserShell = pkgs.zsh;
-}
--- a/modules/nixos/apps/development/default.nix
+++ b/modules/nixos/apps/development/default.nix
@ -2,15 +2,16 @@
  config,
  lib,
  pkgs,
+  namespace,
  ...
 }:

 let
-  cfg = config.aux.system.apps.development;
+  cfg = config.${namespace}.apps.development;
 in
 {
  options = {
-    aux.system.apps.development = {
+    ${namespace}.apps.development = {
      enable = lib.mkEnableOption "Enables development tools";
      kubernetes.enable = lib.mkEnableOption "Enables kubectl, virtctl, and similar tools.";
    };
@ -18,7 +19,7 @@ in

  config = lib.mkMerge [
    (lib.mkIf cfg.enable {
-      aux.system = {
+      ${namespace} = {
        packages = with pkgs; [
          nil # Nix Language server: https://github.com/oxalica/nil
          nix-prefetch-scripts
--- a/modules/nixos/apps/gaming/default.nix
+++ b/modules/nixos/apps/gaming/default.nix
@ -2,12 +2,13 @@
  config,
  lib,
  pkgs,
+  namespace,
  ...
 }:

 # Gaming-related settings
 let
-  cfg = config.aux.system.apps.gaming;
+  cfg = config.${namespace}.apps.gaming;
  reset-controllers-script = pkgs.writeShellScriptBin "reset-controllers" ''
    #!/usr/bin/env bash
    sudo rmmod hid_xpadneo && sudo modprobe hid_xpadneo
@ -16,11 +17,15 @@ let
 in
 {
  options = {
-    aux.system.apps.gaming.enable = lib.mkEnableOption "Enables gaming features";
+    ${namespace}.apps.gaming.enable = lib.mkEnableOption "Enables gaming features";
  };

  config = lib.mkIf cfg.enable {
-    aux.system.ui.flatpak = {
+    ${namespace} = {
+      # Add script to restart xpadneo in case of issues
+      packages = [ reset-controllers-script ];
+
+      ui.flatpak = {
        enable = true;
        packages = [
          "gg.minion.Minion"
@ -28,13 +33,11 @@ in
          "org.firestormviewer.FirestormViewer"
        ];
      };
+    };

    # Enable Xbox controller driver (XPadNeo)
    hardware.xpadneo.enable = true;

-    # Add script to restart xpadneo in case of issues
-    aux.system.packages = [ reset-controllers-script ];
-
    # Enable GameMode
    programs.gamemode.enable = true;
  };
--- a/modules/nixos/apps/media/default.nix
+++ b/modules/nixos/apps/media/default.nix
@ -1,15 +1,23 @@
-{ config, lib, ... }:
+{
+  config,
+  lib,
+  namespace,
+  ...
+}:

 let
-  cfg = config.aux.system.apps.media;
+  cfg = config.${namespace}.apps.media;
 in
 {
  options = {
-    aux.system.apps.media.enable = lib.mkEnableOption "Enables media playback and editing apps";
+    ${namespace}.apps.media = {
+      enable = lib.mkEnableOption "Enables media playback and editing apps.";
+      mixxx.enable = lib.mkEnableOption "Installs the Mixxx DJing software.";
+    };
  };

  config = lib.mkIf cfg.enable {
-    aux.system.ui.flatpak = {
+    ${namespace}.ui.flatpak = {
      enable = true;
      packages = [
        "app.drey.EarTag"
@ -21,6 +29,7 @@ in
        "org.kde.KStyle.Adwaita//6.6"
        "org.kde.WaylandDecoration.QAdwaitaDecorations//5.15-23.08" # Replaced deprecated QGnomePlatform https://wiki.archlinux.org/title/Uniform_look_for_Qt_and_GTK_applications
        "org.kde.WaylandDecoration.QAdwaitaDecorations//6.6"
+        (lib.mkIf cfg.mixxx.enable "org.mixxx.Mixxx")
        "org.videolan.VLC"
      ];
    };
--- a/modules/nixos/apps/office/default.nix
+++ b/modules/nixos/apps/office/default.nix
@ -0,0 +1,25 @@
+{
+  config,
+  lib,
+  namespace,
+  ...
+}:
+
+let
+  cfg = config.${namespace}.apps.office;
+in
+{
+  options = {
+    ${namespace}.apps.office.enable = lib.mkEnableOption "Enables office and workstation apps";
+  };
+
+  config = lib.mkIf cfg.enable {
+    ${namespace}.ui.flatpak = {
+      enable = true;
+      packages = [
+        "org.onlyoffice.desktopeditors"
+        "us.zoom.Zoom"
+      ];
+    };
+  };
+}
--- a/modules/nixos/apps/recording/default.nix
+++ b/modules/nixos/apps/recording/default.nix
@ -2,19 +2,20 @@
  config,
  lib,
  pkgs,
+  namespace,
  ...
 }:

 let
-  cfg = config.aux.system.apps.recording;
+  cfg = config.${namespace}.apps.recording;
 in
 {
  options = {
-    aux.system.apps.recording.enable = lib.mkEnableOption "Enables video editing tools";
+    ${namespace}.apps.recording.enable = lib.mkEnableOption "Enables video editing tools";
  };

  config = lib.mkIf cfg.enable {
-    aux.system.ui.flatpak.enable = true;
+    ${namespace}.ui.flatpak.enable = true;

    services.flatpak.packages = [
      "com.obsproject.Studio"
--- a/modules/nixos/apps/social/default.nix
+++ b/modules/nixos/apps/social/default.nix
@ -2,20 +2,20 @@
  config,
  lib,
  pkgs,
+  namespace,
  ...
 }:

 let
-  cfg = config.aux.system.apps.social;
+  cfg = config.${namespace}.apps.social;
 in
 {
  options = {
-    aux.system.apps.social.enable = lib.mkEnableOption "Enables chat apps";
+    ${namespace}.apps.social.enable = lib.mkEnableOption "Enables chat apps";
  };

  config = lib.mkIf cfg.enable {
-    aux.system = {
-      allowUnfree = true;
+    ${namespace} = {
      packages = [ pkgs.beeper ];
      ui.flatpak = {
        enable = true;
--- a/modules/nixos/apps/writing/default.nix
+++ b/modules/nixos/apps/writing/default.nix
@ -2,19 +2,20 @@
  pkgs,
  config,
  lib,
+  namespace,
  ...
 }:

 let
-  cfg = config.aux.system.apps.writing;
+  cfg = config.${namespace}.apps.writing;

  compile-manuscript = pkgs.writeShellScriptBin "compile-manuscript" (
-    builtins.readFile ../../bin/compile-manuscript.sh
+    builtins.readFile ../../../../bin/compile-manuscript.sh
  );
 in
 {
  options = {
-    aux.system.apps.writing.enable = lib.mkEnableOption "Enables writing and editing tools";
+    ${namespace}.apps.writing.enable = lib.mkEnableOption "Enables writing and editing tools";
  };

  config = lib.mkIf cfg.enable {
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@ -0,0 +1,37 @@
+# Modules common to all systems
+{
+  pkgs,
+  namespace,
+  ...
+}:
+
+{
+  ${namespace} = {
+    # Install base packages
+    packages = with pkgs; [
+      fastfetch # Show a neat system statistics screen when opening a terminal
+      htop # System monitor
+      lm_sensors # System temperature monitoring
+      zellij # Terminal multiplexer
+    ];
+
+    # Install the nos helper script
+    nixos-operations-script.enable = true;
+  };
+
+  programs = {
+    # Install ZSH for all users
+    zsh.enable = true;
+
+    # Configure nano
+    nano.nanorc = ''
+      set tabsize 4
+      set softwrap
+      set autoindent
+      set indicator
+    '';
+  };
+
+  # Set ZSH as the default shell
+  users.defaultUserShell = pkgs.zsh;
+}
--- a/modules/nixos/module.nix.template
+++ b/modules/nixos/module.nix.template
@ -2,11 +2,11 @@
 { config, lib, ... }:

 let
-  cfg = config.aux.system.services.myModule;
+  cfg = config.${namespace}.services.myModule;
 in
 {
  options = {
-    aux.system.services.myModule = {
+    ${namespace}.services.myModule = {
      enable = lib.mkEnableOption "Enables this example module.";
      attributes = lib.mkOption {
        default = { };
--- a/modules/nixos/secrets/Freight-20240828T164047Z-001.zip
+++ b/modules/nixos/secrets/Freight-20240828T164047Z-001.zip
--- a/modules/nixos/secrets/default.nix
+++ b/modules/nixos/secrets/default.nix
@ -0,0 +1,109 @@
+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
--- a/modules/nixos/services/acme/default.nix
+++ b/modules/nixos/services/acme/default.nix
@ -1,11 +1,16 @@
-{ config, lib, ... }:
+{
+  config,
+  lib,
+  namespace,
+  ...
+}:

 let
-  cfg = config.aux.system.services.acme;
+  cfg = config.${namespace}.services.acme;
 in
 {
  options = {
-    aux.system.services.acme = {
+    ${namespace}.services.acme = {
      enable = lib.mkEnableOption "Enable the ACME client (for Let's Encrypt TLS certificates).";
      certs = lib.mkOption {
        default = { };
@ -30,6 +35,6 @@ in
    # /var/lib/acme/.challenges must be writable by the ACME user
    # and readable by the Nginx user. The easiest way to achieve
    # this is to add the Nginx user to the ACME group.
-    users.users.nginx.extraGroups = lib.mkIf config.aux.system.services.nginx.enable [ "acme" ];
+    users.users.nginx.extraGroups = lib.mkIf config.${namespace}.services.nginx.enable [ "acme" ];
  };
 }
--- a/modules/nixos/services/apcupsd/default.nix
+++ b/modules/nixos/services/apcupsd/default.nix
@ -1,10 +1,15 @@
-{ config, lib, ... }:
+{
+  config,
+  lib,
+  namespace,
+  ...
+}:
 let
-  cfg = config.aux.system.services.apcupsd;
+  cfg = config.${namespace}.services.apcupsd;
 in
 {
  options = {
-    aux.system.services.apcupsd = {
+    ${namespace}.services.apcupsd = {
      enable = lib.mkEnableOption "Enables apcupsd";
      configText = lib.mkOption {
        type = lib.types.str;
--- a/modules/nixos/services/autoupgrade/default.nix
+++ b/modules/nixos/services/autoupgrade/default.nix
@ -1,12 +1,17 @@
 # Run automatic updates. Replaces system.autoUpgrade.
-{ config, lib, ... }:
+{
+  config,
+  lib,
+  namespace,
+  ...
+}:

 let
-  cfg = config.aux.system.services.autoUpgrade;
+  cfg = config.${namespace}.services.autoUpgrade;
 in
 {
  options = {
-    aux.system.services.autoUpgrade = {
+    ${namespace}.services.autoUpgrade = {
      enable = lib.mkEnableOption "Enables automatic system updates.";
      configDir = lib.mkOption {
        type = lib.types.str;
@ -54,7 +59,7 @@ in
    ];

    # Deploy update script
-    aux.system.nixos-operations-script.enable = true;
+    ${namespace}.nixos-operations-script.enable = true;

    # Pull and apply updates.
    systemd = {
@ -63,7 +68,7 @@ in
          Type = "oneshot";
          User = "root";
        };
-        path = config.aux.system.corePackages;
+        path = config.${namespace}.corePackages;
        unitConfig.RequiresMountsFor = cfg.configDir;
        script =
          "/run/current-system/sw/bin/nixos-operations-script --operation ${cfg.operation} "
--- a/modules/nixos/services/binary-cache/default.nix
+++ b/modules/nixos/services/binary-cache/default.nix
@ -1,16 +1,16 @@
 {
  config,
  lib,
-  pkgs,
+  namespace,
  ...
 }:

 let
-  cfg = config.aux.system.services.binary-cache;
+  cfg = config.${namespace}.services.binary-cache;
 in
 {
  options = {
-    aux.system.services.binary-cache = {
+    ${namespace}.services.binary-cache = {
      enable = lib.mkEnableOption "Enable a binary cache hosting service.";
      secretKeyFile = lib.mkOption {
        default = "/var/lib/nix-binary-cache/privkey.pem";
@ -49,7 +49,7 @@ in
      };

      nginx.virtualHosts."${cfg.url}" = {
-        useACMEHost = pkgs.util.getDomainFromURI cfg.url;
+        useACMEHost = lib.Sapana.getDomainFromURI cfg.url;
        forceSSL = true;
        basicAuth = {
          "${cfg.auth.user}" = cfg.auth.password;
--- a/modules/nixos/services/boinc/default.nix
+++ b/modules/nixos/services/boinc/default.nix
@ -2,15 +2,16 @@
  config,
  lib,
  pkgs,
+  namespace,
  ...
 }:

 let
-  cfg = config.aux.system.services.boinc;
+  cfg = config.${namespace}.services.boinc;
 in
 {
  options = {
-    aux.system.services.boinc = {
+    ${namespace}.services.boinc = {
      enable = lib.mkEnableOption "Enables BOINC distributed computing service.";
      home = lib.mkOption {
        default = "/var/lib/boinc";
@ -27,7 +28,7 @@ in
      dataDir = cfg.home;
      extraEnvPackages = [
        pkgs.ocl-icd
-      ] ++ lib.optionals config.aux.system.gpu.nvidia.enable [ pkgs.linuxPackages.nvidia_x11 ];
+      ] ++ lib.optionals config.${namespace}.gpu.nvidia.enable [ pkgs.linuxPackages.nvidia_x11 ];
      allowRemoteGuiRpc = true;
    };

--- a/modules/nixos/services/duplicacy-web/default.nix
+++ b/modules/nixos/services/duplicacy-web/default.nix
@ -2,16 +2,16 @@
  pkgs,
  config,
  lib,
+  namespace,
  ...
 }:

 let
-  cfg = config.aux.system.services.duplicacy-web;
-  duplicacy-web = pkgs.callPackage ../../packages/duplicacy-web.nix { inherit pkgs lib; };
+  cfg = config.${namespace}.services.duplicacy-web;
 in
 {
  options = {
-    aux.system.services.duplicacy-web = {
+    ${namespace}.services.duplicacy-web = {
      enable = lib.mkEnableOption "Enables duplicacy-web";
      home = lib.mkOption {
        default = "/var/lib/duplicacy-web";
@ -22,8 +22,7 @@ in
  };

  config = lib.mkIf cfg.enable {
-    nixpkgs.config.allowUnfree = true;
-    environment.systemPackages = [ duplicacy-web ];
+    environment.systemPackages = [ pkgs.Sapana.duplicacy-web ];

    networking.firewall.allowedTCPPorts = [ 3875 ];

@ -38,7 +37,7 @@ in
      description = "Start the Duplicacy backup service and web UI";
      serviceConfig = {
        Type = "simple";
-        ExecStart = ''${duplicacy-web}/duplicacy-web'';
+        ExecStart = ''${pkgs.Sapana.duplicacy-web}/duplicacy-web'';
        Restart = "on-failure";
        RestartSec = 10;
        KillMode = "process";
--- a/modules/nixos/services/forgejo/default.nix
+++ b/modules/nixos/services/forgejo/default.nix
@ -1,15 +1,15 @@
 {
-  pkgs,
  config,
  lib,
+  namespace,
  ...
 }:
 let
-  cfg = config.aux.system.services.forgejo;
+  cfg = config.${namespace}.services.forgejo;
 in
 {
  options = {
-    aux.system.services.forgejo = {
+    ${namespace}.services.forgejo = {
      enable = lib.mkEnableOption "Enables Forgejo Git hosting service.";
      home = lib.mkOption {
        default = "";
@ -32,7 +32,7 @@ in
        enable = true;
        settings = {
          server = {
-            DOMAIN = pkgs.util.getDomainFromURI cfg.url;
+            DOMAIN = lib.Sapana.getDomainFromURI cfg.url;
            ROOT_URL = cfg.url;
            HTTP_PORT = 3000;
          };
@ -42,7 +42,7 @@ in
      } // lib.optionalAttrs (cfg.home != null) { stateDir = cfg.home; };

      nginx.virtualHosts."${cfg.url}" = {
-        useACMEHost = pkgs.util.getDomainFromURI cfg.url;
+        useACMEHost = lib.Sapana.getDomainFromURI cfg.url;
        forceSSL = true;
        locations."/" = {
          proxyPass = "http://127.0.0.1:3000";
--- a/modules/nixos/services/jellyfin/default.nix
+++ b/modules/nixos/services/jellyfin/default.nix
@ -2,18 +2,19 @@
  pkgs,
  config,
  lib,
+  namespace,
  ...
 }:
 let
-  cfg = config.aux.system.services.jellyfin;
+  cfg = config.${namespace}.services.jellyfin;

  jellyfin-audio-save = pkgs.unstable.jellyfin.overrideAttrs (
-    finalAttrs: prevAttrs: { patches = [ ./jellyfin/jellyfin-audio-save-position.patch ]; }
+    finalAttrs: prevAttrs: { patches = [ ./jellyfin-audio-save-position.patch ]; }
  );
 in
 {
  options = {
-    aux.system.services.jellyfin = {
+    ${namespace}.services.jellyfin = {
      enable = lib.mkEnableOption "Enables the Jellyfin media streaming service.";
      home = lib.mkOption {
        default = "/var/lib/jellyfin";
@ -30,11 +31,11 @@ in
  };

  config = lib.mkIf cfg.enable {
-    aux.system.users.media.enable = true;
+    ${namespace}.users.media.enable = true;

    services = {
      nginx.virtualHosts."${cfg.url}" = {
-        useACMEHost = pkgs.util.getDomainFromURI cfg.url;
+        useACMEHost = lib.Sapana.getDomainFromURI cfg.url;
        forceSSL = true;
        locations."/" = {
          proxyPass = "http://127.0.0.1:8096";
--- a/modules/nixos/services/jellyfin/jellyfin-audio-save-position.patch
+++ b/modules/nixos/services/jellyfin/jellyfin-audio-save-position.patch
--- a/modules/nixos/services/languagetool/default.nix
+++ b/modules/nixos/services/languagetool/default.nix
@ -2,14 +2,15 @@
  pkgs,
  config,
  lib,
+  namespace,
  ...
 }:
 let
-  cfg = config.aux.system.services.languagetool;
+  cfg = config.${namespace}.services.languagetool;
 in
 {
  options = {
-    aux.system.services.languagetool = {
+    ${namespace}.services.languagetool = {
      enable = lib.mkEnableOption (lib.mdDoc "Enables LanguageTool server.");
      auth = {
        password = lib.mkOption {
@ -50,13 +51,11 @@ in
        public = true;
        allowOrigin = "*";
        # Enable Ngrams
-        settings.languageModel = lib.mkIf cfg.ngrams.enable "${
-          (pkgs.callPackage ../../packages/languagetool-ngrams.nix { inherit pkgs lib; })
-        }/share/languagetool/ngrams";
+        settings.languageModel = lib.mkIf cfg.ngrams.enable "${pkgs.Sapana.languagetool-ngrams}/share/languagetool/ngrams";
      };
      # Create Nginx virtualhost
      nginx.virtualHosts."${cfg.url}" = {
-        useACMEHost = pkgs.util.getDomainFromURI cfg.url;
+        useACMEHost = lib.Sapana.getDomainFromURI cfg.url;
        forceSSL = true;
        basicAuth = {
          "${cfg.auth.user}" = cfg.auth.password;
--- a/modules/nixos/services/msmtp/default.nix
+++ b/modules/nixos/services/msmtp/default.nix
@ -1,12 +1,17 @@
 # See https://wiki.nixos.org/wiki/Msmtp
-{ config, lib, ... }:
+{
+  config,
+  lib,
+  namespace,
+  ...
+}:

 let
-  cfg = config.aux.system.services.msmtp;
+  cfg = config.${namespace}.services.msmtp;
 in
 {
  options = {
-    aux.system.services.msmtp = {
+    ${namespace}.services.msmtp = {
      enable = lib.mkEnableOption "Enables mail server";
      accounts = lib.mkOption {
        type = lib.types.attrs;
--- a/modules/nixos/services/netdata/default.nix
+++ b/modules/nixos/services/netdata/default.nix
@ -2,14 +2,15 @@
  pkgs,
  config,
  lib,
+  namespace,
  ...
 }:
 let
-  cfg = config.aux.system.services.netdata;
+  cfg = config.${namespace}.services.netdata;
 in
 {
  options = {
-    aux.system.services.netdata = {
+    ${namespace}.services.netdata = {
      enable = lib.mkEnableOption "Enables Netdata monitoring.";
      auth = {
        user = lib.mkOption {
@ -50,7 +51,7 @@ in
    (lib.mkIf (cfg.enable && cfg.type == "parent") {
      services = {
        nginx.virtualHosts."${cfg.url}" = {
-          useACMEHost = pkgs.util.getDomainFromURI cfg.url;
+          useACMEHost = lib.Sapana.getDomainFromURI cfg.url;
          forceSSL = true;
          basicAuth = {
            "${cfg.auth.user}" = cfg.auth.password;
--- a/modules/nixos/services/nginx/default.nix
+++ b/modules/nixos/services/nginx/default.nix
@ -1,11 +1,16 @@
-{ config, lib, ... }:
+{
+  config,
+  lib,
+  namespace,
+  ...
+}:

 let
-  cfg = config.aux.system.services.nginx;
+  cfg = config.${namespace}.services.nginx;
 in
 {
  options = {
-    aux.system.services.nginx = {
+    ${namespace}.services.nginx = {
      enable = lib.mkEnableOption "Enable the Nginx web server.";

      virtualHosts = lib.mkOption {
--- a/modules/nixos/services/qbittorrent/default.nix
+++ b/modules/nixos/services/qbittorrent/default.nix
@ -2,17 +2,18 @@
  config,
  lib,
  pkgs,
+  namespace,
  ...
 }:

 let
-  cfg = config.aux.system.services.qbittorrent;
+  cfg = config.${namespace}.services.qbittorrent;
  UID = 850;
  GID = 850;
 in
 {
  options = {
-    aux.system.services.qbittorrent = {
+    ${namespace}.services.qbittorrent = {
      enable = lib.mkEnableOption "Enables qBittorrent.";
      home = lib.mkOption {
        default = "/var/lib/qbittorrent";
@ -58,7 +59,7 @@ in
  config = lib.mkIf cfg.enable {
    services = {
      nginx.virtualHosts."${cfg.url}" = {
-        useACMEHost = pkgs.util.getDomainFromURI cfg.url;
+        useACMEHost = lib.Sapana.getDomainFromURI cfg.url;
        forceSSL = true;
        locations."/" = {
          proxyPass = "http://127.0.0.1:${cfg.port}";
--- a/modules/nixos/services/rss/default.nix
+++ b/modules/nixos/services/rss/default.nix
@ -2,14 +2,15 @@
  pkgs,
  config,
  lib,
+  namespace,
  ...
 }:
 let
-  cfg = config.aux.system.services.rss;
+  cfg = config.${namespace}.services.rss;
 in
 {
  options = {
-    aux.system.services.rss = {
+    ${namespace}.services.rss = {
      enable = lib.mkEnableOption "Enables RSS hosting service via FreshRSS.";
      auth = {
        password = lib.mkOption {
@ -56,7 +57,7 @@ in
      };

      nginx.virtualHosts."${cfg.url}" = {
-        useACMEHost = pkgs.util.getDomainFromURI cfg.url;
+        useACMEHost = lib.Sapana.getDomainFromURI cfg.url;
        forceSSL = true;
      };
    };
--- a/modules/nixos/services/ssh/default.nix
+++ b/modules/nixos/services/ssh/default.nix
@ -1,11 +1,16 @@
-{ config, lib, ... }:
+{
+  config,
+  lib,
+  namespace,
+  ...
+}:

 let
-  cfg = config.aux.system.services.ssh;
+  cfg = config.${namespace}.services.ssh;
 in
 {
  options = {
-    aux.system.services.ssh = {
+    ${namespace}.services.ssh = {
      enable = lib.mkEnableOption "Enables SSH server.";
      ports = lib.mkOption {
        default = [ 22 ];
--- a/modules/nixos/services/syncthing/default.nix
+++ b/modules/nixos/services/syncthing/default.nix
@ -1,12 +1,17 @@
 # See https://wiki.nixos.org/wiki/Syncthing
-{ config, lib, ... }:
+{
+  config,
+  lib,
+  namespace,
+  ...
+}:

 let
-  cfg = config.aux.system.services.syncthing;
+  cfg = config.${namespace}.services.syncthing;
 in
 {
  options = {
-    aux.system.services.syncthing = {
+    ${namespace}.services.syncthing = {
      enable = lib.mkEnableOption "Enables Syncthing.";
      enableTray = lib.mkEnableOption "Enables the Syncthing Tray applet.";
      home = lib.mkOption {
@ -36,7 +41,7 @@ in
    networking.firewall.allowedTCPPorts = with cfg.web; lib.mkIf (enable && public) [ port ];

    services = {
-      flatpak.packages = lib.mkIf (config.aux.system.ui.flatpak.enable && cfg.enableTray) [
+      flatpak.packages = lib.mkIf (config.${namespace}.ui.flatpak.enable && cfg.enableTray) [
        "io.github.martchus.syncthingtray"
      ];

--- a/modules/nixos/services/virtualization/default.nix
+++ b/modules/nixos/services/virtualization/default.nix
@ -3,15 +3,16 @@
  config,
  lib,
  pkgs,
+  namespace,
  ...
 }:

 let
-  cfg = config.aux.system.services.virtualization;
+  cfg = config.${namespace}.services.virtualization;
 in
 {
  options = {
-    aux.system.services.virtualization = {
+    ${namespace}.services.virtualization = {
      enable = lib.mkEnableOption "Enables virtualization tools on this host.";
      host = {
        enable = lib.mkEnableOption "Enables virtual machine hosting.";
--- a/modules/nixos/system/bluetooth/default.nix
+++ b/modules/nixos/system/bluetooth/default.nix
@ -3,16 +3,17 @@
  lib,
  config,
  pkgs,
+  namespace,
  ...
 }:

 let
-  cfg = config.aux.system.bluetooth;
+  cfg = config.${namespace}.bluetooth;
 in
 {

  options = {
-    aux.system.bluetooth = {
+    ${namespace}.bluetooth = {
      enable = lib.mkEnableOption "Enables bluetooth.";
      experimental.enable = lib.mkEnableOption "Enables experimental features, like device power reporting.";
    };
--- a/modules/nixos/system/bootloader/default.nix
+++ b/modules/nixos/system/bootloader/default.nix
@ -4,17 +4,18 @@
  config,
  lib,
  pkgs,
+  namespace,
  ...
 }:

 # Bootloader
 let
-  cfg = config.aux.system.bootloader;
+  cfg = config.${namespace}.bootloader;
 in
 {

  options = {
-    aux.system.bootloader = {
+    ${namespace}.bootloader = {
      enable = lib.mkOption {
        description = "Automatically configures the bootloader. Set to false to configure manually.";
        type = lib.types.bool;
--- a/modules/nixos/system/default.nix
+++ b/modules/nixos/system/default.nix
@ -3,16 +3,17 @@
  pkgs,
  config,
  lib,
+  namespace,
  ...
 }:
 let
-  cfg = config.aux.system;
+  cfg = config.${namespace};

  gitWithLibsecret = pkgs.git.override { withLibsecret = true; };
 in
 {
  options = {
-    aux.system = {
+    ${namespace} = {
      packages = lib.mkOption {
        description = "Additional system packages to install. This is just a wrapper for environment.systemPackages.";
        type = lib.types.listOf lib.types.package;
@ -71,7 +72,7 @@ in
        autodetect = true;
        notifications = {
          wall.enable = true;
-          mail = lib.mkIf config.aux.system.services.msmtp.enable {
+          mail = lib.mkIf config.${namespace}.services.msmtp.enable {
            enable = true;
            mailer = "/run/wrappers/bin/sendmail";
            sender = "${config.networking.hostName}@${config.secrets.networking.domains.primary}";
--- a/modules/nixos/system/editor/default.nix
+++ b/modules/nixos/system/editor/default.nix
@ -1,12 +1,17 @@
 # Basic system-wide text editor configuration.
-{ config, lib, ... }:
+{
+  config,
+  lib,
+  namespace,
+  ...
+}:

 let
-  cfg = config.aux.system.editor;
+  cfg = config.${namespace}.editor;
 in
 {
  options = {
-    aux.system.editor = lib.mkOption {
+    ${namespace}.editor = lib.mkOption {
      description = "Selects the default text editor.";
      default = "nano";
      type = lib.types.enum [
--- a/modules/nixos/system/filesystem/default.nix
+++ b/modules/nixos/system/filesystem/default.nix
@ -1,6 +1,11 @@
-{ lib, config, ... }:
+{
+  lib,
+  config,
+  namespace,
+  ...
+}:
 let
-  cfg = config.aux.system.filesystem;
+  cfg = config.${namespace}.filesystem;

  # LUKS partition will decrypt to /dev/mapper/nixos-root
  decryptPart = "nixos-root";
@ -14,7 +19,7 @@ let
 in
 {
  options = {
-    aux.system.filesystem = {
+    ${namespace}.filesystem = {
      enable = lib.mkEnableOption "Enables standard BTRFS subvolumes and parameters.";
      partitions = {
        boot = lib.mkOption {
@ -60,7 +65,7 @@ in
    boot.initrd.luks.devices.${decryptPart} = {
      device = cfg.partitions.luks;
      # Enable TPM auto-unlocking if configured
-      crypttabExtraOpts = lib.mkIf config.aux.system.bootloader.tpm2.enable [ "tpm2-device=auto" ];
+      crypttabExtraOpts = lib.mkIf config.${namespace}.bootloader.tpm2.enable [ "tpm2-device=auto" ];
    };
    fileSystems = {
      "/" = {
--- a/modules/nixos/system/gpu/default.nix
+++ b/modules/nixos/system/gpu/default.nix
@ -0,0 +1,110 @@
+# Enables AMD GPU support.
+{
+  pkgs,
+  config,
+  lib,
+  namespace,
+  ...
+}:
+let
+  cfg = config.${namespace}.gpu;
+in
+{
+  options = {
+    ${namespace}.gpu = {
+      amd.enable = lib.mkEnableOption "Enables AMD GPU support.";
+      intel.enable = lib.mkEnableOption "Enables Intel GPU support.";
+      nvidia = {
+        enable = lib.mkEnableOption "Enables Nvidia GPU support.";
+        hybrid = {
+          enable = lib.mkEnableOption "Enables hybrid GPU support.";
+          sync = lib.mkEnableOption "Enables sync mode for faster performance at the cost of higher battery usage.";
+          busIDs = {
+            nvidia = lib.mkOption {
+              description = "The bus ID for your Nvidia GPU.";
+              type = lib.types.str;
+              example = "PCI:0:2:0";
+              default = "";
+            };
+            intel = lib.mkOption {
+              description = "The bus ID for your integrated Intel GPU. If you don't have an Intel GPU, you can leave this blank.";
+              type = lib.types.str;
+              example = "PCI:14:0:0";
+              default = "";
+            };
+            amd = lib.mkOption {
+              description = "The bus ID for your integrated AMD GPU. If you don't have an AMD GPU, you can leave this blank.";
+              type = lib.types.str;
+              example = "PCI:54:0:0";
+              default = "";
+            };
+          };
+        };
+      };
+    };
+  };
+
+  config = lib.mkMerge [
+    (lib.mkIf cfg.amd.enable {
+      boot.initrd.kernelModules = [ "amdgpu" ];
+      services.xserver.videoDrivers = [ "amdgpu" ];
+
+      hardware.graphics = {
+        enable = true;
+        # 32-bit application compatibility
+        enable32Bit = true;
+      };
+    })
+
+    (lib.mkIf cfg.intel.enable {
+      services.xserver.videoDrivers = [ "intel" ];
+
+      hardware.graphics = {
+        enable = true;
+        extraPackages = with pkgs; [
+          intel-media-driver
+          vpl-gpu-rt
+        ];
+        extraPackages32 = with pkgs.driversi686Linux; [
+          intel-media-driver
+          vpl-gpu-rt
+        ];
+      };
+    })
+    (lib.mkIf cfg.nvidia.enable {
+      assertions = [
+        {
+          assertion = (cfg.nvidia.hybrid.busIDs.nvidia != "");
+          message = "You need to define a bus ID for your Nvidia GPU. To learn how to find the bus ID, see https://wiki.nixos.org/wiki/Nvidia#Configuring_Optimus_PRIME:_Bus_ID_Values_.28Mandatory.29.";
+        }
+        {
+          assertion = (cfg.nvidia.hybrid.busIDs.intel != "" || cfg.nvidia.hybrid.busIDs.amd != "");
+          message = "You need to define a bus ID for your non-Nvidia GPU. To learn how to find your bus ID, see https://wiki.nixos.org/wiki/Nvidia#Configuring_Optimus_PRIME:_Bus_ID_Values_.28Mandatory.29.";
+        }
+      ];
+
+      services.xserver.videoDrivers = lib.mkDefault [ "nvidia" ];
+      hardware = {
+        opengl.extraPackages = with pkgs; [ vaapiVdpau ];
+        nvidia = {
+          modesetting.enable = true;
+          nvidiaSettings = config.${namespace}.ui.desktops.enable;
+          package = config.boot.kernelPackages.nvidiaPackages.stable;
+          prime = lib.mkIf cfg.nvidia.hybrid.enable {
+
+            offload = lib.mkIf (!cfg.nvidia.hybrid.sync) {
+              enable = true;
+              enableOffloadCmd = true; # Provides `nvidia-offload` command.
+            };
+
+            sync.enable = cfg.nvidia.hybrid.sync;
+
+            nvidiaBusId = cfg.nvidia.hybrid.busIDs.nvidia;
+            intelBusId = cfg.nvidia.hybrid.busIDs.intel;
+            amdgpuBusId = cfg.nvidia.hybrid.busIDs.amd;
+          };
+        };
+      };
+    })
+  ];
+}
--- a/modules/nixos/system/networking/default.nix
+++ b/modules/nixos/system/networking/default.nix
@ -1,5 +1,5 @@
 # Configure basic networking options.
-{ lib, ... }:
+{ lib, namespace, ... }:
 {
  networking = {
    # Default to DHCP. Set to false to use static IPs.
--- a/modules/nixos/system/nix/default.nix
+++ b/modules/nixos/system/nix/default.nix
@ -4,20 +4,21 @@
  inputs,
  lib,
  pkgs,
+  namespace,
+  system,
  ...
 }:

 let
-  cfg = config.aux.system;
+  cfg = config.${namespace};

  nixos-operations-script = pkgs.writeShellScriptBin "nixos-operations-script" (
-    builtins.readFile ../../bin/nixos-operations-script.sh
+    builtins.readFile ../../../../bin/nixos-operations-script.sh
  );
 in
 {
  options = {
-    aux.system = {
-      allowUnfree = lib.mkEnableOption "Allow unfree packages to install.";
+    ${namespace} = {
      retentionPeriod = lib.mkOption {
        description = "How long to retain NixOS generations. Defaults to one month.";
        type = lib.types.str;
@ -28,10 +29,12 @@ in
  };
  config = lib.mkMerge [
    {
-      nixpkgs.config.allowUnfree = cfg.allowUnfree;
      nix = {
-        extraOptions = ''
+        # Use Lix in place of Nix
+        package = inputs.lix.packages.${system}.default;
+
        # Ensure we can still build when secondary caches are unavailable
+        extraOptions = ''
          fallback = true
        '';

@ -62,14 +65,14 @@ in
          # Only allow these users to use Nix
          allowed-users = with config.users.users; [
            root.name
-            (lib.mkIf config.aux.system.users.aires.enable aires.name)
-            (lib.mkIf config.aux.system.users.gremlin.enable gremlin.name)
+            (lib.mkIf config.${namespace}.users.aires.enable aires.name)
+            (lib.mkIf config.${namespace}.users.gremlin.enable gremlin.name)
          ];

          # Avoid signature verification messages when doing remote builds
          trusted-users = with config.users.users; [
            root.name
-            (lib.mkIf config.aux.system.users.aires.enable aires.name)
+            (lib.mkIf config.${namespace}.users.aires.enable aires.name)
          ];
        };

@ -94,7 +97,7 @@ in
    }
    (lib.mkIf cfg.nixos-operations-script.enable {
      # Enable and configure NOS
-      aux.system.packages = [ nixos-operations-script ];
+      ${namespace}.packages = [ nixos-operations-script ];
      environment.variables."FLAKE_DIR" = config.secrets.nixConfigFolder;
    })
  ];
--- a/modules/nixos/system/raid/default.nix
+++ b/modules/nixos/system/raid/default.nix
@ -1,11 +1,16 @@
-{ lib, config, ... }:
+{
+  lib,
+  config,
+  namespace,
+  ...
+}:
 let
-  cfg = config.aux.system.raid;
+  cfg = config.${namespace}.raid;
 in
 {

  options = {
-    aux.system.raid = {
+    ${namespace}.raid = {
      enable = lib.mkEnableOption "Enables RAID support.";
      storage = {
        enable = lib.mkEnableOption "Enables support for the storage array.";
@ -28,7 +33,7 @@ in
  config = lib.mkMerge [
    (lib.mkIf cfg.enable { boot.swraid.enable = true; })
    (lib.mkIf cfg.storage.enable {
-      aux.system.raid.enable = true;
+      ${namespace}.raid.enable = true;
      boot.swraid.mdadmConf = ''
        ARRAY /dev/md/Sapana metadata=1.2 UUID=51076daf:efdb34dd:bce48342:3b549fcb
        MAILADDR ${cfg.storage.mailAddr}
--- a/modules/nixos/ui/audio/default.nix
+++ b/modules/nixos/ui/audio/default.nix
@ -3,15 +3,16 @@
  pkgs,
  lib,
  config,
+  namespace,
  ...
 }:

 let
-  cfg = config.aux.system.ui.audio;
+  cfg = config.${namespace}.ui.audio;
 in
 {
  options = {
-    aux.system.ui.audio = {
+    ${namespace}.ui.audio = {
      enable = lib.mkEnableOption "Enables audio.";
      enableLowLatency = lib.mkEnableOption "Enables low-latency audio (may cause crackling) per https://wiki.nixos.org/wiki/PipeWire#Low-latency_setup.";
    };
--- a/modules/nixos/ui/desktops/budgie/default.nix
+++ b/modules/nixos/ui/desktops/budgie/default.nix
@ -1,15 +1,20 @@
 # Enables the Budgie desktop environment.
-{ config, lib, ... }:
+{
+  config,
+  lib,
+  namespace,
+  ...
+}:
 let
-  cfg = config.aux.system.ui.desktops.budgie;
+  cfg = config.${namespace}.ui.desktops.budgie;
 in
 {
  options = {
-    aux.system.ui.desktops.budgie.enable = lib.mkEnableOption "Enables the Budgie desktop environment.";
+    ${namespace}.ui.desktops.budgie.enable = lib.mkEnableOption "Enables the Budgie desktop environment.";
  };

  config = lib.mkIf cfg.enable {
-    aux.system.ui.desktops.enable = true;
+    ${namespace}.ui.desktops.enable = true;

    services.xserver = {
      enable = true;
--- a/modules/nixos/ui/desktops/default.nix
+++ b/modules/nixos/ui/desktops/default.nix
@ -3,15 +3,16 @@
  pkgs,
  config,
  lib,
+  namespace,
  ...
 }:

 let
-  cfg = config.aux.system.ui.desktops;
+  cfg = config.${namespace}.ui.desktops;
 in
 {
  options = {
-    aux.system.ui.desktops = {
+    ${namespace}.ui.desktops = {
      enable = lib.mkEnableOption "Enables base desktop environment support.";
      xkb = lib.mkOption {
        description = "The keyboard layout to use by default. Defaults to us.";
@ -25,7 +26,7 @@ in
  };

  config = lib.mkIf cfg.enable {
-    aux.system = {
+    ${namespace} = {
      bluetooth = {
        enable = true;
        experimental.enable = true;
@ -79,7 +80,7 @@ in
        enable = true;

        # Configure keymap in X11
-        xkb = config.aux.system.ui.desktops.xkb;
+        xkb = config.${namespace}.ui.desktops.xkb;
      };

      # Enable touchpad support (enabled by default in most desktop managers, buuuut just in case).
--- a/modules/nixos/ui/desktops/gnome/default.nix
+++ b/modules/nixos/ui/desktops/gnome/default.nix
@ -4,22 +4,23 @@
  pkgs,
  config,
  lib,
+  namespace,
  ...
 }:

 let
-  cfg = config.aux.system.ui.desktops.gnome;
+  cfg = config.${namespace}.ui.desktops.gnome;
 in
 {

  options = {
-    aux.system.ui.desktops.gnome = {
+    ${namespace}.ui.desktops.gnome = {
      enable = lib.mkEnableOption "Enables the Gnome Desktop Environment.";
    };
  };

  config = lib.mkIf cfg.enable {
-    aux.system.ui.desktops.enable = true;
+    ${namespace}.ui.desktops.enable = true;

    # Enable Gnome
    services = {
--- a/modules/nixos/ui/desktops/hyprland/default.nix
+++ b/modules/nixos/ui/desktops/hyprland/default.nix
@ -1,15 +1,20 @@
 # Enables the Hyprland desktop environment.
-{ config, lib, ... }:
+{
+  config,
+  lib,
+  namespace,
+  ...
+}:
 let
-  cfg = config.aux.system.ui.desktops.hyprland;
+  cfg = config.${namespace}.ui.desktops.hyprland;
 in
 {
  options = {
-    aux.system.ui.desktops.hyprland.enable = lib.mkEnableOption "Enables the Hyprland desktop environment.";
+    ${namespace}.ui.desktops.hyprland.enable = lib.mkEnableOption "Enables the Hyprland desktop environment.";
  };

  config = lib.mkIf cfg.enable {
-    aux.system.ui.desktops.enable = true;
+    ${namespace}.ui.desktops.enable = true;

    programs.hyprland = {
      enable = true;
--- a/modules/nixos/ui/desktops/kde/default.nix
+++ b/modules/nixos/ui/desktops/kde/default.nix
@ -3,22 +3,23 @@
  pkgs,
  config,
  lib,
+  namespace,
  ...
 }:

 let
-  cfg = config.aux.system.ui.desktops.kde;
+  cfg = config.${namespace}.ui.desktops.kde;
 in
 {
  options = {
-    aux.system.ui.desktops.kde = {
+    ${namespace}.ui.desktops.kde = {
      enable = lib.mkEnableOption "Enables the KDE Desktop Environment.";
      useX11 = lib.mkEnableOption "Uses X11 instead of Wayland.";
    };
  };

  config = lib.mkIf cfg.enable {
-    aux.system.ui.desktops.enable = true;
+    ${namespace}.ui.desktops.enable = true;

    programs.dconf.enable = true;

--- a/modules/nixos/ui/desktops/xfce/default.nix
+++ b/modules/nixos/ui/desktops/xfce/default.nix
@ -1,15 +1,20 @@
 # Enables the XFCE desktop environment.
-{ config, lib, ... }:
+{
+  config,
+  lib,
+  namespace,
+  ...
+}:
 let
-  cfg = config.aux.system.ui.desktops.xfce;
+  cfg = config.${namespace}.ui.desktops.xfce;
 in
 {
  options = {
-    aux.system.ui.desktops.xfce.enable = lib.mkEnableOption "Enables the XFCE desktop environment.";
+    ${namespace}.ui.desktops.xfce.enable = lib.mkEnableOption "Enables the XFCE desktop environment.";
  };

  config = lib.mkIf cfg.enable {
-    aux.system.ui.desktops.enable = true;
+    ${namespace}.ui.desktops.enable = true;

    services.xserver = {
      enable = true;
--- a/modules/nixos/ui/flatpak/default.nix
+++ b/modules/nixos/ui/flatpak/default.nix
@ -2,16 +2,17 @@
  pkgs,
  config,
  lib,
+  namespace,
  ...
 }:

 # Flatpak support and options
 let
-  cfg = config.aux.system.ui.flatpak;
+  cfg = config.${namespace}.ui.flatpak;
 in
 {
  options = {
-    aux.system.ui.flatpak = {
+    ${namespace}.ui.flatpak = {
      enable = lib.mkEnableOption { description = "Enables Flatpak support."; };
      packages = lib.mkOption {
        description = "Flatpak packages to install.";
@ -72,8 +73,8 @@ in
          aggregatedIcons = pkgs.buildEnv {
            name = "system-icons";
            paths = with pkgs; [
-              (lib.mkIf config.aux.system.ui.desktops.gnome.enable gnome-themes-extra)
-              (lib.mkIf config.aux.system.ui.desktops.kde.enable kdePackages.breeze-icons)
+              (lib.mkIf config.${namespace}.ui.desktops.gnome.enable gnome-themes-extra)
+              (lib.mkIf config.${namespace}.ui.desktops.kde.enable kdePackages.breeze-icons)
              papirus-icon-theme
              qogir-icon-theme
            ];
--- a/modules/nixos/users/aires/default.nix
+++ b/modules/nixos/users/aires/default.nix
@ -1,16 +1,17 @@
 {
  lib,
  config,
+  namespace,
  ...
 }:

 # Define 'aires'
 let
-  cfg = config.aux.system.users.aires;
+  cfg = config.${namespace}.users.aires;
 in
 {
  options = {
-    aux.system.users.aires = {
+    ${namespace}.users.aires = {
      enable = lib.mkEnableOption "Enables aires user account";
      autologin = lib.mkEnableOption "Automatically logs aires in on boot";
    };
@ -66,7 +67,7 @@ in
              userName = config.secrets.users.aires.firstName;
              userEmail = config.secrets.users.aires.email;
              extraConfig = {
-                core.editor = config.aux.system.editor;
+                core.editor = config.${namespace}.editor;
                merge.conflictStyle = "zdiff3";
                pull.ff = "only";
                push.autoSetupRemote = "true";
--- a/modules/nixos/users/aires/face.png
+++ b/modules/nixos/users/aires/face.png
--- a/modules/nixos/users/common/home-manager/gnome.nix
+++ b/modules/nixos/users/common/home-manager/gnome.nix
@ -1,5 +1,4 @@
-{ lib, osConfig, ... }:
-{
+_: {
  # NOTE: Allegedly prevents random Gnome crashes. But really, it just prevents me from logging in.
  # See https://www.reddit.com/r/archlinux/comments/1erbika/fyi_if_you_experience_crashes_on_gnome_on_amd/
  /*
@ -9,7 +8,7 @@
  */

  # Additional Gnome configurations via home-manager.
-  dconf.settings = lib.mkIf osConfig.aux.system.ui.desktops.gnome.enable {
+  dconf.settings = {
    "org/gnome/mutter" = {
      edge-tiling = true;
      workspaces-only-on-primary = false;
--- a/modules/nixos/users/common/home-manager/zsh.nix
+++ b/modules/nixos/users/common/home-manager/zsh.nix
--- a/modules/nixos/users/gremlin/default.nix
+++ b/modules/nixos/users/gremlin/default.nix
@ -2,16 +2,17 @@
  pkgs,
  lib,
  config,
+  namespace,
  ...
 }:

 # Define 'gremlin' user
 let
-  cfg = config.aux.system.users.gremlin;
+  cfg = config.${namespace}.users.gremlin;
 in
 {
  options = {
-    aux.system.users.gremlin = {
+    ${namespace}.users.gremlin = {
      enable = lib.mkEnableOption "Enables gremlin user account";
    };
  };
@ -35,7 +36,7 @@ in
      };

      # Install gremlin-specific flatpaks
-      aux.system.ui.flatpak.packages = [
+      ${namespace}.ui.flatpak.packages = [
        "com.google.Chrome"
        "com.slack.Slack"
      ];
--- a/modules/nixos/users/gremlin/face.png
+++ b/modules/nixos/users/gremlin/face.png
--- a/modules/nixos/users/media/default.nix
+++ b/modules/nixos/users/media/default.nix
@ -1,13 +1,18 @@
-{ lib, config, ... }:
+{
+  lib,
+  config,
+  namespace,
+  ...
+}:

 # Define user for managing media files
 let
-  cfg = config.aux.system.users.media;
+  cfg = config.${namespace}.users.media;
 in
 {

  options = {
-    aux.system.users.media = {
+    ${namespace}.users.media = {
      enable = lib.mkEnableOption "Enables media user account";
    };
  };
--- a/modules/nixos/users/root/default.nix
+++ b/modules/nixos/users/root/default.nix
@ -1,4 +1,4 @@
-{ ... }:
+{ namespace, ... }:
 {
  home-manager.users.root = {
    imports = [ ../common/home-manager/zsh.nix ];
--- a/modules/secrets/Freight-20240828T164047Z-001.zip
+++ b/modules/secrets/Freight-20240828T164047Z-001.zip
--- a/modules/secrets/default.nix
+++ b/modules/secrets/default.nix
@ -1,112 +0,0 @@
-U2FsdGVkX19uO/YPjMlCHQXarQnzeZWOIhvuR/7/nwgPGZu7YTeyyEqzGS0hFNdF
-jIo5a5umjTBPe0gUkAkTecwUFmbVCje2aQ0GmsBzEjsUXJTiM4kpElcWpRfBebtm
-qfh2JTFTAOj2QUB2rYjK2JzwfZpGEWyoG5A3QRukzFnr7I7sUse9sVBQeKnI4put
-/Kpe9tN+tDnf3byU83I7XxE9YECnlTTvF/A2CX4S7xf7Ig56DGH7rFAT3I4NIBkZ
-FOTnIZcgQnBuB0HM/YdDeGsUIaxlDXcpFdj1YnVfrPDMuC245wO8n05YPNuiGEQZ
-+2A0jDVeKWGasORdE19m4ciBRi4A3qgsMmArFvXtWJ+lHBL+510GrvNPlipbX7BM
-c+TwrL6WgSwe0mtsB7e9MzDe6Fod3zQuLZIcD+9tqADP1V6REg8JjMH6fUj7atZ+
-KlgejWbxliG0s1snuzZlVGSUS441ydkXb+takXLOtGBMRD5LDdSquEl9W/LAlAuo
-bBWo+HiwIQjDadr/1zRGCcO1kYgtaFrSFJATTlU/cbfknPhLyTNFZ6ztTaYsHPRm
-uV6TN9+kNHnnVokcp6K48kHmQrNn13r2cHoQCbtcANBXTakMMK2eU183fIA5Djkh
-aXJM/9ygGdF5ItZkg/dd2CQYrTGlAfcYDQOJOD14fbT2SCP+3prrkJE/gRjTdCsF
-YWV5ZGK3JYAdnLftt0IyNAvO+XbMQ0+tXOv4eiuOeDTtBPn6XMTTBqYxBlmydbaG
-y59IoxNErOLoKfjjjbgbPiPpHHUANN05fa3f7j1De0SlhmmGRi0D5MW3hx20KmCa
-lU03g0iSthqew5SVCBnTN16xd1GBTtqX9t9SZj0clEoI5ayfAHPntbjd3/58yJrT
-wp6Q+15Wy00cDDRE9lWCv4zDNa85qTOaHQNFm0GIElJyabIKxnoSn54RmdqccoUS
-SGwU/rO1dfT9umCTiR1VzvkcGypmskw/4UAmHrpmy7iOLtIQ5KNVt6tdetrWDL8F
-r/WVZ7UzmPwbq6qWxV0XyQOLr2VoOp0fYwhoSSaK7gPl1pwVmh5qPxQE8JAI25lJ
-1WuyWQJnI8GDZyxMIKkZVvL4A2vThej2iX1vYiBHvGCL9/G8LPJM9GzEfkZixll4
-S6akUQ/xT6EgPZDR8SxHKlyI3NLrHoF2MRUVz0bS4GH0tevmuDzv844QlUaymUTT
-nM1dN4HHEp+BZlRv4ssECo9xkGCJD9T8UIB+W9GUUGc8w8fQE9MN6RLlbQ+rjTfB
-HC5Q5CAyc67ZdTTM/zBLlld9gMYszU4TFifGVxYHAOXRXWfZvHJUgUwHwe3pWtoR
-kQCL5ovXURzbDTgwg6Y5xC4L5bM5SyPuwJNh3NtpHxJLx0g5NI+hzpoZQ1kfAVxL
-1qu+4F7c1gLu4O/z3fEze/XH9fJ6kZj2XhLYa2WayLqUiOY/nMMww2UanXoAntC5
-YYWTlojrxxwk6bR/QyNCweL66RVSKdBfBtuXehLpYm+ZN45DakaNGt73u4SaMMBf
-CT3ng+8g4Yt0nJafwcKpTyyN2p7kdU3JQ+XhcSu8Iwhk2wAAuI1Amql/6MjMsWVe
-XLOsu0GgHt+8OgnFs8SzKrJxj1ymqre/ExsHk6NlBpRw9j4YMCkl/FSDKOjmuYhZ
-2tPOkOpbOu1ZwvnSWsCoAFNszYfWmUHUyPlu/JAT7E8KU4s+/KFCRUIz/7pyrnl1
-dIfcC/GXc304nz5CY225FH5U8pFmDZpskz0Tr5ZxxGaJ9Zgm0+wm5hUN1zz8Vlly
-BYcKWsj7RaZdya86zEXWS5jJ/fFjMyW2pk8qc3VbFlW5Lr4cNLUPNktn++9LRe3u
-Szh/VfhsRPEEqHY4E+l03+AeLlUs1dTBroX8SRtcsils8IJPa15iKsbEOhG7/eXW
-gwxNcgTzM4olIAxELSDRuQVSYc47p0GcyYOLexHPgfAJ8VIc+LdRdzRXLJ92lpmf
-sBFVWOZYvWu+qUYD55TFE2nsjIjxiwfIS6OIHpqRT2Y/uYYm/CS1NpvzSlhs/CXV
-8KIXVYzqEUBkkX9dAfaf/a7bRw5wjFGLLSB4DheiymY7jLr7FDY2VAFDYp9GQUGb
-jb96zrHfpnHmLi86R2yFh3M808IVDFF1QVCb9YYtrQsjpB2FZJVTs9BmsQxo3cD1
-e9ya/p3fpQPChI/dJrx0x8vo9WICu3AhnrzFMIVXRQRzBVQEtQG0XxiIZ7fYwgRc
-9P96w91m+2zMY+gEHIpa3IRMg/GlVxCeefdmted2GKrYwFqqRJfLTOqS+TRWX33V
-PQfscxNAXnHjTQe1Qs6OCqiDiAHww5/T17smuwMOtc64LI7eGDuegF/hJ3yzGNtE
-w65f5koqmbrh7zx0GjL08nC0T5rcQ8QEIIxrOszFM5n3k2rwFKOmBMS++EIYUdwI
-Vbb/V0qjBTBwIwq+jn4814mFjPEnLlRXUht9ZklMwpLmTvbI/nzIsIO56tudV5fz
-vch3BxpFapDFTvGCiCWxts6u/a0uFD4+DlGzJxlboyH4t7Ql7zTXTImXE96/CVzo
-BXHzjfaKQQ4yW/nyU8kUjVxpqfpqXZlP+SY8VrIWK64Odtlzkv8m9Qxc9eawQO5O
-xgJU+n3j5sOLnVAoUzvedmpS9O1YvHHk7n9ID5ukcM3VUuOEc5rQbVzViJpqHdEC
-4tnBLdSJALA9BktThAsovoPZ4rFqmwOvnE9B43byr+MhMqJMS5IJHMoEC2x9j5n5
-tsL+UdvF0OYqwjOblC/bQNgOvOUAgMe8tLkCp15eftQHkb3TIeoBTCiKvnfG0QoE
-exgEKqRHulfyDm46J9/sJQWKgbkjr2QZjKygfiO0M6Q/L7VgzGmKqzFtj9UBgfyo
-YZxnSuDLF5hK8rfMBHYzYrqrVK50R/1Ze+jQz9a7SScuFe/602wDmImtNG7MAh+R
-fUQaDPd3y3+6c7IVqZXiKjRr0zJqh3hv3qClQTu3V9SnRdYTVEspfJDIFHmpnrvg
-lconIcsVo3A4+VFv310SVGfsyxg02gajwkMZyKtejcuCgafH7jDb8AzUon+IImtz
-sATwbeyoiu9UzSLRiz2X798na/V1AXDGb4JKEdTTO84CNc2JtYeOA9uOPRJX7j61
-OUKt9CVMfwNI2jk6nFhrohXZoBHm2pOh3fU0XWkBS3hr1Fv380Fb/i7kQrWlBwQg
-iuFVAs1HQFbhT66cLcnP85uxYkAVs1wLgfN99NNxVdYH2aH/NmRBZoVHG/CaiVtH
-LyjR7mymLZUtozZm7X9a6v8CmY7bIMfcHvrmlsvw721cxsgDN7tT0PJWYFFmIvdX
-9DsfVXEcsP/Vz87IOE4ijmiU/W6Odu05dIA8Ce8M22P+y17L/v5gBifxfh3oQsGp
-v0BNSEwJReDJKlnZYHPlyXmfRA7sIR+si+x+RDll/9NzY8Za+6Att9GXDN8geuI0
-QKuQ8X4CO7Y1KQzgHJFCFg2FB1LsBHB221/qPRWjFGn5umruqtve4lB7dffqC/Po
-HwfliAux8JXs+7Ob7kVkcPo2qQguwBWAJdyvWPnCXRA3jXAsoNh4lIuKhX8tqhnQ
-u603HYT1rD64N4uU5scjsHkbEt6XwC028MQzlQ1cEQ8IN3veSMiCVbCBjMGzG4is
-ZCvGt0Vh5Le1P0i6MZlNBUQiU+uhhEXi1QsDaqKK/syQQZDfnAgkH/Pi6Q53DZvx
-7O0JdVtFvXIwVp4ZNyH/SKyFVBV+MkEtr777W6tA9QzzuxzwBkNvAqnn/XrJrMFD
-/jOUsxuQCcOr3K+7MktLUapHY2tMxOSMdQkTdTWbvBzH+OxQI8hdmm/oDjOmbd/o
-ABnY7MGenZJ11bP/3mGnG3P5QrH850kyO3RB9yifTrnnL9gUghfcAIgk6nAW1bjW
-B/VaWDpDXicl097rPw2MwbrOeYyteiDcdk+gdRbCDRSh9FptzBeDIBlBpCOCZbqF
-+6saGPeGo/Lhc90JEGTJ4kxZHRA8paLmRo49uW+WYT97SY0qjb8O+kgx12OilpQT
-4h6zdTcSac5cMzr98nZ+aJr4K8OytoO1Cm3Lw55/oDj5U4KCEGPlFd4YZ7HNr1Ck
-z/06FULfqTU5t9Cn81haNmYkfulTOZSxN6PhWEhP4pKRISsQrYUZu9SaCsNSnDpv
-5xdWcoHELyZU1NZGwS+5xHb4Znzf1rHVv5f3HJrBmkaRMIYe18rGUxf30aQQdg8D
-QXA8+ge6fdYUTdKsULkavF+4Q6CqzrcGCfLak5E/XHuTEgpxlyAKgMa1UpjqZnfL
-w6VOy8IOUyjCHe/pLd2/pTaijw81nvwpd9qs6a/6xcuAOGkRJq5UNrscGX9LNGCw
-6W+lh+BNA/cUmXKlc0JjDCb32igkHoVKjarb3DjFkk5R6X8nGPmqUy8tEvMZL+nu
-VZK0ZBcAU9Xd6TRKJ2I+YCR8qR/4WJ2BaMBPt7TSMnzBl1lkEoMkJSxECb3tgUcJ
-0DHcUiBOeOl/pMvWML+kwPjW1PdbdDV/n9Rq6WHzR07Kr0/gklkaH7vv9GtT1S+z
-pY67xtHxnJcZpm/OUgnQErom13PVBhjTi1BHKuYelhJ6KPCOi8pglY4IN5HW6MLJ
-nioGWXRPAmJPCfLLe4KWLJ2qrwiz4dQRL77JzRIJFbOVhdrlx0n9pJpYIZznn0Nr
-ij1EgULJAqxoP1nhR6q6rU2V20VNX9s4hOTUxeCJGMrdiwUcmu9c7nb1DwNsZDP7
-k3zRmOw8fz4OBYgpxsGe7lnnmorSkSzx5sL9bgImbqDzb5QER2KJLHF/liys5S8c
-NpnPUGb7xwhhz0UxSIYjpaW5fDXmHF6s5zequZFtv9T6Njmwh0MAetC/T2G312Yu
-ev+kCykVi3i1BaJZjTAD4ni12QA+l7WFLy+m9ZCQNW83RAp2hhZ2fl9629JLQl9Y
-RX54k3ZNy9U9u5Ka06x49dhcDL0yVQRcuyFeuwqdbqLioBS1EUyh345h7HtMVPFX
-gWWky3QR7dgvP9LmJvOlOdVKFRPYVdYEVgXwTWR+2z9LneO0TukeJsV9MNbK+dv7
-WC+7DuhMrSoTRB5qEeHWRQSLkueI6wxfnTw7Hb9TuoXypQRTR0sptdV4vxCEQx1f
-Kg1iU/ECdVlwhNGe9/G39EdFvGbtAcUZpRfbK4nk37xSRFT8jw9FS12kOjFVaQTJ
-/Rxucm3mUBXs8glp7FJxQaqIHFDqHgOg/9GbLKqUPXancz8+9+kc7W7josPtlaTd
-I/Z2PDnmG05mE5O8VWlyGQr2Edulr6Xw6y2OeJACw0dtbUEciytNhQZ0TSnb/kTg
-FcwL53khw/n32MWWhrMVgbl7e+eJtU4FPNB9XgkcQwnAMUXsAsXFHl0expdRUbyo
-FVvsECtVLEFZZbSWFMseWdCmHwmjXv5ENA/riJ+EdJVtZm+D49eiVKY0Hf1ycX5v
-PDVYd/pX0aSkJHbJR31lC1V4LLL0FmwqFPj3dNA787nY7kaY1LZddFCOtCgf26QC
-VgsXONYxKYS6h19QDqWz81Ysm+pJ+0bPgCExrdI7pEynsk+7RrCGtxt2nkWZUXW/
-ESFqtQcMGzBIQYOTBXNI+/PSiiLxcnfe5mCjGGRun9COh49l31m8qegnZZV7aUUH
-0TsvOf4it81QqptodrkSycvnKEwKRnwa4MDMLH0Di5mi5ktr0gfWg6KiHCXAE2IY
-lvblv/aTqu8VQoGPqwS4UiEPDLVpsLPKU+xQvQAxtowxy35Qydwy6UuA5kP7YQwQ
-RZwXyEjJmxD3797mEQDjESD8sCUF8c/B5Nm8H9ZzNqi/XnMF2wq6MNUmjebw0//s
-3U4HTvsTbDhIR3X79oh25TEs8l5UrZ4q08WOfDqYfKORp8qcvAL6fU1WG4H9Sh/x
-t8hVqfRjInqRKA2E0cxmzXWkpBHO2BBYbjS97ghZ2IfLZcPPKqcAiMBn0D9CedM0
-Idb3GSfS9BYfiVtIwl9DM75tL01QoqOufUkfsGe0D4uKdaRqUxcAtI6IOpB9Qh/6
-ZZ3QBioSiMect6FpC4mGVQ3T7bigr8ao7VPNLq1RHG+18HdG31w8zsKzo1KPwnfX
-fPNIIn1E4+SeDuUUTCHFbQvPc6XFDY1osyDcEgdZr0RfUHdJLRvGu9bbK0w9AtIR
-evHlmwIxRnxwp1WSySP0x32j5pC+/kD8Ka4cl4je1JwpwdAHhi4uFspafe1bLRZ4
-QYJqn/J9GWS6uXOEWSGF7wmtmUkf3Xu+uww1lD+lg1cMfMw9M+SLCAnTYvmz7gAz
-AtT4bzPi87rJ4nEaKcalyTqHk+rOSLkZBbiwabAAmRld5V3krDvvuPH4lyZLt2Z9
-vkt0rI4McNzwRaMYjCkMvTiJdEJjIuYvSyf6lJ5R07bAval2JeT3m9vfKB8aoLda
-lZNY+c/YHPGWhRknL903c8ABifoNnMIKKmXET16iUcseBmLwLhOxo+eovZwN33uV
-leCpBTo00C7VrRxx8xeNR7GBsW9qSss+K1zPNr+snWXOQcN2hi4n+89jL2Lvzq/U
-2RIDxvejnApHTcpF9Aj1GISw9B57VAWXhMLE16FPYPF7NuhJz00eRWf0RRylmr1s
-W0ArForEI+tvKQmkL+FLezTEzNBsXckxdDV7r2VvBJrhhIE92022VsCtYaufw68W
-bDZHJ2ngdSfDvr4MLtFqZk77kRbVJMNbLrHal/l33hujdMWBCplE1eCWyIyfrVtU
-qjMLxd2S8bRutPGyqjF6WKdsWVeAtIbbC6utdrJJidEnB2RXNYYYD2xQRfAPfKZN
-n8o+5BVVniTugounVX7yCwT6bbGAigodtNDYjNw8TuWAPBRXWUXuqYd1fNvwSuu2
-NVL4Kz0Y8TqIJlaSqERtvloEb3iaDu82zxDEKCKwzSXd3tzbkF9wM7wVAh1VfZJx
-5ab+d1+nDjffafKt1c3+npusiAWfKyZiSogzutgRn6dI37QcYGE3NAs+H/IS7a0R
-b7E1OKe1sYaR0h4tfHJ+SfOC1msK5itiMWqiUaHDuEBcmn1qGSwhPePJ4D5U1380
-949SQ0Wo9LF2FC7n32+ntPXBTWbBNvAcz4qNMqxzojumPLCRtr5+GDnf34sEsBTS
-jNVB5ZTZKUBcOrReUGC2X1bigbRE7corL19dkEaxzZI=
--- a/modules/system/gpu/amd.nix
+++ b/modules/system/gpu/amd.nix
@ -1,26 +0,0 @@
-# Enables AMD GPU support.
-{
-  pkgs,
-  config,
-  lib,
-  ...
-}:
-let
-  cfg = config.aux.system.gpu.amd;
-in
-{
-  options = {
-    aux.system.gpu.amd.enable = lib.mkEnableOption "Enables AMD GPU support.";
-  };
-
-  config = lib.mkIf cfg.enable {
-    boot.initrd.kernelModules = [ "amdgpu" ];
-    services.xserver.videoDrivers = [ "amdgpu" ];
-
-    hardware.graphics = {
-      enable = true;
-      # 32-bit application compatibility
-      enable32Bit = true;
-    };
-  };
-}
--- a/modules/system/gpu/intel.nix
+++ b/modules/system/gpu/intel.nix
@ -1,33 +0,0 @@
-# Enables Intel GPU support.
-# https://wiki.nixos.org/wiki/Intel_Graphics
-# https://nixos.org/manual/nixos/stable/#sec-x11--graphics-cards-intel
-{
-  pkgs,
-  config,
-  lib,
-  ...
-}:
-let
-  cfg = config.aux.system.gpu.intel;
-in
-{
-  options = {
-    aux.system.gpu.intel.enable = lib.mkEnableOption "Enables Intel GPU support.";
-  };
-
-  config = lib.mkIf cfg.enable {
-    services.xserver.videoDrivers = [ "intel" ];
-
-    hardware.graphics = {
-      enable = true;
-      extraPackages = with pkgs; [
-        intel-media-driver
-        vpl-gpu-rt
-      ];
-      extraPackages32 = with pkgs.driversi686Linux; [
-        intel-media-driver
-        vpl-gpu-rt
-      ];
-    };
-  };
-}
--- a/modules/system/gpu/nvidia.nix
+++ b/modules/system/gpu/nvidia.nix
@ -1,80 +0,0 @@
-# Enables Nvidia GPU support.
-{
-  pkgs,
-  config,
-  lib,
-  ...
-}:
-let
-  cfg = config.aux.system.gpu.nvidia;
-in
-{
-  options = {
-    aux.system.gpu.nvidia = {
-      enable = lib.mkEnableOption "Enables Nvidia GPU support.";
-      hybrid = {
-        enable = lib.mkEnableOption "Enables hybrid GPU support.";
-        sync = lib.mkEnableOption "Enables sync mode for faster performance at the cost of higher battery usage.";
-        busIDs = {
-          nvidia = lib.mkOption {
-            description = "The bus ID for your Nvidia GPU.";
-            type = lib.types.str;
-            example = "PCI:0:2:0";
-            default = "";
-          };
-          intel = lib.mkOption {
-            description = "The bus ID for your integrated Intel GPU. If you don't have an Intel GPU, you can leave this blank.";
-            type = lib.types.str;
-            example = "PCI:14:0:0";
-            default = "";
-          };
-          amd = lib.mkOption {
-            description = "The bus ID for your integrated AMD GPU. If you don't have an AMD GPU, you can leave this blank.";
-            type = lib.types.str;
-            example = "PCI:54:0:0";
-            default = "";
-          };
-        };
-      };
-    };
-
-  };
-
-  config = lib.mkIf cfg.enable {
-    assertions = [
-      {
-        assertion = (cfg.hybrid.busIDs.nvidia != "");
-        message = "You need to define a bus ID for your Nvidia GPU. To learn how to find the bus ID, see https://wiki.nixos.org/wiki/Nvidia#Configuring_Optimus_PRIME:_Bus_ID_Values_.28Mandatory.29.";
-      }
-      {
-        assertion = (cfg.hybrid.busIDs.intel != "" || cfg.hybrid.busIDs.amd != "");
-        message = "You need to define a bus ID for your non-Nvidia GPU. To learn how to find your bus ID, see https://wiki.nixos.org/wiki/Nvidia#Configuring_Optimus_PRIME:_Bus_ID_Values_.28Mandatory.29.";
-      }
-    ];
-
-    aux.system.allowUnfree = true;
-
-    services.xserver.videoDrivers = lib.mkDefault [ "nvidia" ];
-    hardware = {
-      opengl.extraPackages = with pkgs; [ vaapiVdpau ];
-      nvidia = {
-        modesetting.enable = true;
-        nvidiaSettings = config.aux.system.ui.desktops.enable;
-        package = config.boot.kernelPackages.nvidiaPackages.stable;
-        prime = lib.mkIf cfg.hybrid.enable {
-
-          offload = lib.mkIf (!cfg.hybrid.sync) {
-            enable = true;
-            enableOffloadCmd = true; # Provides `nvidia-offload` command.
-          };
-
-          sync.enable = cfg.hybrid.sync;
-
-          nvidiaBusId = cfg.hybrid.busIDs.nvidia;
-          intelBusId = cfg.hybrid.busIDs.intel;
-          amdgpuBusId = cfg.hybrid.busIDs.amd;
-        };
-      };
-    };
-  };
-}
--- a/modules/util.nix
+++ b/modules/util.nix
@ -1,25 +0,0 @@
-# Utility and helper functions
-{
-  lib,
-  ...
-}:
-
-{
-  nixpkgs.overlays = [
-    (final: _prev: {
-      # Define custom functions using 'pkgs.util'
-      util = {
-        # Parses the domain from a URI
-        getDomainFromURI =
-          url:
-          let
-            parsedURL = (lib.strings.splitString "." url);
-          in
-          builtins.concatStringsSep "." [
-            (builtins.elemAt parsedURL 1)
-            (builtins.elemAt parsedURL 2)
-          ];
-      };
-    })
-  ];
-}
--- a/overlays/pkgs/unstable/default.nix
+++ b/overlays/pkgs/unstable/default.nix
@ -0,0 +1,10 @@
+{ channels, inputs, ... }:
+
+final: prev:
+
+{
+  unstable = import inputs.nixpkgs-unstable {
+    system = final.system;
+    config.allowUnfree = true;
+  };
+}
--- a/packages/duplicacy-web/default.nix
+++ b/packages/duplicacy-web/default.nix
--- a/packages/freight-pro/default.nix
+++ b/packages/freight-pro/default.nix
@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
  nativeBuildInputs = [ pkgs.unzip ];
  buildInputs = [ pkgs.unzip ];

-  src = ../modules/secrets/Freight-20240828T164047Z-001.zip;
+  src = ../../modules/nixos/secrets/Freight-20240828T164047Z-001.zip;

  unpackPhase = ''
    runHook preUnpack
--- a/packages/languagetool-ngrams/default.nix
+++ b/packages/languagetool-ngrams/default.nix
--- a/systems/aarch64-linux/Pihole/default.nix
+++ b/systems/aarch64-linux/Pihole/default.nix
@ -2,6 +2,7 @@
  config,
  pkgs,
  lib,
+  namespace,
  ...
 }:
 let
@ -24,7 +25,7 @@ in
    };
  };

-  aux.system = {
+  ${namespace} = {
    bootloader.enable = false; # Bootloader configured in hardware-configuration.nix
    packages = with pkgs; [
      libraspberrypi
--- a/systems/aarch64-linux/Pihole/hardware-configuration.nix
+++ b/systems/aarch64-linux/Pihole/hardware-configuration.nix
@ -1,6 +1,11 @@
 # Raspberry Pi 4B
 # See https://wiki.nixos.org/wiki/NixOS_on_ARM/Raspberry_Pi_4
-{ lib, modulesPath, ... }:
+{
+  lib,
+  modulesPath,
+  namespace,
+  ...
+}:

 {
  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
--- a/hosts/configuration.nix.template
+++ b/hosts/configuration.nix.template
@ -4,6 +4,7 @@
  home-manager,
  lib,
  config,
+  namespace,
  ...
 }:
 let
@ -22,8 +23,7 @@ in
  networking.hostName = hostName;

  # Configure the system here.
-  aux.system = {
-    role = "workstation";
+  config.${namespace} = {
    apps = {
      # Define applications here
    };
--- a/systems/hardware-configuration.nix.template
+++ b/systems/hardware-configuration.nix.template
@ -29,7 +29,7 @@ in
  };

  # Configure the main filesystem.
-  aux.system.filesystem = {
+  ${namespace}.filesystem = {
    enable = true;
    partitions = {
      boot = "/dev/disk/by-uuid/${bootUUID}";
--- a/systems/x86_64-linux/Hevana/default.nix
+++ b/systems/x86_64-linux/Hevana/default.nix
@ -2,6 +2,7 @@
  config,
  lib,
  pkgs,
+  namespace,
  ...
 }:

@ -32,7 +33,7 @@ let
  */
  serviceList = lib.attrsets.collect (
    x: x != "acme" && (lib.attrsets.matchAttrs { enable = true; } x)
-  ) config.aux.system.services;
+  ) config.${namespace}.services;
  subdomains = builtins.catAttrs "url" serviceList;

 in
@ -75,7 +76,7 @@ in
      Type = "oneshot";
      User = "aires";
    };
-    path = config.aux.system.corePackages;
+    path = config.${namespace}.corePackages;
    script = ''
      /run/current-system/sw/bin/nixos-operations-script --operation build --hostname Khanda --flake ${config.secrets.nixConfigFolder}
    '';
@ -92,12 +93,7 @@ in
  };

  # Configure the system.
-  aux.system = {
-    # Enable to allow unfree (e.g. closed source) packages.
-    # Some settings may override this (e.g. enabling Nvidia GPU support).
-    # https://nixos.org/manual/nixpkgs/stable/#sec-allow-unfree
-    allowUnfree = true;
-
+  ${namespace} = {
    # Enable Secure Boot support.
    bootloader = {
      enable = true;
--- a/systems/x86_64-linux/Hevana/etc/apcupsd.conf
+++ b/systems/x86_64-linux/Hevana/etc/apcupsd.conf
--- a/systems/x86_64-linux/Hevana/hardware-configuration.nix
+++ b/systems/x86_64-linux/Hevana/hardware-configuration.nix
@ -1,5 +1,5 @@
 # Minisforum UM340
-{ modulesPath, ... }:
+{ modulesPath, namespace, ... }:
 let
  bootUUID = "D2E7-FE8F"; # The UUID of the boot partition.
  luksUUID = "7b9c756c-ba9d-43fc-b935-7c77a70f5f1b"; # The UUID of the locked LUKS partition.
@ -30,7 +30,7 @@ in
  };

  # Configure the main filesystem.
-  aux.system.filesystem = {
+  ${namespace}.filesystem = {
    enable = true;
    partitions = {
      boot = "/dev/disk/by-uuid/${bootUUID}";
--- a/systems/x86_64-linux/Khanda/default.nix
+++ b/systems/x86_64-linux/Khanda/default.nix
@ -1,4 +1,4 @@
-{ config, ... }:
+{ config, namespace, ... }:

 let
  # Do not change this value! This tracks when NixOS was installed on your system.
@ -13,12 +13,7 @@ in

  ###*** Configure your system below this line. ***###
  # Configure the system.
-  aux.system = {
-    # Enable to allow unfree (e.g. closed source) packages.
-    # Some settings may override this (e.g. enabling Nvidia GPU support).
-    # https://nixos.org/manual/nixpkgs/stable/#sec-allow-unfree
-    allowUnfree = true;
-
+  ${namespace} = {
    apps = {
      development.enable = true;
      media.enable = true;
--- a/systems/x86_64-linux/Khanda/hardware-configuration.nix
+++ b/systems/x86_64-linux/Khanda/hardware-configuration.nix
@ -4,6 +4,7 @@
  lib,
  pkgs,
  modulesPath,
+  namespace,
  ...
 }:
 let
@ -56,7 +57,7 @@ in
  };

  # Configure the main filesystem.
-  aux.system.filesystem = {
+  ${namespace}.filesystem = {
    enable = true;
    partitions = {
      boot = "/dev/disk/by-uuid/${bootUUID}";
--- a/systems/x86_64-linux/Shura/default.nix
+++ b/systems/x86_64-linux/Shura/default.nix
@ -1,4 +1,9 @@
-{ config, pkgs, ... }:
+{
+  config,
+  pkgs,
+  namespace,
+  ...
+}:
 let
  # Do not change this value! This tracks when NixOS was installed on your system.
  stateVersion = "24.05";
@ -14,14 +19,16 @@ in
  system.stateVersion = stateVersion;
  networking.hostName = hostName;

-  custom-fonts.Freight-Pro.enable = config.aux.system.users.gremlin.enable;
+  custom-fonts.Freight-Pro.enable = config.${namespace}.users.gremlin.enable;

-  aux.system = {
+  ${namespace} = {
    apps = {
      development.enable = true;
-      dj.enable = true;
      gaming.enable = true;
-      media.enable = true;
+      media = {
+        enable = true;
+        mixxx.enable = true;
+      };
      office.enable = true;
      recording.enable = true;
      social.enable = true;
--- a/systems/x86_64-linux/Shura/hardware-configuration.nix
+++ b/systems/x86_64-linux/Shura/hardware-configuration.nix
@ -1,5 +1,10 @@
 # Lenovo Legion Slim 7 Gen 7 AMD (16ARHA7)
-{ pkgs, modulesPath, ... }:
+{
+  pkgs,
+  modulesPath,
+  namespace,
+  ...
+}:
 let
  bootUUID = "AFCB-D880"; # The UUID of the boot partition.
  luksUUID = "bcf67e34-339e-40b9-8ffd-bec8f7f55248"; # The UUID of the locked LUKS partition.
@ -28,7 +33,7 @@ in
  };

  # Configure the main filesystem.
-  aux.system.filesystem = {
+  ${namespace}.filesystem = {
    enable = true;
    partitions = {
      boot = "/dev/disk/by-uuid/${bootUUID}";
--- a/systems/x86_64-linux/Shura/monitors.xml
+++ b/systems/x86_64-linux/Shura/monitors.xml
--- a/treefmt.nix
+++ b/treefmt.nix
@ -0,0 +1,15 @@
+# Configure formatter for .nix and other repo files
+{ pkgs, ... }:
+{
+  projectRootFile = "flake.nix";
+
+  programs = {
+    beautysh.enable = true;
+    nixfmt = {
+      enable = true;
+      package = pkgs.nixfmt-rfc-style;
+    };
+    prettier.enable = true;
+    yamlfmt.enable = true;
+  };
+}