diff --git a/flake.lock b/flake.lock
index 424ea2d..8a2d8b3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -76,11 +76,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1745114215,
-        "narHash": "sha256-zyWOGf4xefpjcuPFHkWADYioyZ/XJcwyTMoj3/sfcQ0=",
+        "lastModified": 1745232749,
+        "narHash": "sha256-EpM4MNPV0tPqsSrQq1B5EaE0+91MrVXgGS+ct+q/I90=",
         "owner": "chaotic-cx",
         "repo": "nyx",
-        "rev": "85b088ad128e6609f3a672f0e0cd1c76b058227c",
+        "rev": "9117798d3fac3e83568d4d050278fdfb8842879d",
         "type": "github"
       },
       "original": {
@@ -392,11 +392,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1745118045,
-        "narHash": "sha256-c5ppxEk9zBIdWfjSigCp3W/1k0WkOteJicsCt/gWhks=",
+        "lastModified": 1745174874,
+        "narHash": "sha256-356rTt/Z8kuZD0TnROfBvA256SCQYQ8885xB7fYvJZk=",
         "owner": "molarmanful",
         "repo": "kirsch",
-        "rev": "ab53421801bead99c04e85124b5c0059165240ec",
+        "rev": "23a2568a6a2a1af438ecc71b14ccb7f4d7eba7c6",
         "type": "github"
       },
       "original": {
diff --git a/hosts/default.nix b/hosts/default.nix
index bae5938..3eb6a53 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -9,7 +9,7 @@ in
 {
   flake = {
     nixosConfigurations = mkHosts {
-      cityseventeen = {
+      sodomgomorrah = {
         system = "x86_64-linux";
       };
       micronix = {
@@ -18,7 +18,7 @@ in
           inputs.chaotic.nixosModules.default
         ];
       };
-      apeturescience = {
+      tyresidon = {
         system = "x86_64-linux";
       };
     };
diff --git a/hosts/shared/foot.nix b/hosts/shared/foot.nix
index 8727af7..013ce42 100644
--- a/hosts/shared/foot.nix
+++ b/hosts/shared/foot.nix
@@ -17,6 +17,9 @@ in
 
   config = mkIf cfg.enable {
     environment.systemPackages = [ cfg.package ];
-    systemd.packages = [ cfg.package ];
+    systemd = {
+      packages = [ cfg.package ];
+      user.services.foot-server.enable = true;
+    };
   };
 }
diff --git a/hosts/cityseventeen/apps.nix b/hosts/sodomgomorrah/apps.nix
similarity index 100%
rename from hosts/cityseventeen/apps.nix
rename to hosts/sodomgomorrah/apps.nix
diff --git a/hosts/cityseventeen/default.nix b/hosts/sodomgomorrah/default.nix
similarity index 74%
rename from hosts/cityseventeen/default.nix
rename to hosts/sodomgomorrah/default.nix
index fead793..fac1549 100644
--- a/hosts/cityseventeen/default.nix
+++ b/hosts/sodomgomorrah/default.nix
@@ -15,17 +15,18 @@
 
   config = {
     boot = {
-      initrd = {
-        systemd.additionalUpstreamUnits = [ "systemd-boot.service" ];
-        luks.devices = {
-          "luks-c354eb7f-1e69-4054-afa2-8c4e81a761fa" = {
-            device = "/dev/disk/by-uuid/c354eb7f-1e69-4054-afa2-8c4e81a761fa";
-          };
-        };
+      initrd.luks.devices.genesis = {
+        device = "/dev/disk/by-uuid/cfb6d987-8602-4312-a580-00b3205633ca";
+        preLVM = true;
       };
-      loader = {
-        systemd-boot.enable = true;
-        efi.canTouchEfiVariables = true;
+
+      loader.grub = {
+        enable = true;
+        device = "nodev";
+        efiSupport = true;
+        efiInstallAsRemovable = true;
+        enableCryptodisk = true;
+        memtest86.enable = true;
       };
     };
 
@@ -47,10 +48,12 @@
           layout = "us";
           options = "eurosign:e,ctrl:nocaps";
         };
+
         displayManager.gdm = {
           enable = true;
           wayland = true;
         };
+
         windowManager.windowmaker.enable = true;
       };
 
diff --git a/hosts/cityseventeen/fonts.nix b/hosts/sodomgomorrah/fonts.nix
similarity index 100%
rename from hosts/cityseventeen/fonts.nix
rename to hosts/sodomgomorrah/fonts.nix
diff --git a/hosts/cityseventeen/hardware.nix b/hosts/sodomgomorrah/hardware.nix
similarity index 72%
rename from hosts/cityseventeen/hardware.nix
rename to hosts/sodomgomorrah/hardware.nix
index fe1799d..d8196b1 100644
--- a/hosts/cityseventeen/hardware.nix
+++ b/hosts/sodomgomorrah/hardware.nix
@@ -17,34 +17,27 @@
     "xhci_pci"
     "ahci"
     "nvme"
-    "usb_storage"
     "usbhid"
-    "sd_mod"
   ];
-  boot.initrd.kernelModules = [ ];
+  boot.initrd.kernelModules = [ "dm-snapshot" ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" = {
-    device = "/dev/disk/by-uuid/1076cf01-0d74-44fa-b24f-a795191fad83";
+    device = "/dev/disk/by-uuid/a7242725-65af-459f-b9c7-3c228b751edd";
     fsType = "ext4";
   };
 
-  boot.initrd.luks.devices."luks-16d833f7-9082-4bf0-b027-98102c786a01".device =
-    "/dev/disk/by-uuid/16d833f7-9082-4bf0-b027-98102c786a01";
-
   fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/6143-FAFA";
+    device = "/dev/disk/by-uuid/576C-BD72";
     fsType = "vfat";
     options = [
-      "fmask=0077"
-      "dmask=0077"
+      "fmask=0022"
+      "dmask=0022"
     ];
   };
 
-  swapDevices = [
-    { device = "/dev/disk/by-uuid/203bcb2c-a264-4243-9518-d1f975aea05c"; }
-  ];
+  swapDevices = [ ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
diff --git a/hosts/cityseventeen/services/default.nix b/hosts/sodomgomorrah/services/default.nix
similarity index 100%
rename from hosts/cityseventeen/services/default.nix
rename to hosts/sodomgomorrah/services/default.nix
diff --git a/hosts/cityseventeen/services/forgejo.nix b/hosts/sodomgomorrah/services/forgejo.nix
similarity index 100%
rename from hosts/cityseventeen/services/forgejo.nix
rename to hosts/sodomgomorrah/services/forgejo.nix
diff --git a/hosts/cityseventeen/services/jellyfin.nix b/hosts/sodomgomorrah/services/jellyfin.nix
similarity index 100%
rename from hosts/cityseventeen/services/jellyfin.nix
rename to hosts/sodomgomorrah/services/jellyfin.nix
diff --git a/hosts/cityseventeen/services/znc.nix b/hosts/sodomgomorrah/services/znc.nix
similarity index 100%
rename from hosts/cityseventeen/services/znc.nix
rename to hosts/sodomgomorrah/services/znc.nix
diff --git a/hosts/cityseventeen/theme.nix b/hosts/sodomgomorrah/theme.nix
similarity index 100%
rename from hosts/cityseventeen/theme.nix
rename to hosts/sodomgomorrah/theme.nix
diff --git a/hosts/cityseventeen/users/arturm/.face.icon b/hosts/sodomgomorrah/users/amadaluzia/.face.icon
similarity index 100%
rename from hosts/cityseventeen/users/arturm/.face.icon
rename to hosts/sodomgomorrah/users/amadaluzia/.face.icon
diff --git a/hosts/cityseventeen/users/arturm/configs/foot/foot.ini b/hosts/sodomgomorrah/users/amadaluzia/configs/foot/foot.ini
similarity index 100%
rename from hosts/cityseventeen/users/arturm/configs/foot/foot.ini
rename to hosts/sodomgomorrah/users/amadaluzia/configs/foot/foot.ini
diff --git a/hosts/apeturescience/skel/fuzzel/fuzzel.ini b/hosts/sodomgomorrah/users/amadaluzia/configs/fuzzel/fuzzel.ini
similarity index 100%
rename from hosts/apeturescience/skel/fuzzel/fuzzel.ini
rename to hosts/sodomgomorrah/users/amadaluzia/configs/fuzzel/fuzzel.ini
diff --git a/hosts/cityseventeen/users/arturm/configs/git/gitconfig b/hosts/sodomgomorrah/users/amadaluzia/configs/git/gitconfig
similarity index 100%
rename from hosts/cityseventeen/users/arturm/configs/git/gitconfig
rename to hosts/sodomgomorrah/users/amadaluzia/configs/git/gitconfig
diff --git a/hosts/cityseventeen/users/arturm/configs/kanshi/config b/hosts/sodomgomorrah/users/amadaluzia/configs/kanshi/config
similarity index 100%
rename from hosts/cityseventeen/users/arturm/configs/kanshi/config
rename to hosts/sodomgomorrah/users/amadaluzia/configs/kanshi/config
diff --git a/hosts/cityseventeen/users/arturm/configs/kitty/current-theme.conf b/hosts/sodomgomorrah/users/amadaluzia/configs/kitty/current-theme.conf
similarity index 100%
rename from hosts/cityseventeen/users/arturm/configs/kitty/current-theme.conf
rename to hosts/sodomgomorrah/users/amadaluzia/configs/kitty/current-theme.conf
diff --git a/hosts/cityseventeen/users/arturm/configs/kitty/kitty.conf b/hosts/sodomgomorrah/users/amadaluzia/configs/kitty/kitty.conf
similarity index 100%
rename from hosts/cityseventeen/users/arturm/configs/kitty/kitty.conf
rename to hosts/sodomgomorrah/users/amadaluzia/configs/kitty/kitty.conf
diff --git a/hosts/cityseventeen/users/arturm/configs/mako/config b/hosts/sodomgomorrah/users/amadaluzia/configs/mako/config
similarity index 100%
rename from hosts/cityseventeen/users/arturm/configs/mako/config
rename to hosts/sodomgomorrah/users/amadaluzia/configs/mako/config
diff --git a/hosts/cityseventeen/users/arturm/configs/niri/config.kdl b/hosts/sodomgomorrah/users/amadaluzia/configs/niri/config.kdl
similarity index 100%
rename from hosts/cityseventeen/users/arturm/configs/niri/config.kdl
rename to hosts/sodomgomorrah/users/amadaluzia/configs/niri/config.kdl
diff --git a/hosts/apeturescience/skel/qutebrowser/colours/__init__.py b/hosts/sodomgomorrah/users/amadaluzia/configs/qutebrowser/colours/__init__.py
similarity index 100%
rename from hosts/apeturescience/skel/qutebrowser/colours/__init__.py
rename to hosts/sodomgomorrah/users/amadaluzia/configs/qutebrowser/colours/__init__.py
diff --git a/hosts/apeturescience/skel/qutebrowser/colours/darkmode.py b/hosts/sodomgomorrah/users/amadaluzia/configs/qutebrowser/colours/darkmode.py
similarity index 100%
rename from hosts/apeturescience/skel/qutebrowser/colours/darkmode.py
rename to hosts/sodomgomorrah/users/amadaluzia/configs/qutebrowser/colours/darkmode.py
diff --git a/hosts/apeturescience/skel/qutebrowser/colours/themes.py b/hosts/sodomgomorrah/users/amadaluzia/configs/qutebrowser/colours/themes.py
similarity index 100%
rename from hosts/apeturescience/skel/qutebrowser/colours/themes.py
rename to hosts/sodomgomorrah/users/amadaluzia/configs/qutebrowser/colours/themes.py
diff --git a/hosts/cityseventeen/users/arturm/configs/qutebrowser/config.py b/hosts/sodomgomorrah/users/amadaluzia/configs/qutebrowser/config.py
similarity index 100%
rename from hosts/cityseventeen/users/arturm/configs/qutebrowser/config.py
rename to hosts/sodomgomorrah/users/amadaluzia/configs/qutebrowser/config.py
diff --git a/hosts/cityseventeen/users/arturm/configs/river/init b/hosts/sodomgomorrah/users/amadaluzia/configs/river/init
similarity index 100%
rename from hosts/cityseventeen/users/arturm/configs/river/init
rename to hosts/sodomgomorrah/users/amadaluzia/configs/river/init
diff --git a/hosts/cityseventeen/users/arturm/configs/river/scripts/waybar.sh b/hosts/sodomgomorrah/users/amadaluzia/configs/river/scripts/waybar.sh
similarity index 100%
rename from hosts/cityseventeen/users/arturm/configs/river/scripts/waybar.sh
rename to hosts/sodomgomorrah/users/amadaluzia/configs/river/scripts/waybar.sh
diff --git a/hosts/cityseventeen/users/arturm/configs/vesktop/quickCss.css b/hosts/sodomgomorrah/users/amadaluzia/configs/vesktop/quickCss.css
similarity index 100%
rename from hosts/cityseventeen/users/arturm/configs/vesktop/quickCss.css
rename to hosts/sodomgomorrah/users/amadaluzia/configs/vesktop/quickCss.css
diff --git a/hosts/cityseventeen/users/arturm/configs/waybar/config.jsonc b/hosts/sodomgomorrah/users/amadaluzia/configs/waybar/config.jsonc
similarity index 100%
rename from hosts/cityseventeen/users/arturm/configs/waybar/config.jsonc
rename to hosts/sodomgomorrah/users/amadaluzia/configs/waybar/config.jsonc
diff --git a/hosts/cityseventeen/users/arturm/configs/waybar/style.css b/hosts/sodomgomorrah/users/amadaluzia/configs/waybar/style.css
similarity index 100%
rename from hosts/cityseventeen/users/arturm/configs/waybar/style.css
rename to hosts/sodomgomorrah/users/amadaluzia/configs/waybar/style.css
diff --git a/hosts/cityseventeen/users/arturm/default.nix b/hosts/sodomgomorrah/users/amadaluzia/default.nix
similarity index 97%
rename from hosts/cityseventeen/users/arturm/default.nix
rename to hosts/sodomgomorrah/users/amadaluzia/default.nix
index 64a89f7..1fa6268 100644
--- a/hosts/cityseventeen/users/arturm/default.nix
+++ b/hosts/sodomgomorrah/users/amadaluzia/default.nix
@@ -4,7 +4,7 @@
   ...
 }:
 {
-  alqueva.users.arturm = {
+  alqueva.users.amadaluzia = {
     shell = pkgs.amadaluzian-zsh;
     tmpfiles = [
       "L+ %h/.config/qutebrowser/config.py - - - - ${./configs/qutebrowser/config.py}"
diff --git a/hosts/cityseventeen/users/default.nix b/hosts/sodomgomorrah/users/default.nix
similarity index 57%
rename from hosts/cityseventeen/users/default.nix
rename to hosts/sodomgomorrah/users/default.nix
index c76e5da..64ed387 100644
--- a/hosts/cityseventeen/users/default.nix
+++ b/hosts/sodomgomorrah/users/default.nix
@@ -1,5 +1,5 @@
 {
   imports = [
-    ./arturm
+    ./amadaluzia
   ];
 }
diff --git a/hosts/apeturescience/default.nix b/hosts/tyresidon/default.nix
similarity index 96%
rename from hosts/apeturescience/default.nix
rename to hosts/tyresidon/default.nix
index 29c18b8..26ad137 100644
--- a/hosts/apeturescience/default.nix
+++ b/hosts/tyresidon/default.nix
@@ -3,6 +3,7 @@
   system,
   inputs,
   pkgs,
+  lib,
   ...
 }:
 {
@@ -28,7 +29,7 @@
     wms = {
       niri.enable = true;
     };
-    users.chell = {
+    users.nixos = {
       shell = pkgs.amadaluzian-zsh;
       groups = [
         "wheel"
@@ -41,7 +42,7 @@
         pkgs.alacritty
         pkgs.fuzzel
         pkgs.amadaluzian-zsh
-        pkgs.ungoogled-chromium
+        pkgs.chromium
         pkgs.pwvucontrol
         pkgs.polari
         pkgs.dino
@@ -84,7 +85,7 @@
 
   i18n.defaultLocale = "en_US.UTF-8";
 
-  users.users.nixos.enable = false;
+  users.users.nixos.initialHashedPassword = lib.mkForce null;
 
   console = {
     keyMap = "us";
diff --git a/hosts/apeturescience/hardware.nix b/hosts/tyresidon/hardware.nix
similarity index 100%
rename from hosts/apeturescience/hardware.nix
rename to hosts/tyresidon/hardware.nix
diff --git a/hosts/apeturescience/skel/alacritty/alacritty.toml b/hosts/tyresidon/skel/alacritty/alacritty.toml
similarity index 100%
rename from hosts/apeturescience/skel/alacritty/alacritty.toml
rename to hosts/tyresidon/skel/alacritty/alacritty.toml
diff --git a/hosts/cityseventeen/users/arturm/configs/fuzzel/fuzzel.ini b/hosts/tyresidon/skel/fuzzel/fuzzel.ini
similarity index 100%
rename from hosts/cityseventeen/users/arturm/configs/fuzzel/fuzzel.ini
rename to hosts/tyresidon/skel/fuzzel/fuzzel.ini
diff --git a/hosts/apeturescience/skel/mako/config b/hosts/tyresidon/skel/mako/config
similarity index 100%
rename from hosts/apeturescience/skel/mako/config
rename to hosts/tyresidon/skel/mako/config
diff --git a/hosts/apeturescience/skel/niri/config.kdl b/hosts/tyresidon/skel/niri/config.kdl
similarity index 100%
rename from hosts/apeturescience/skel/niri/config.kdl
rename to hosts/tyresidon/skel/niri/config.kdl
diff --git a/hosts/cityseventeen/users/arturm/configs/qutebrowser/colours/__init__.py b/hosts/tyresidon/skel/qutebrowser/colours/__init__.py
similarity index 100%
rename from hosts/cityseventeen/users/arturm/configs/qutebrowser/colours/__init__.py
rename to hosts/tyresidon/skel/qutebrowser/colours/__init__.py
diff --git a/hosts/cityseventeen/users/arturm/configs/qutebrowser/colours/darkmode.py b/hosts/tyresidon/skel/qutebrowser/colours/darkmode.py
similarity index 100%
rename from hosts/cityseventeen/users/arturm/configs/qutebrowser/colours/darkmode.py
rename to hosts/tyresidon/skel/qutebrowser/colours/darkmode.py
diff --git a/hosts/cityseventeen/users/arturm/configs/qutebrowser/colours/themes.py b/hosts/tyresidon/skel/qutebrowser/colours/themes.py
similarity index 100%
rename from hosts/cityseventeen/users/arturm/configs/qutebrowser/colours/themes.py
rename to hosts/tyresidon/skel/qutebrowser/colours/themes.py
diff --git a/hosts/apeturescience/skel/qutebrowser/config.py b/hosts/tyresidon/skel/qutebrowser/config.py
similarity index 100%
rename from hosts/apeturescience/skel/qutebrowser/config.py
rename to hosts/tyresidon/skel/qutebrowser/config.py
diff --git a/hosts/apeturescience/skel/waybar/config.jsonc b/hosts/tyresidon/skel/waybar/config.jsonc
similarity index 100%
rename from hosts/apeturescience/skel/waybar/config.jsonc
rename to hosts/tyresidon/skel/waybar/config.jsonc
diff --git a/hosts/apeturescience/skel/waybar/style.css b/hosts/tyresidon/skel/waybar/style.css
similarity index 100%
rename from hosts/apeturescience/skel/waybar/style.css
rename to hosts/tyresidon/skel/waybar/style.css