diff --git a/README.md b/README.md
index 81b5dae..9ea6276 100755
--- a/README.md
+++ b/README.md
@@ -62,6 +62,6 @@ This defines flake-based development environment templates for projects written
 This defines the core of the NixOS configuration using helper functions from `lib/`, which is organized as a flake-parts-based structure for better modularity:
 
 1. `inputs`: Declares all external dependencies including, such as core Nix components (`nixpkgs`, `flake-parts`, `systems`) and user environment components (`home-manager`, `sops-nix`).
-2. `outputs`: Uses flake-parts to organize system configurations for multiple machines (`mars`, `venus`, `deimos`, `charon`, and `ceres`) and shared modules (`core`, `mantle`, `crust`) imported across systems.
+2. `outputs`: Uses flake-parts to organize system configurations for multiple machines (`mars`, `deimos`, `phobos` and `ceres`) and shared modules (`core`, `mantle`, `crust`) imported across systems.
 
 Each system imports specialized modules and user profiles based on its intended purpose and users, creating a flexible but consistent configuration framework across multiple machines.
diff --git a/flake.nix b/flake.nix
index 0db1854..745401e 100755
--- a/flake.nix
+++ b/flake.nix
@@ -81,7 +81,6 @@
               ./systems/mars
               ./profiles/user0
               ./profiles/user1
-              ./profiles/user3
               config.nixosModules.mars
               config.nixosModules.core
               config.nixosModules.mantle
@@ -93,22 +92,9 @@
               inputs.nur.modules.nixos.default
               inputs.sops-nix.nixosModules.sops
             ];
-            venus = inputs.self.lib.mkLinuxSystem [
-              ./systems/venus
-              ./profiles/user2
-              config.nixosModules.venus
-              config.nixosModules.core
-              config.nixosModules.mantle
-              config.nixosModules.crust
-              inputs.home-manager.nixosModules.home-manager
-              inputs.lix-module.nixosModules.default
-              inputs.sops-nix.nixosModules.sops
-            ];
             deimos = inputs.self.lib.mkLinuxSystem [
               ./systems/deimos
               ./profiles/user0
-              ./profiles/user1
-              ./profiles/user2
               config.nixosModules.deimos
               config.nixosModules.core
               config.nixosModules.mantle
@@ -131,15 +117,6 @@
               inputs.nur.modules.nixos.default
               inputs.sops-nix.nixosModules.sops
             ];
-            charon = inputs.self.lib.mkLinuxSystem [
-              ./systems/charon
-              ./profiles/user1
-              config.nixosModules.charon
-              config.nixosModules.core
-              config.nixosModules.crust
-              inputs.home-manager.nixosModules.home-manager
-              inputs.lix-module.nixosModules.default
-            ];
             ceres = inputs.self.lib.mkLinuxSystem [
               ./systems/ceres
               ./profiles/user0
diff --git a/modules/config/default.nix b/modules/config/default.nix
index 3570690..adf4471 100755
--- a/modules/config/default.nix
+++ b/modules/config/default.nix
@@ -96,19 +96,19 @@ let
 
   themesSubmodule = lib.types.submodule {
     options = {
-      currentTheme = genOptions stringType "theme";
+      currentTheme = stringType;
       windowManager = {
         gaps = intType;
         borders = intType;
         rounding = intType;
       };
       fonts = {
-        names = genOptions stringType "name";
+        name = stringType;
         sizes = {
-          applications = genOptions intType "size";
-          desktop = genOptions intType "size";
-          popups = genOptions intType "size";
-          terminal = genOptions intType "size";
+          applications = intType;
+          desktop = intType;
+          popups = intType;
+          terminal = intType;
         };
       };
       cursor = {
diff --git a/modules/config/devices/config/charon.nix b/modules/config/devices/config/charon.nix
deleted file mode 100755
index ce4fd6b..0000000
--- a/modules/config/devices/config/charon.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ devicesFunctions }:
-let
-  inherit (devicesFunctions)
-    ownerExclusiveReadWriteMask
-    charonIP
-    ;
-in
-{
-  label = "Charon";
-  name = "charon";
-  sync = {
-    address0 = "";
-  };
-  ip = {
-    address0 = charonIP;
-  };
-  boot = {
-    options = ownerExclusiveReadWriteMask;
-  };
-}
diff --git a/modules/config/devices/config/phone.nix b/modules/config/devices/config/phone.nix
index 438398a..cf4684c 100755
--- a/modules/config/devices/config/phone.nix
+++ b/modules/config/devices/config/phone.nix
@@ -10,7 +10,6 @@ in
   label = dummy;
   sync = {
     address0 = "RMDKNJY-BTX6FYF-G6SR332-WS6HARI-PF74SC6-VPBSGRQ-MKVQZEQ-KSIB6QV"; # User0
-    address1 = "RUKSHY4-UCBYRVG-CVYFCMU-M3NLA3Q-JINRF5V-YPR5W32-TEIBJN6-DNQRCAR"; # User2
   };
   ip = {
     address0 = phoneIP;
diff --git a/modules/config/devices/config/synology.nix b/modules/config/devices/config/synology.nix
index b1f21b1..6c6531a 100755
--- a/modules/config/devices/config/synology.nix
+++ b/modules/config/devices/config/synology.nix
@@ -4,23 +4,18 @@ let
     sambaPermissions
     userIdForUser0
     userIdForUser1
-    userIdForUser3
     synologyIP
     ;
 
   user0 = "nick";
-  user1 = "garnet";
-  user3 = "streaming";
+  user1 = "streaming";
   user0Name = "Nick";
-  user1Name = "Garnet";
-  user3Name = "Streaming";
   synologyName = "synology";
 in
 {
   label = "Synology";
   sync = {
     address0 = "MWRGX2V-F5XKE5E-REP6ECT-OOPFBMF-22NHSMW-YFBU6MB-PLFUN63-R3MW2QX"; # User0
-    address1 = ""; # User2
   };
   name = synologyName;
   ip = {
@@ -32,22 +27,10 @@ in
     device = "//${synologyIP}/homes/${user0Name}";
     options = sambaPermissions ++ userIdForUser0;
   };
-  # Garnet Home Folder
+  # Streaming Folder
   folder1 = {
     mount = "/mnt/media/${synologyName}/${user1}";
-    device = "//${synologyIP}/homes/${user1Name}";
-    options = sambaPermissions ++ userIdForUser1;
-  };
-  # Minecraft Worlds
-  folder2 = {
-    mount = "/home/${user1}/.local/share/PrismLauncher/instances/1.21/.minecraft/saves";
-    device = "//${synologyIP}/homes/${user1Name}/Minecraft";
-    options = sambaPermissions ++ userIdForUser1;
-  };
-  # Streaming Folder
-  folder3 = {
-    mount = "/mnt/media/${synologyName}/${user3}";
     device = "//${synologyIP}/homes/${user0Name}";
-    options = sambaPermissions ++ userIdForUser3;
+    options = sambaPermissions ++ userIdForUser1;
   };
 }
diff --git a/modules/config/devices/config/venus.nix b/modules/config/devices/config/venus.nix
deleted file mode 100755
index 756476b..0000000
--- a/modules/config/devices/config/venus.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ devicesFunctions }:
-let
-  inherit (devicesFunctions)
-    readWritePermissions
-    venusIP
-    ;
-  drivePath = "/run/media";
-  byLabel = "/dev/disk/by-label";
-
-in
-{
-  label = "Venus";
-  name = "venus";
-  ip = {
-    address0 = venusIP;
-  };
-  boot = {
-    options = [
-      "fmask=0022"
-      "dmask=0022"
-    ];
-  };
-  storage0 = {
-    mount = "${drivePath}/games";
-    device = "${byLabel}/Games";
-    options = readWritePermissions;
-  };
-  storage1 = {
-    mount = "${drivePath}/entertainment";
-    device = "${byLabel}/Entertainment";
-    options = readWritePermissions;
-  };
-}
diff --git a/modules/config/devices/default.nix b/modules/config/devices/default.nix
index ec9b76c..b6222cd 100755
--- a/modules/config/devices/default.nix
+++ b/modules/config/devices/default.nix
@@ -38,22 +38,17 @@ let
       "uid=1000"
     ];
     userIdForUser1 = [
-      "uid=1001"
-    ];
-    userIdForUser3 = [
       "uid=1002"
     ];
     dummy = [
     ];
     ceresStorageDriveName = "NAS1";
     ceresIP = "192.168.50.140";
-    charonIP = "192.168.50.42";
     deimosIP = "192.168.50.142";
     marsIP = "192.168.50.218";
     phoneIP = "192.168.50.243";
     phobosIP = "192.168.50.180";
     synologyIP = "192.168.50.210";
-    venusIP = "192.168.58.104";
     brotherIP = "192.168.50.195";
   };
 
diff --git a/modules/config/themes/default.nix b/modules/config/themes/default.nix
index e0458c1..6620a8c 100755
--- a/modules/config/themes/default.nix
+++ b/modules/config/themes/default.nix
@@ -1,7 +1,5 @@
 let
-  currentTheme0 = catppuccin-macchiato; # User0 Theme
-  currentTheme1 = catppuccin-mocha; # User1 Theme
-  currentTheme2 = catppuccin-mocha; # User2 Theme
+  currentTheme0 = catppuccin-macchiato;
 
   brogrammer = "brogrammer";
   catppuccin-frappe = "catppuccin-frappe";
@@ -29,42 +27,18 @@ in
       borders = 3;
       rounding = 20;
     };
-    currentTheme = {
-      theme0 = currentTheme0; # User0 Theme
-      theme1 = currentTheme1; # User1 Theme
-      theme2 = currentTheme2; # User2 Theme
-    };
+    currentTheme = currentTheme0;
     cursor = {
       name = "";
       size = 18;
     };
     fonts = {
-      names = {
-        name0 = "MonaspiceRn Nerd Font"; # User0 Font
-        name1 = ""; # User1 Font
-        name2 = ""; # User2 Font
-      };
+      name = "MonaspiceRn Nerd Font";
       sizes = {
-        applications = {
-          size0 = 14; # User0 Size
-          size1 = 14; # User1 Size
-          size2 = 14; # User2 Size
-        };
-        desktop = {
-          size0 = 12; # User0 Size
-          size1 = 12; # User1 Size
-          size2 = 12; # User2 Size
-        };
-        popups = {
-          size0 = 10; # User0 Size
-          size1 = 10; # User1 Size
-          size2 = 10; # User2 Size
-        };
-        terminal = {
-          size0 = 10; # User0 Size
-          size1 = 10; # User1 Size
-          size2 = 10; # User2 Size
-        };
+        applications = 14;
+        desktop = 12;
+        popups = 10;
+        terminal = 10;
       };
     };
     palettes =
@@ -91,7 +65,6 @@ in
         ${one-dark} = import (palettePath + onePath + /dark);
         ${one-light} = import (palettePath + onePath + /light);
         ${sparky} = import (palettePath + /sparky);
-
       };
   };
 }
diff --git a/modules/config/users/config/user1.nix b/modules/config/users/config/user1.nix
index c646b64..d9d5e68 100755
--- a/modules/config/users/config/user1.nix
+++ b/modules/config/users/config/user1.nix
@@ -5,11 +5,16 @@ let
     ;
 in
 {
-  name = "Garnet";
+  name = "Streaming";
+  aliases = {
+  };
   email = {
-    address0 = "ninaeffler@gmail.com";
+    address0 = "nick@upRootNutrition.com";
   };
   paths = {
     path0 = "/home/${user1}/Files/Projects"; # Git path
   };
+  sshKeys = [
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBF9TmImDoYDpsW5VMFbOcuK3aH4TWRtx/xGxT3yUtEN nick@desktop"
+  ];
 }
diff --git a/modules/config/users/config/user2.nix b/modules/config/users/config/user2.nix
deleted file mode 100755
index 50145a2..0000000
--- a/modules/config/users/config/user2.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ user2 }:
-let
-  inherit
-    user2
-    ;
-in
-{
-  name = "Stacie";
-  email = {
-    address0 = "staciesimonson@gmail.com";
-  };
-  paths = {
-    path0 = "/home/${user2}"; # Git path
-  };
-  sshKeys = [
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILQQDw0NigCC76G/GlHWIMunckaBmfgqbfJXFGWB+8fe stacie@desktop"
-  ];
-
-}
diff --git a/modules/config/users/config/user3.nix b/modules/config/users/config/user3.nix
deleted file mode 100755
index c3bba16..0000000
--- a/modules/config/users/config/user3.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ user3 }:
-let
-  inherit
-    user3
-    ;
-in
-{
-  name = "Streaming";
-  aliases = {
-  };
-  email = {
-    address0 = "nick@upRootNutrition.com";
-  };
-  paths = {
-    path0 = "/home/${user3}/Files/Projects"; # Git path
-  };
-  sshKeys = [
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBF9TmImDoYDpsW5VMFbOcuK3aH4TWRtx/xGxT3yUtEN nick@desktop"
-  ];
-}
diff --git a/modules/config/users/default.nix b/modules/config/users/default.nix
index 60996ff..96bc7e2 100755
--- a/modules/config/users/default.nix
+++ b/modules/config/users/default.nix
@@ -2,21 +2,15 @@ let
   configPath = ./config;
 
   user0 = "nick";
-  user1 = "garnet";
-  user2 = "fallaryn";
-  user3 = "streaming";
+  user1 = "streaming";
 in
 {
   inherit
     user0
     user1
-    user2
-    user3
     ;
   users = {
     "${user0}" = import (configPath + /user0.nix) { inherit user0; };
     "${user1}" = import (configPath + /user1.nix) { inherit user1; };
-    "${user2}" = import (configPath + /user2.nix) { inherit user2; };
-    "${user3}" = import (configPath + /user3.nix) { inherit user3; };
   };
 }
diff --git a/modules/home/cli/files/yazi/default.nix b/modules/home/cli/files/yazi/default.nix
index fd7c888..3f3fd9e 100755
--- a/modules/home/cli/files/yazi/default.nix
+++ b/modules/home/cli/files/yazi/default.nix
@@ -1,8 +1,3 @@
-{
-  flake,
-  pkgs,
-  ...
-}:
 {
   programs.yazi =
     let
diff --git a/modules/home/cli/shell/starship/config/settings.nix b/modules/home/cli/shell/starship/config/settings.nix
index 634e39f..1544e32 100755
--- a/modules/home/cli/shell/starship/config/settings.nix
+++ b/modules/home/cli/shell/starship/config/settings.nix
@@ -7,19 +7,11 @@
 let
   inherit (flake.config.aesthetics.themes) currentTheme palettes;
 
-  inherit (flake.config.people) user0 user1 user2;
+  inherit (flake.config.people) user0;
 
   user = config.home.username;
 
-  themeLogic =
-    if user == user0 then
-      currentTheme.theme0
-    else if user == user1 then
-      currentTheme.theme1
-    else if user == user2 then
-      currentTheme.theme2
-    else
-      currentTheme.theme0;
+  themeLogic = if user == user0 then currentTheme else currentTheme;
 
   el = palettes.${themeLogic}.colours;
 
diff --git a/modules/home/cli/utilities/bottom/config/settings.nix b/modules/home/cli/utilities/bottom/config/settings.nix
index 0aa5968..7262e7b 100755
--- a/modules/home/cli/utilities/bottom/config/settings.nix
+++ b/modules/home/cli/utilities/bottom/config/settings.nix
@@ -9,19 +9,11 @@ let
     palettes
     ;
 
-  inherit (flake.config.people) user0 user1 user2;
+  inherit (flake.config.people) user0;
 
   user = config.home.username;
 
-  themeLogic =
-    if user == user0 then
-      currentTheme.theme0
-    else if user == user1 then
-      currentTheme.theme1
-    else if user == user2 then
-      currentTheme.theme2
-    else
-      currentTheme.theme0;
+  themeLogic = if user == user0 then currentTheme else currentTheme;
 
   el = palettes.${themeLogic}.colours;
 in
diff --git a/modules/home/default.nix b/modules/home/default.nix
index 5459fea..fbd1c0a 100755
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -7,9 +7,7 @@ in
   flake.homeModules =
     let
       inherit (config.machines.devices)
-        charon
         mars
-        venus
         deimos
         ceres
         phobos
@@ -17,8 +15,6 @@ in
       inherit (config.people)
         user0
         user1
-        user2
-        user3
         ;
     in
     {
@@ -59,13 +55,12 @@ in
             systemMonitor
             usbImager
             virtManager
-            # polychromatic
             espanso
             claudeCode
             zoom
             academic
             hypr
-            # niri
+            niri
             wayland
             theming
             printManager
@@ -77,27 +72,6 @@ in
         };
       };
       "${mars.name}-${user1}" = {
-        imports = builtins.attrValues {
-          inherit (modules)
-            cli
-            brave
-            ghostty
-            zed
-            gaming
-            spotify
-            docs
-            mpv
-            kolourPaint
-            discord
-            signal
-            scrcpy
-            bitwarden
-            emote
-            desktop
-            ;
-        };
-      };
-      "${mars.name}-${user3}" = {
         imports = builtins.attrValues {
           inherit (modules)
             cli
@@ -123,35 +97,6 @@ in
             ;
         };
       };
-      "${venus.name}-${user2}" = {
-        imports = builtins.attrValues {
-          inherit (modules)
-            cli
-            firefox
-            brave
-            code
-            ghostty
-            gaming
-            spotify
-            audioProduction
-            wpsOffice
-            obsidian
-            okular
-            images
-            modeling
-            obsStudio
-            kdenlive
-            videoPlaying
-            discord
-            signal
-            tdesktop
-            teams
-            whatsApp
-            zoom
-            tools
-            ;
-        };
-      };
       "${deimos.name}-${user0}" = {
         imports = builtins.attrValues {
           inherit (modules)
@@ -195,7 +140,6 @@ in
             niri
             wayland
             theming
-            # polychromatic
             dolphin
             espanso
             zotero
@@ -204,55 +148,6 @@ in
             ;
         };
       };
-      "${deimos.name}-${user1}" = {
-        imports = builtins.attrValues {
-          inherit (modules)
-            cli
-            brave
-            ghostty
-            zed
-            gaming
-            spotify
-            docs
-            mpv
-            kolourPaint
-            discord
-            signal
-            scrcpy
-            bitwarden
-            emote
-            hypr
-            wayland
-            niri
-            theming
-            ;
-        };
-      };
-      "${deimos.name}-${user2}" = {
-        imports = builtins.attrValues {
-          inherit (modules)
-            cli
-            firefox
-            brave
-            code
-            ghostty
-            gaming
-            spotify
-            wpsOffice
-            obsidian
-            okular
-            images
-            videoPlaying
-            discord
-            signal
-            niri
-            hypr
-            wayland
-            theming
-            tools
-            ;
-        };
-      };
       "${phobos.name}-${user0}" = {
         imports = builtins.attrValues {
           inherit (modules)
@@ -282,30 +177,6 @@ in
             ;
         };
       };
-      "${charon.name}-${user1}" = {
-        imports = builtins.attrValues {
-          inherit (modules)
-            cli
-            brave
-            ghostty
-            zed
-            gaming
-            spotify
-            docs
-            mpv
-            jellyfin
-            kolourPaint
-            systemMonitor
-            discord
-            signal
-            scrcpy
-            bitwarden
-            emote
-            gnome
-            theming
-            ;
-        };
-      };
       "${ceres.name}-${user0}" = {
         imports = builtins.attrValues {
           inherit (modules)
diff --git a/modules/home/gui/apps/browsers/floorp/config/bookmarks/config/flake/selfHosted.nix b/modules/home/gui/apps/browsers/floorp/config/bookmarks/config/flake/selfHosted.nix
index 298c24e..4fabdbd 100755
--- a/modules/home/gui/apps/browsers/floorp/config/bookmarks/config/flake/selfHosted.nix
+++ b/modules/home/gui/apps/browsers/floorp/config/bookmarks/config/flake/selfHosted.nix
@@ -28,12 +28,6 @@ let
     "chat"
     "ai"
   ];
-  owncastTags = [
-    instances.owncast.name
-    "own"
-    "cast"
-    "stream"
-  ];
   syncthingTags = [
     instances.syncthing.name
     "sync"
diff --git a/modules/home/gui/apps/code/vsCode/config/userSettings.nix b/modules/home/gui/apps/code/vsCode/config/userSettings.nix
index 402d08a..b62a4fe 100755
--- a/modules/home/gui/apps/code/vsCode/config/userSettings.nix
+++ b/modules/home/gui/apps/code/vsCode/config/userSettings.nix
@@ -24,10 +24,10 @@ in
   "workbench.statusBar.visible" = false;
   "editor.multiCursorLimit" = 700000;
   "editor.wordWrap" = "on";
-  "editor.fontSize" = fonts.sizes.applications.size0;
-  "editor.fontFamily" = "'${fonts.names.name0}', 'monospace', monospace";
-  "terminal.integrated.fontSize" = fonts.sizes.applications.size0;
-  "terminal.integrated.fontFamily" = "'${fonts.names.name0}', 'monospace', monospace";
+  "editor.fontSize" = fonts.sizes.applications;
+  "editor.fontFamily" = "'${fonts.name}', 'monospace', monospace";
+  "terminal.integrated.fontSize" = fonts.sizes.applications;
+  "terminal.integrated.fontFamily" = "'${fonts.name}', 'monospace', monospace";
   "editor.fontLigatures" = true;
   "elmLS.disableElmLSDiagnostics" = true;
   "elmLS.elmReviewDiagnostics" = "warning";
diff --git a/modules/home/gui/apps/code/zed/config/userSettings/config/interface/default.nix b/modules/home/gui/apps/code/zed/config/userSettings/config/interface/default.nix
index f27a6a8..f27c49c 100755
--- a/modules/home/gui/apps/code/zed/config/userSettings/config/interface/default.nix
+++ b/modules/home/gui/apps/code/zed/config/userSettings/config/interface/default.nix
@@ -5,13 +5,13 @@ let
     ;
 in
 {
-  ui_font_family = fonts.names.name0;
-  buffer_font_family = fonts.names.name0;
+  ui_font_family = fonts.name;
+  buffer_font_family = fonts.name;
   hour_format = "hour12";
   vim_mode = false;
   show_whitespaces = "none";
-  ui_font_size = fonts.sizes.applications.size0;
-  buffer_font_size = fonts.sizes.applications.size0;
+  ui_font_size = fonts.sizes.applications;
+  buffer_font_size = fonts.sizes.applications;
   tab_size = 2;
   cursor_blink = true;
   theme = "Catppuccin Macchiato";
diff --git a/modules/home/gui/apps/code/zed/config/userSettings/config/terminal/default.nix b/modules/home/gui/apps/code/zed/config/userSettings/config/terminal/default.nix
index d6204d0..acb72a7 100755
--- a/modules/home/gui/apps/code/zed/config/userSettings/config/terminal/default.nix
+++ b/modules/home/gui/apps/code/zed/config/userSettings/config/terminal/default.nix
@@ -25,9 +25,9 @@ in
     TERM = "ghostty";
   };
 
-  font_family = fonts.names.name0;
+  font_family = fonts.name;
   font_features = null;
-  font_size = fonts.sizes.terminal.size0;
+  font_size = fonts.sizes.terminal;
   line_height = "comfortable";
   option_as_meta = false;
   button = false;
diff --git a/modules/home/gui/apps/code/zed/config/userSettings/config/theme/default.nix b/modules/home/gui/apps/code/zed/config/userSettings/config/theme/default.nix
deleted file mode 100755
index 5146900..0000000
--- a/modules/home/gui/apps/code/zed/config/userSettings/config/theme/default.nix
+++ /dev/null
@@ -1,816 +0,0 @@
-{
-  config,
-  flake,
-  ...
-}:
-let
-  inherit (flake.config.aesthetics.themes) currentTheme palettes;
-
-  inherit (flake.config.people) user0 user1 user2;
-
-  user = config.home.username;
-
-  themeLogic =
-    if user == user0 then
-      currentTheme.theme0
-    else if user == user1 then
-      currentTheme.theme1
-    else if user == user2 then
-      currentTheme.theme2
-    else
-      currentTheme.theme0;
-
-  el = palettes.${themeLogic}.colours;
-in
-{
-  accents = [
-    "${el.base0E}66"
-    "${el.base07}66"
-    "${el.base16}66"
-    "${el.base0B}66"
-    "${el.base0A}66"
-    "${el.base09}66"
-    "${el.base08}66"
-  ];
-
-  border = {
-    value = "#${el.base02}";
-    variant = "#${el.base0E}";
-    focused = "#${el.base07}";
-    selected = "#${el.base0E}";
-    transparent = "#${el.base0B}";
-    disabled = "#${el.base03}";
-  };
-
-  elevated_surface.background = "#${el.base01}";
-  surface.background = "#${el.base01}";
-  background = {
-    value = "#${el.base00}";
-    appearance = "opaque";
-  };
-  element = {
-    background = "#${el.base11}";
-    hover = "#${el.base03}4d";
-    active = "#${el.base04}4d";
-    selected = "#${el.base02}4d";
-    disabled = "#${el.base03}";
-  };
-
-  drop_target.background = "#${el.base02}66";
-  ghost_element = {
-    background = "#${el.base11}59";
-    hover = "#${el.base03}4d";
-    active = "#${el.base04}99";
-    selected = "#${el.base05}1a";
-    disabled = "#${el.base03}";
-  };
-
-  text = {
-    value = "#${el.base05}";
-    muted = "#${el.base05}";
-    placeholder = "#${el.base04}";
-    disabled = "#${el.base03}";
-    accent = "#${el.base0E}";
-  };
-
-  icon = {
-    value = "#${el.base05}";
-    muted = "#${el.base04}";
-    disabled = "#${el.base03}";
-    placeholder = "#${el.base04}";
-    accent = "#${el.base0E}";
-  };
-
-  status_bar.background = "#${el.base11}";
-  title_bar = {
-    background = "#${el.base11}";
-    inactive_background = "#${el.base11}d9";
-  };
-  toolbar.background = "#${el.base00}";
-  tab_bar.background = "#${el.base11}";
-  tab = {
-    inactive_background = "#${el.base11}";
-    active_background = "#${el.base00}";
-  };
-
-  search.match_background = "#${el.base0C}33";
-  panel = {
-    background = "#${el.base01}";
-    focused_border = "#${el.base05}";
-    indent_guide = "#${el.base02}99";
-    indent_guide_active = "#${el.base04}";
-    indent_guide_hover = "#${el.base0E}";
-  };
-
-  pane.focused_border = "#${el.base05}";
-  pane_group.border = "#${el.base02}";
-
-  scrollbar = {
-    thumb = {
-      background = "#${el.base0E}33";
-      hover_background = "#${el.base03}";
-      border = "#${el.base0E}";
-      scrollbar.track.background = null;
-    };
-    track.border = "#${el.base05}12";
-  };
-
-  editor = {
-    foreground = "#${el.base05}";
-    background = "#${el.base00}";
-    gutter.background = "#${el.base00}";
-    subheader.background = "#${el.base01}";
-    active_line.background = "#${el.base05}0d";
-    highlighted_line.background = null;
-    line_number = "#${el.base04}";
-    active_line_number = "#${el.base0E}";
-    invisible = "#${el.base05}66";
-    wrap_guide = "#${el.base04}";
-    active_wrap_guide = "#${el.base04}";
-    document_highlight = {
-      bracket_background = "#${el.base06}40";
-      read_background = "#${el.base05}29";
-      write_background = "#${el.base05}29";
-    };
-    indent_guide = "#${el.base02}99";
-    indent_guide_active = "#${el.base04}";
-  };
-
-  terminal = {
-    background = "#${el.base00}";
-    ansi.background = "#${el.base00}";
-    foreground = "#${el.base05}";
-    dim_foreground = "#${el.base04}";
-    bright_foreground = "#${el.base05}";
-  };
-
-  link_text.hover = "#${el.base15}";
-
-  conflict = {
-    value = "#${el.base0A}";
-    border = "#${el.base0A}";
-    background = "#${el.base01}";
-  };
-
-  created = {
-    value = "#${el.base0B}";
-    border = "#${el.base0B}";
-    background = "#${el.base01}";
-  };
-
-  deleted = {
-    value = "#${el.base08}";
-    border = "#${el.base08}";
-    background = "#${el.base01}";
-  };
-
-  hidden = {
-    value = "#${el.base03}";
-    border = "#${el.base03}";
-    background = "#${el.base01}";
-  };
-
-  hint = {
-    value = "#${el.base04}";
-    border = "#${el.base04}";
-    background = "#${el.base01}";
-  };
-
-  ignored = {
-    value = "#${el.base03}";
-    border = "#${el.base03}";
-    background = "#${el.base01}";
-  };
-
-  modified = {
-    value = "#${el.base0A}";
-    border = "#${el.base0A}";
-    background = "#${el.base01}";
-  };
-
-  predictive = {
-    value = "#${el.base03}";
-    border = "#${el.base07}";
-    background = "#${el.base01}";
-  };
-
-  renamed = {
-    value = "#${el.base16}";
-    border = "#${el.base16}";
-    background = "#${el.base01}";
-  };
-
-  info = {
-    value = "#${el.base0C}";
-    border = "#${el.base0C}";
-    background = "#${el.base05}33";
-  };
-
-  warning = {
-    value = "#${el.base0A}";
-    border = "#${el.base0A}";
-    background = "#${el.base0A}1f";
-  };
-
-  error = {
-    value = "#${el.base08}";
-    border = "#${el.base08}";
-    background = "#${el.base08}1f";
-  };
-
-  success = {
-    value = "#${el.base0B}";
-    border = "#${el.base0B}";
-    background = "#${el.base0B}1f";
-  };
-
-  unreachable = {
-    value = "#${el.base08}";
-    border = "#${el.base08}";
-    background = "#${el.base08}1f";
-  };
-
-  players = [
-    {
-      cursor = "#${el.base06}";
-      selection = "#${el.base04}80";
-      background = "#${el.base06}";
-    }
-    {
-      cursor = "#${el.base0E}";
-      selection = "#${el.base0E}33";
-      background = "#${el.base0E}";
-    }
-    {
-      cursor = "#${el.base07}";
-      selection = "#${el.base07}33";
-      background = "#${el.base07}";
-    }
-    {
-      cursor = "#${el.base16}";
-      selection = "#${el.base16}33";
-      background = "#${el.base16}";
-    }
-    {
-      cursor = "#${el.base0B}";
-      selection = "#${el.base0B}33";
-      background = "#${el.base0B}";
-    }
-    {
-      cursor = "#${el.base0A}";
-      selection = "#${el.base0A}33";
-      background = "#${el.base0A}";
-    }
-    {
-      cursor = "#${el.base09}";
-      selection = "#${el.base09}33";
-      background = "#${el.base09}";
-    }
-    {
-      cursor = "#${el.base08}";
-      selection = "#${el.base08}33";
-      background = "#${el.base08}";
-    }
-  ];
-
-  syntax = {
-    variable = {
-      color = "#${el.base05}";
-      font_style = null;
-      font_weight = null;
-    };
-    variable.builtin = {
-      color = "#${el.base08}";
-      font_style = null;
-      font_weight = null;
-    };
-    variable.parameter = {
-      color = "#${el.base12}";
-      font_style = null;
-      font_weight = null;
-    };
-    variable.member = {
-      color = "#${el.base0D}";
-      font_style = null;
-      font_weight = null;
-    };
-    variable.special = {
-      color = "#${el.base17}";
-      font_style = "italic";
-      font_weight = null;
-    };
-
-    constant = {
-      color = "#${el.base09}";
-      font_style = null;
-      font_weight = null;
-    };
-    constant.builtin = {
-      color = "#${el.base09}";
-      font_style = null;
-      font_weight = null;
-    };
-    constant.macro = {
-      color = "#${el.base0E}";
-      font_style = null;
-      font_weight = null;
-    };
-
-    module = {
-      color = "#${el.base0A}";
-      font_style = "italic";
-      font_weight = null;
-    };
-
-    label = {
-      color = "#${el.base16}";
-      font_style = null;
-      font_weight = null;
-    };
-
-    string = {
-      color = "#${el.base0B}";
-      font_style = null;
-      font_weight = null;
-    };
-    string.documentation = {
-      color = "#${el.base0C}";
-      font_style = null;
-      font_weight = null;
-    };
-    string.regexp = {
-      color = "#${el.base09}";
-      font_style = null;
-      font_weight = null;
-    };
-    string.escape = {
-      color = "#${el.base17}";
-      font_style = null;
-      font_weight = null;
-    };
-    string.special = {
-      color = "#${el.base17}";
-      font_style = null;
-      font_weight = null;
-    };
-    string.special.path = {
-      color = "#${el.base17}";
-      font_style = null;
-      font_weight = null;
-    };
-    string.special.symbol = {
-      color = "#${el.base0F}";
-      font_style = null;
-      font_weight = null;
-    };
-    string.special.url = {
-      color = "#${el.base06}";
-      font_style = "italic";
-      font_weight = null;
-    };
-
-    character = {
-      color = "#${el.base0C}";
-      font_style = null;
-      font_weight = null;
-    };
-    character.special = {
-      color = "#${el.base17}";
-      font_style = null;
-      font_weight = null;
-    };
-
-    boolean = {
-      color = "#${el.base09}";
-      font_style = null;
-      font_weight = null;
-    };
-
-    number = {
-      color = "#${el.base09}";
-      font_style = null;
-      font_weight = null;
-    };
-    number.float = {
-      color = "#${el.base09}";
-      font_style = null;
-      font_weight = null;
-    };
-
-    type = {
-      color = "#${el.base0A}";
-      font_style = null;
-      font_weight = null;
-    };
-    type.builtin = {
-      color = "#${el.base0E}";
-      font_style = "italic";
-      font_weight = null;
-    };
-    type.definition = {
-      color = "#${el.base0A}";
-      font_style = null;
-      font_weight = null;
-    };
-    type.interface = {
-      color = "#${el.base0A}";
-      font_style = "italic";
-      font_weight = null;
-    };
-    type.super = {
-      color = "#${el.base0A}";
-      font_style = "italic";
-      font_weight = null;
-    };
-
-    attribute = {
-      color = "#${el.base09}";
-      font_style = null;
-      font_weight = null;
-    };
-
-    property = {
-      color = "#${el.base0D}";
-      font_style = null;
-      font_weight = null;
-    };
-
-    function = {
-      color = "#${el.base0D}";
-      font_style = null;
-      font_weight = null;
-    };
-    function.builtin = {
-      color = "#${el.base09}";
-      font_style = null;
-      font_weight = null;
-    };
-    function.call = {
-      color = "#${el.base0D}";
-      font_style = null;
-      font_weight = null;
-    };
-    function.macro = {
-      color = "#${el.base0C}";
-      font_style = null;
-      font_weight = null;
-    };
-    function.method = {
-      color = "#${el.base0D}";
-      font_style = null;
-      font_weight = null;
-    };
-    function.method.call = {
-      color = "#${el.base0D}";
-      font_style = null;
-      font_weight = null;
-    };
-    constructor = {
-      color = "#${el.base0F}";
-      font_style = null;
-      font_weight = null;
-    };
-
-    operator = {
-      color = "#${el.base15}";
-      font_style = null;
-      font_weight = null;
-    };
-
-    keyword = {
-      color = "#${el.base0E}";
-      font_style = null;
-      font_weight = null;
-    };
-    keyword.modifier = {
-      color = "#${el.base0E}";
-      font_style = null;
-      font_weight = null;
-    };
-    keyword.type = {
-      color = "#${el.base0E}";
-      font_style = null;
-      font_weight = null;
-    };
-    keyword.coroutine = {
-      color = "#${el.base0E}";
-      font_style = null;
-      font_weight = null;
-    };
-    keyword.function = {
-      color = "#${el.base0E}";
-      font_style = null;
-      font_weight = null;
-    };
-    keyword.operator = {
-      color = "#${el.base0E}";
-      font_style = null;
-      font_weight = null;
-    };
-    keyword.import = {
-      color = "#${el.base0E}";
-      font_style = null;
-      font_weight = null;
-    };
-    keyword.repeat = {
-      color = "#${el.base0E}";
-      font_style = null;
-      font_weight = null;
-    };
-    keyword.return = {
-      color = "#${el.base0E}";
-      font_style = null;
-      font_weight = null;
-    };
-    keyword.debug = {
-      color = "#${el.base0E}";
-      font_style = null;
-      font_weight = null;
-    };
-    keyword.exception = {
-      color = "#${el.base0E}";
-      font_style = null;
-      font_weight = null;
-    };
-    keyword.conditional = {
-      color = "#${el.base0E}";
-      font_style = null;
-      font_weight = null;
-    };
-    keyword.conditional.ternary = {
-      color = "#${el.base0E}";
-      font_style = null;
-      font_weight = null;
-    };
-    keyword.directive = {
-      color = "#${el.base17}";
-      font_style = null;
-      font_weight = null;
-    };
-    keyword.directive.define = {
-      color = "#${el.base17}";
-      font_style = null;
-      font_weight = null;
-    };
-    keyword.export = {
-      color = "#${el.base15}";
-      font_style = null;
-      font_weight = null;
-    };
-
-    punctuation = {
-      color = "#${el.base05}";
-      font_style = null;
-      font_weight = null;
-    };
-    punctuation.delimiter = {
-      color = "#${el.base05}";
-      font_style = null;
-      font_weight = null;
-    };
-    punctuation.bracket = {
-      color = "#${el.base05}";
-      font_style = null;
-      font_weight = null;
-    };
-    punctuation.special = {
-      color = "#${el.base17}";
-      font_style = null;
-      font_weight = null;
-    };
-    punctuation.special.symbol = {
-      color = "#${el.base0F}";
-      font_style = null;
-      font_weight = null;
-    };
-    punctuation.list_marker = {
-      color = "#${el.base0C}";
-      font_style = null;
-      font_weight = null;
-    };
-
-    comment = {
-      color = "#${el.base05}";
-      font_style = "italic";
-      font_weight = null;
-    };
-    comment.doc = {
-      color = "#${el.base05}";
-      font_style = "italic";
-      font_weight = null;
-    };
-    comment.documentation = {
-      color = "#${el.base05}";
-      font_style = "italic";
-      font_weight = null;
-    };
-    comment.error = {
-      color = "#${el.base08}";
-      font_style = "italic";
-      font_weight = null;
-    };
-    comment.warning = {
-      color = "#${el.base0A}";
-      font_style = "italic";
-      font_weight = null;
-    };
-    comment.hint = {
-      color = "#${el.base0D}";
-      font_style = "italic";
-      font_weight = null;
-    };
-    comment.todo = {
-      color = "#${el.base0F}";
-      font_style = "italic";
-      font_weight = null;
-    };
-    comment.note = {
-      color = "#${el.base06}";
-      font_style = "italic";
-      font_weight = null;
-    };
-
-    diff.plus = {
-      color = "#${el.base0B}";
-      font_style = null;
-      font_weight = null;
-    };
-    diff.minus = {
-      color = "#${el.base08}";
-      font_style = null;
-      font_weight = null;
-    };
-    tag = {
-      color = "#${el.base0D}";
-      font_style = null;
-      font_weight = null;
-    };
-    tag.attribute = {
-      color = "#${el.base0A}";
-      font_style = "italic";
-      font_weight = null;
-    };
-    tag.delimiter = {
-      color = "#${el.base0C}";
-      font_style = null;
-      font_weight = null;
-    };
-
-    parameter = {
-      color = "#${el.base12}";
-      font_style = null;
-      font_weight = null;
-    };
-
-    field = {
-      color = "#${el.base07}";
-      font_style = null;
-      font_weight = null;
-    };
-
-    namespace = {
-      color = "#${el.base0A}";
-      font_style = "italic";
-      font_weight = null;
-    };
-
-    float = {
-      color = "#${el.base09}";
-      font_style = null;
-      font_weight = null;
-    };
-
-    symbol = {
-      color = "#${el.base17}";
-      font_style = null;
-      font_weight = null;
-    };
-
-    string.regex = {
-      color = "#${el.base09}";
-      font_style = null;
-      font_weight = null;
-    };
-
-    text = {
-      color = "#${el.base05}";
-      font_style = null;
-      font_weight = null;
-    };
-
-    emphasis.strong = {
-      color = "#${el.base12}";
-      font_style = null;
-      font_weight = 700;
-    };
-
-    emphasis = {
-      color = "#${el.base12}";
-      font_style = "italic";
-      font_weight = null;
-    };
-
-    embedded = {
-      color = "#${el.base12}";
-      font_style = null;
-      font_weight = null;
-    };
-
-    text.literal = {
-      color = "#${el.base0B}";
-      font_style = null;
-      font_weight = null;
-    };
-
-    concept = {
-      color = "#${el.base16}";
-      font_style = null;
-      font_weight = null;
-    };
-
-    enum = {
-      color = "#${el.base0C}";
-      font_style = null;
-      font_weight = 700;
-    };
-
-    function.decorator = {
-      color = "#${el.base09}";
-      font_style = null;
-      font_weight = null;
-    };
-
-    type.class.definition = {
-      color = "#${el.base0A}";
-      font_style = null;
-      font_weight = 700;
-    };
-
-    hint = {
-      color = "#${el.base04}";
-      font_style = "italic";
-      font_weight = null;
-    };
-
-    link_text = {
-      color = "#${el.base0D}";
-      font_style = null;
-      font_weight = null;
-    };
-
-    link_uri = {
-      color = "#${el.base06}";
-      font_style = "italic";
-      font_weight = null;
-    };
-
-    parent = {
-      color = "#${el.base09}";
-      font_style = null;
-      font_weight = null;
-    };
-
-    predictive = {
-      color = "#${el.base03}";
-      font_style = null;
-      font_weight = null;
-    };
-
-    predoc = {
-      color = "#${el.base08}";
-      font_style = null;
-      font_weight = null;
-    };
-
-    primary = {
-      color = "#${el.base12}";
-      font_style = null;
-      font_weight = null;
-    };
-
-    tag.doctype = {
-      color = "#${el.base0E}";
-      font_style = null;
-      font_weight = null;
-    };
-
-    string.doc = {
-      color = "#${el.base0C}";
-      font_style = "italic";
-      font_weight = null;
-    };
-
-    title = {
-      color = "#${el.base05}";
-      font_style = null;
-      font_weight = 800;
-    };
-
-    variant = {
-      color = "#${el.base08}";
-      font_style = null;
-      font_weight = null;
-    };
-  };
-
-}
diff --git a/modules/home/gui/apps/code/zed/config/userSettings/default.nix b/modules/home/gui/apps/code/zed/config/userSettings/default.nix
index 8dd5b6f..7494f49 100755
--- a/modules/home/gui/apps/code/zed/config/userSettings/default.nix
+++ b/modules/home/gui/apps/code/zed/config/userSettings/default.nix
@@ -11,7 +11,6 @@ let
   languagesPath = import (configPath + /languages);
   lspPath = import (configPath + /lsp);
   terminalPath = import (configPath + /terminal) { inherit flake; };
-  # experimentalPath = import (configPath + /theme) { inherit config flake; };
   gitPath = import (configPath + /git);
   miscPath = import (configPath + /misc) { inherit lib pkgs; };
 in
@@ -20,7 +19,6 @@ in
   languages = languagesPath;
   lsp = lspPath;
   terminal = terminalPath;
-  # experimental.theme_overrides = experimentalPath;
 
 }
 // assistantPath
diff --git a/modules/home/gui/apps/code/zed/default.nix b/modules/home/gui/apps/code/zed/default.nix
index 7d2d81f..2bb79f5 100755
--- a/modules/home/gui/apps/code/zed/default.nix
+++ b/modules/home/gui/apps/code/zed/default.nix
@@ -18,7 +18,7 @@ let
       ;
   };
   extraPackagesPath = import (configPath + /extraPackages) { inherit pkgs; };
-  packagePath = flake.inputs.zed-editor.packages.${pkgs.system}.default;
+  # packagePath = flake.inputs.zed-editor.packages.${pkgs.system}.default;
 in
 {
   programs.zed-editor = {
diff --git a/modules/home/gui/apps/emulators/ghostty/config/settings.nix b/modules/home/gui/apps/emulators/ghostty/config/settings.nix
index ff9320a..baabc24 100755
--- a/modules/home/gui/apps/emulators/ghostty/config/settings.nix
+++ b/modules/home/gui/apps/emulators/ghostty/config/settings.nix
@@ -1,6 +1,5 @@
 {
   flake,
-  osConfig,
   pkgs,
   ...
 }:
@@ -10,8 +9,8 @@ in
 {
   confirm-close-surface = false;
   window-decoration = true;
-  font-size = fonts.sizes.terminal.size0;
-  font-family = fonts.names.name0;
+  font-size = fonts.sizes.terminal;
+  font-family = fonts.name;
   window-padding-x = 10;
   window-padding-y = 10;
   copy-on-select = true;
diff --git a/modules/home/gui/apps/emulators/ghostty/config/themes.nix b/modules/home/gui/apps/emulators/ghostty/config/themes.nix
index 7ca8f5d..44cd63f 100755
--- a/modules/home/gui/apps/emulators/ghostty/config/themes.nix
+++ b/modules/home/gui/apps/emulators/ghostty/config/themes.nix
@@ -6,19 +6,11 @@
 let
   inherit (flake.config.aesthetics.themes) currentTheme palettes;
 
-  inherit (flake.config.people) user0 user1 user2;
+  inherit (flake.config.people) user0;
 
   user = config.home.username;
 
-  themeLogic =
-    if user == user0 then
-      currentTheme.theme0
-    else if user == user1 then
-      currentTheme.theme1
-    else if user == user2 then
-      currentTheme.theme2
-    else
-      currentTheme.theme0;
+  themeLogic = if user == user0 then currentTheme else currentTheme;
 
   el = palettes.${themeLogic}.colours;
 in
diff --git a/modules/home/gui/apps/emulators/kitty/default.nix b/modules/home/gui/apps/emulators/kitty/default.nix
index 9d9f3b8..791a7ec 100755
--- a/modules/home/gui/apps/emulators/kitty/default.nix
+++ b/modules/home/gui/apps/emulators/kitty/default.nix
@@ -11,8 +11,8 @@ in
   programs.kitty = {
     enable = true;
     font = {
-      name = fonts.names.name0;
-      size = fonts.sizes.terminal.size0;
+      name = fonts.name;
+      size = fonts.sizes.terminal;
     };
     themeFile = "Catppuccin-Macchiato";
   };
diff --git a/modules/home/gui/apps/emulators/wezterm/config/extraConfig.nix b/modules/home/gui/apps/emulators/wezterm/config/extraConfig.nix
index 2651819..8fd2a75 100755
--- a/modules/home/gui/apps/emulators/wezterm/config/extraConfig.nix
+++ b/modules/home/gui/apps/emulators/wezterm/config/extraConfig.nix
@@ -7,8 +7,8 @@ in
 ''
   return {
     color_scheme = "Catppuccin Macchiato",
-    font_size = ${builtins.toString fonts.sizes.terminal.size0},
-    font = wezterm.font('${fonts.names.name0}'),
+    font_size = ${builtins.toString fonts.sizes.terminal},
+    font = wezterm.font('${fonts.name}'),
     enable_tab_bar = false,
     window_close_confirmation = 'NeverPrompt',
     term = 'wezterm',
diff --git a/modules/home/gui/apps/tools/flameshot/default.nix b/modules/home/gui/apps/tools/flameshot/default.nix
index 0761a97..a00684e 100755
--- a/modules/home/gui/apps/tools/flameshot/default.nix
+++ b/modules/home/gui/apps/tools/flameshot/default.nix
@@ -28,8 +28,8 @@ in
     };
   };
   home.packages = builtins.attrValues {
-    inherit (pkgs)
-      # flameshot
-      ;
+    # inherit (pkgs)
+    #   # flameshot
+    #   ;
   };
 }
diff --git a/modules/home/gui/desktop/hypr/land/config/general.nix b/modules/home/gui/desktop/hypr/land/config/general.nix
index 68bfe76..985b170 100755
--- a/modules/home/gui/desktop/hypr/land/config/general.nix
+++ b/modules/home/gui/desktop/hypr/land/config/general.nix
@@ -11,19 +11,11 @@ let
     windowManager
     ;
 
-  inherit (flake.config.people) user0 user1 user2;
+  inherit (flake.config.people) user0;
 
   user = config.home.username;
 
-  themeLogic =
-    if user == user0 then
-      currentTheme.theme0
-    else if user == user1 then
-      currentTheme.theme1
-    else if user == user2 then
-      currentTheme.theme2
-    else
-      currentTheme.theme0;
+  themeLogic = if user == user0 then currentTheme else currentTheme;
 
   el = palettes.${themeLogic}.colours;
 in
diff --git a/modules/home/gui/desktop/niri/config/binds.nix b/modules/home/gui/desktop/niri/config/binds.nix
index 9584bff..7022817 100755
--- a/modules/home/gui/desktop/niri/config/binds.nix
+++ b/modules/home/gui/desktop/niri/config/binds.nix
@@ -2,7 +2,6 @@
   config,
   flake,
   osConfig,
-  workspaceStrings,
   ...
 }:
 let
diff --git a/modules/home/gui/desktop/niri/default.nix b/modules/home/gui/desktop/niri/default.nix
index 06249b2..c9e4b8d 100755
--- a/modules/home/gui/desktop/niri/default.nix
+++ b/modules/home/gui/desktop/niri/default.nix
@@ -10,20 +10,12 @@ let
 
   inherit (flake.config.aesthetics.themes) currentTheme palettes;
 
-  inherit (flake.config.people) user0 user1 user2;
+  inherit (flake.config.people) user0;
 
   user = config.home.username;
 
   colourHelpers = {
-    themeLogic =
-      if user == user0 then
-        currentTheme.theme0
-      else if user == user1 then
-        currentTheme.theme1
-      else if user == user2 then
-        currentTheme.theme2
-      else
-        currentTheme.theme0;
+    themeLogic = if user == user0 then currentTheme else currentTheme;
 
     el = palettes.${colourHelpers.themeLogic}.colours;
 
diff --git a/modules/home/gui/desktop/river/default.nix b/modules/home/gui/desktop/river/default.nix
index 5746df6..b881b13 100755
--- a/modules/home/gui/desktop/river/default.nix
+++ b/modules/home/gui/desktop/river/default.nix
@@ -5,7 +5,6 @@
   ...
 }:
 let
-  inherit (flake.config.aesthetics.themes) cursor;
   configPath = ./config;
   settingsPath = {
     spawn = import (configPath + /spawn.nix) { inherit config flake; };
diff --git a/modules/home/gui/desktop/wayland/dunst/config/settings.nix b/modules/home/gui/desktop/wayland/dunst/config/settings.nix
index bed0f5e..6d59f35 100755
--- a/modules/home/gui/desktop/wayland/dunst/config/settings.nix
+++ b/modules/home/gui/desktop/wayland/dunst/config/settings.nix
@@ -11,19 +11,11 @@ let
     fonts
     ;
 
-  inherit (flake.config.people) user0 user1 user2;
+  inherit (flake.config.people) user0;
 
   user = config.home.username;
 
-  themeLogic =
-    if user == user0 then
-      currentTheme.theme0
-    else if user == user1 then
-      currentTheme.theme1
-    else if user == user2 then
-      currentTheme.theme2
-    else
-      currentTheme.theme0;
+  themeLogic = if user == user0 then currentTheme else currentTheme;
 
   el = palettes.${themeLogic}.colours;
 
@@ -31,7 +23,7 @@ let
 in
 {
   global = {
-    font = "${fonts.names.name0} ${builtins.toString fonts.sizes.popups.size0}";
+    font = "${fonts.name} ${builtins.toString fonts.sizes.popups}";
     background = makeColor el.base01;
     frame_color = makeColor el.base0E;
     foreground = makeColor el.base05;
diff --git a/modules/home/gui/desktop/wayland/fuzzel/default.nix b/modules/home/gui/desktop/wayland/fuzzel/default.nix
index 87be24e..80bbf21 100755
--- a/modules/home/gui/desktop/wayland/fuzzel/default.nix
+++ b/modules/home/gui/desktop/wayland/fuzzel/default.nix
@@ -8,19 +8,11 @@ let
 
   inherit (flake.config.aesthetics.themes) currentTheme palettes fonts;
 
-  inherit (flake.config.people) user0 user1 user2;
+  inherit (flake.config.people) user0;
 
   user = config.home.username;
 
-  themeLogic =
-    if user == user0 then
-      currentTheme.theme0
-    else if user == user1 then
-      currentTheme.theme1
-    else if user == user2 then
-      currentTheme.theme2
-    else
-      currentTheme.theme0;
+  themeLogic = if user == user0 then currentTheme else currentTheme;
 
   el = palettes.${themeLogic}.colours;
 
@@ -35,7 +27,7 @@ in
         dpi-aware = "no";
         icon-theme = "Papirus-Dark";
         width = 25;
-        font = "${fonts.names.name0}:weight=bold:size=${toString fonts.sizes.desktop.size0}";
+        font = "${fonts.name}:weight=bold:size=${toString fonts.sizes.popups}";
         terminal = "${pkgs.ghostty}/bin/ghostty";
         layer = "overlay";
         fields = "name";
diff --git a/modules/home/gui/desktop/wayland/swaylock/config/settings.nix b/modules/home/gui/desktop/wayland/swaylock/config/settings.nix
index 639a8c0..e96d4e5 100755
--- a/modules/home/gui/desktop/wayland/swaylock/config/settings.nix
+++ b/modules/home/gui/desktop/wayland/swaylock/config/settings.nix
@@ -10,25 +10,17 @@ let
     fonts
     ;
 
-  inherit (flake.config.people) user0 user1 user2;
+  inherit (flake.config.people) user0;
 
   user = config.home.username;
 
-  themeLogic =
-    if user == user0 then
-      currentTheme.theme0
-    else if user == user1 then
-      currentTheme.theme1
-    else if user == user2 then
-      currentTheme.theme2
-    else
-      currentTheme.theme0;
+  themeLogic = if user == user0 then currentTheme else currentTheme;
 
   el = palettes.${themeLogic}.colours;
 in
 {
-  font = fonts.names.name0;
-  font-size = fonts.sizes.desktop.size0;
+  font = fonts.name;
+  font-size = fonts.sizes.popups;
   indicator-idle-visible = true;
   indicator-radius = 100;
   indicator-thickness = 20;
diff --git a/modules/home/gui/desktop/wayland/waybar/config/style.nix b/modules/home/gui/desktop/wayland/waybar/config/style.nix
index f222e21..997bb77 100755
--- a/modules/home/gui/desktop/wayland/waybar/config/style.nix
+++ b/modules/home/gui/desktop/wayland/waybar/config/style.nix
@@ -12,25 +12,17 @@ let
     windowManager
     ;
 
-  inherit (flake.config.people) user0 user1 user2;
+  inherit (flake.config.people) user0;
 
   user = config.home.username;
 
-  themeLogic =
-    if user == user0 then
-      currentTheme.theme0
-    else if user == user1 then
-      currentTheme.theme1
-    else if user == user2 then
-      currentTheme.theme2
-    else
-      currentTheme.theme0;
+  themeLogic = if user == user0 then currentTheme else currentTheme;
 
   el = palettes.${themeLogic}.colours;
 
   custom = {
-    font = fonts.names.name0;
-    font_size = fonts.sizes.desktop.size0;
+    font = fonts.name;
+    font_size = fonts.sizes.popups;
     font_weight = "bold";
     opacityBg = "0.90";
     opacityBt = "1";
diff --git a/modules/nixos/core/doas/default.nix b/modules/nixos/core/doas/default.nix
index bcfb6aa..37fd07b 100755
--- a/modules/nixos/core/doas/default.nix
+++ b/modules/nixos/core/doas/default.nix
@@ -1,44 +1,9 @@
-{
-  flake,
-  config,
-  ...
-}:
+{ flake, ... }:
 let
   inherit (flake.config.people)
     user0
     user1
-    user2
-    user3
     ;
-  inherit (flake.config.machines)
-    devices
-    ;
-  hostname = config.networking.hostName;
-  mars = devices.mars.name;
-  ceres = devices.ceres.name;
-  venus = devices.venus.name;
-  charon = devices.charon.name;
-  deimos = devices.deimos.name;
-
-  userLogic =
-    if
-      builtins.elem hostname [
-        mars
-        deimos
-        ceres
-      ]
-    then
-      [
-        user0
-        user1
-        user3
-      ]
-    else if hostname == charon then
-      [ user1 ]
-    else if hostname == venus then
-      [ user2 ]
-    else
-      [ ];
 in
 {
   security = {
@@ -48,7 +13,10 @@ in
         {
           keepEnv = true;
           noPass = true;
-          users = userLogic;
+          users = [
+            user0
+            user1
+          ];
         }
       ];
     };
diff --git a/modules/nixos/core/environment/default.nix b/modules/nixos/core/environment/default.nix
index 40ec512..a4bfb16 100755
--- a/modules/nixos/core/environment/default.nix
+++ b/modules/nixos/core/environment/default.nix
@@ -1,8 +1,4 @@
-{
-  pkgs,
-  config,
-  ...
-}:
+{ pkgs, ... }:
 {
   environment = {
     enableAllTerminfo = true;
diff --git a/modules/nixos/core/fonts/default.nix b/modules/nixos/core/fonts/default.nix
index c1ef38b..fdeeb36 100755
--- a/modules/nixos/core/fonts/default.nix
+++ b/modules/nixos/core/fonts/default.nix
@@ -14,13 +14,13 @@ in
       enable = true;
       defaultFonts = {
         serif = [
-          fonts.names.name0
+          fonts.name
         ];
         monospace = [
-          fonts.names.name0
+          fonts.name
         ];
         sansSerif = [
-          fonts.names.name0
+          fonts.name
         ];
         emoji = [
           "Noto Fonts Color Emoji"
diff --git a/modules/nixos/core/ssh/default.nix b/modules/nixos/core/ssh/default.nix
index 4544958..322b85b 100755
--- a/modules/nixos/core/ssh/default.nix
+++ b/modules/nixos/core/ssh/default.nix
@@ -4,55 +4,38 @@
   ...
 }:
 let
-  inherit (flake.config.people)
-    user0
-    user1
-    user2
-    user3
-    ;
-  inherit (flake.config.machines)
-    devices
-    ;
+  inherit (flake.config.people) user0 user1;
+  inherit (flake.config.machines) devices;
   hostname = config.networking.hostName;
   mars = devices.mars.name;
   deimos = devices.deimos.name;
   ceres = devices.ceres.name;
-  venus = devices.venus.name;
-  charon = devices.charon.name;
 
-  # Helper function to get SSH keys for a specific user
   getUserKeys = user: flake.config.people.users.${user}.sshKeys;
+
+  user0Key = {
+    ${user0} = {
+      openssh.authorizedKeys.keys = getUserKeys user0;
+    };
+  };
+  user1Key = {
+    ${user1} = {
+      openssh.authorizedKeys.keys = getUserKeys user1;
+    };
+  };
+
 in
 {
   users.users =
-    if hostname == charon then
-      { }
-    else if hostname == mars then
-      {
-        ${user0} = {
-          openssh.authorizedKeys.keys = getUserKeys user0;
-        };
-        ${user3} = {
-          openssh.authorizedKeys.keys = getUserKeys user3;
-        };
-      }
+    if hostname == mars then
+      user0Key // user1Key
     else if
       builtins.elem hostname [
         deimos
         ceres
       ]
     then
-      {
-        ${user0} = {
-          openssh.authorizedKeys.keys = getUserKeys user0;
-        };
-      }
-    else if hostname == venus then
-      {
-        ${user2} = {
-          openssh.authorizedKeys.keys = getUserKeys user2;
-        };
-      }
+      user0Key
     else
       { };
 }
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index ab0f839..27be9b5 100755
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -17,23 +17,12 @@ in
           niri
           wayland
           searx
-          xserver
           flatpak
           wireGuard
           ;
       };
     };
 
-    venus = {
-      imports = builtins.attrValues {
-        inherit (modules)
-          plasma
-          sddm
-          tablet
-          ;
-      };
-    };
-
     deimos = {
       imports = builtins.attrValues {
         inherit (modules)
@@ -43,7 +32,6 @@ in
           plasma
           sddm
           flatpak
-          xserver
           espanso
           wireGuard
           glance
@@ -56,22 +44,11 @@ in
         inherit (modules)
           plasma
           sddm
-          xserver
           wireGuard
           ;
       };
     };
 
-    charon = {
-      imports = builtins.attrValues {
-        inherit (modules)
-          gnome
-          flatpak
-          xserver
-          ;
-      };
-    };
-
     ceres = {
       imports = builtins.attrValues {
         inherit (modules)
@@ -89,9 +66,6 @@ in
           searx
           vaultwarden
           forgejo
-          xserver
-          # podgrab
-          # kanboard
           ;
       };
     };
@@ -100,6 +74,7 @@ in
       imports = builtins.attrValues {
         inherit (modules)
           sops
+          xserver
           ;
       };
     };
diff --git a/modules/nixos/desktop/hypr/idle/default.nix b/modules/nixos/desktop/hypr/idle/default.nix
index 12c71f9..ffbb5be 100755
--- a/modules/nixos/desktop/hypr/idle/default.nix
+++ b/modules/nixos/desktop/hypr/idle/default.nix
@@ -1,8 +1,3 @@
-{
-  flake,
-  pkgs,
-  ...
-}:
 {
   services.hypridle = {
     enable = true;
diff --git a/modules/nixos/desktop/hypr/land/default.nix b/modules/nixos/desktop/hypr/land/default.nix
index 4038bdd..e3a7033 100755
--- a/modules/nixos/desktop/hypr/land/default.nix
+++ b/modules/nixos/desktop/hypr/land/default.nix
@@ -1,8 +1,3 @@
-{
-  pkgs,
-  flake,
-  ...
-}:
 {
   programs.hyprland = {
     enable = true;
diff --git a/modules/nixos/desktop/sddm/default.nix b/modules/nixos/desktop/sddm/default.nix
index f488896..a741bd1 100755
--- a/modules/nixos/desktop/sddm/default.nix
+++ b/modules/nixos/desktop/sddm/default.nix
@@ -16,8 +16,8 @@ in
     systemPackages = [
       (pkgs.catppuccin-sddm.override {
         flavor = "macchiato";
-        font = "${fonts.names.name0}";
-        fontSize = "${toString fonts.sizes.desktop.size0}";
+        font = "${fonts.name}";
+        fontSize = "${toString fonts.sizes.popups}";
         loginBackground = true;
       })
     ];
diff --git a/modules/nixos/desktop/wayland/greetd/default.nix b/modules/nixos/desktop/wayland/greetd/default.nix
index a5cb1b3..a526e77 100755
--- a/modules/nixos/desktop/wayland/greetd/default.nix
+++ b/modules/nixos/desktop/wayland/greetd/default.nix
@@ -1,19 +1,14 @@
 {
   config,
   flake,
-  lib,
   pkgs,
   ...
 }:
 let
   inherit (flake.config.people)
     user0
-    user1
-    user2
     ;
   inherit (flake.config.machines) devices;
-  venus = devices.venus.name;
-  charon = devices.charon.name;
   mars = devices.mars.name;
 
   host = config.networking.hostName;
@@ -26,15 +21,7 @@ in
       settings = {
         default_session = {
           command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --time-format '%I:%M %p | %a • %h | %F' --theme border=magenta;text=cyan;prompt=green;time=red;action=blue;button=yellow;container=black;input=red --cmd Hyprland";
-          user =
-            if host == mars then
-              "greeter"
-            else if host == charon then
-              user1
-            else if host == venus then
-              user2
-            else
-              user0;
+          user = if host == mars then "greeter" else user0;
         };
       };
     };
diff --git a/modules/nixos/desktop/wayland/portals/default.nix b/modules/nixos/desktop/wayland/portals/default.nix
index 0a99cee..ae85cf1 100755
--- a/modules/nixos/desktop/wayland/portals/default.nix
+++ b/modules/nixos/desktop/wayland/portals/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, flake, ... }:
+{ pkgs, ... }:
 {
   environment.sessionVariables.NIXOS_OZONE_WL = "1";
 
diff --git a/modules/nixos/desktop/wayland/regreet/default.nix b/modules/nixos/desktop/wayland/regreet/default.nix
index 7edcce6..871416a 100755
--- a/modules/nixos/desktop/wayland/regreet/default.nix
+++ b/modules/nixos/desktop/wayland/regreet/default.nix
@@ -1,50 +1,7 @@
-{
-  pkgs,
-  flake,
-  lib,
-  ...
-}:
-let
-  inherit (flake.config.aesthetics.themes)
-    fonts
-    ;
-in
+{ pkgs, ... }:
 {
   programs.regreet = {
     enable = false;
     package = pkgs.greetd.regreet;
-    # settings = {
-    #   appearance = {
-    #     greeting_msg = "Back for more, I see.";
-    #   };
-    #   GTK = {
-    #     application_prefer_dark_theme = true;
-    #     cursor_theme_name = lib.mkForce "catppuccin-macchiato-dark-cursors";
-    #     font_name = lib.mkForce "${fonts.names.name0} ${font.size.desktop}";
-    #     icon_theme_name = lib.mkForce "Papirus-Dark";
-    #     theme_name = lib.mkForce "catppuccin-macchiato-mauve-compact";
-    #   };
-    # };
-    # theme = {
-    #   name = "catppuccin-macchiato-mauve-compact";
-    #   package = pkgs.catppuccin-gtk.override {
-    #     size = "compact";
-    #     variant = "macchiato";
-    #     accents = [
-    #       "mauve"
-    #     ];
-    #   };
-    # };
-    # cursorTheme = {
-    #   name = "catppuccin-macchiato-dark-cursors";
-    #   package = pkgs.catppuccin-cursors.macchiatoDark;
-    # };
-    # iconTheme = {
-    #   name = "Papirus-Dark";
-    #   package = pkgs.catppuccin-papirus-folders.override {
-    #     flavor = "macchiato";
-    #     accent = "mauve";
-    #   };
-    # };
   };
 }
diff --git a/modules/nixos/services/audiobookshelf/default.nix b/modules/nixos/services/audiobookshelf/default.nix
index 3ca62e4..32ad1ec 100755
--- a/modules/nixos/services/audiobookshelf/default.nix
+++ b/modules/nixos/services/audiobookshelf/default.nix
@@ -1,4 +1,4 @@
-{ flake, config, ... }:
+{ flake, ... }:
 let
   inherit (flake.config.services.instances) audiobookshelf web;
   inherit (flake.config.machines.devices) ceres;
diff --git a/modules/nixos/services/glance/default.nix b/modules/nixos/services/glance/default.nix
index 18511e9..c600215 100755
--- a/modules/nixos/services/glance/default.nix
+++ b/modules/nixos/services/glance/default.nix
@@ -1,8 +1,6 @@
 { config, flake, ... }:
 let
-  inherit (flake.config.people) user0;
-  inherit (flake.config.services.instances) glance jellyfin web;
-  inherit (flake.config.machines.devices) ceres;
+  inherit (flake.config.services.instances) glance jellyfin;
   service = glance;
   configPath = ./config;
   configImports = {
diff --git a/modules/nixos/services/kanboard/default.nix b/modules/nixos/services/kanboard/default.nix
index 85de06d..7429d7a 100755
--- a/modules/nixos/services/kanboard/default.nix
+++ b/modules/nixos/services/kanboard/default.nix
@@ -1,13 +1,6 @@
-{
-  flake,
-  config,
-  ...
-}:
+{ flake, ... }:
 let
-  inherit (flake.config.machines.devices)
-    ceres
-    ;
-  inherit (flake.config.services.instances) smtp kanboard web;
+  inherit (flake.config.services.instances) kanboard web;
   service = kanboard;
   localhost = web.localhost.address0;
   host = service.domains.url0;
diff --git a/modules/nixos/services/ollama/default.nix b/modules/nixos/services/ollama/default.nix
index d82ccd0..78108cd 100755
--- a/modules/nixos/services/ollama/default.nix
+++ b/modules/nixos/services/ollama/default.nix
@@ -1,9 +1,4 @@
-{
-  flake,
-  config,
-  pkgs,
-  ...
-}:
+{ flake, config, ... }:
 let
   inherit (flake.config.machines.devices)
     mars
diff --git a/modules/nixos/services/syncthing/default.nix b/modules/nixos/services/syncthing/default.nix
index f94abc2..bbed92e 100755
--- a/modules/nixos/services/syncthing/default.nix
+++ b/modules/nixos/services/syncthing/default.nix
@@ -3,7 +3,6 @@ let
   inherit (flake.config.machines.devices)
     synology
     phone
-    tablet
     ;
   inherit (flake.config.services.instances)
     syncthing
diff --git a/modules/nixos/sops/default.nix b/modules/nixos/sops/default.nix
index 38e4a89..123602f 100755
--- a/modules/nixos/sops/default.nix
+++ b/modules/nixos/sops/default.nix
@@ -1,40 +1,6 @@
-{
-  flake,
-  config,
-  ...
-}:
+{ flake, ... }:
 let
-  inherit (flake.config.people)
-    user0
-    user1
-    user2
-    user3
-    ;
-  inherit (flake.config.machines)
-    devices
-    ;
-  hostname = config.networking.hostName;
-  mars = devices.mars.name;
-  ceres = devices.ceres.name;
-  venus = devices.venus.name;
-  charon = devices.charon.name;
-  deimos = devices.deimos.name;
-
-  userLogic =
-    if
-      builtins.elem hostname [
-        mars
-        deimos
-        ceres
-      ]
-    then
-      user0
-    else if hostname == charon then
-      user1
-    else if hostname == venus then
-      user2
-    else
-      "";
+  inherit (flake.config.people) user0;
 in
 {
   sops = {
@@ -44,27 +10,23 @@ in
       keyFile = "/var/lib/sops-nix/key.txt";
       generateKey = false;
     };
-    secrets =
-      if hostname == charon then
-        { }
-      else
-        {
-          "ssh/private" = {
-            path = "/home/${userLogic}/.ssh/id_ed25519";
-            owner = userLogic;
-          };
-          "ssh/public" = {
-            path = "/home/${userLogic}/.ssh/id_ed25519.pub";
-            owner = userLogic;
-          };
-          "ssh/hosts" = {
-            path = "/home/${userLogic}/.ssh/known_hosts";
-            owner = userLogic;
-          };
-          "claude-api-key" = {
-            path = "/home/${user0}/.config/zed/claude-api-key";
-            owner = user0;
-          };
-        };
+    secrets = {
+      "ssh/private" = {
+        path = "/home/${user0}/.ssh/id_ed25519";
+        owner = user0;
+      };
+      "ssh/public" = {
+        path = "/home/${user0}/.ssh/id_ed25519.pub";
+        owner = user0;
+      };
+      "ssh/hosts" = {
+        path = "/home/${user0}/.ssh/known_hosts";
+        owner = user0;
+      };
+      "claude-api-key" = {
+        path = "/home/${user0}/.config/zed/claude-api-key";
+        owner = user0;
+      };
+    };
   };
 }
diff --git a/profiles/user0/default.nix b/profiles/user0/default.nix
index 0c614f7..6c49163 100755
--- a/profiles/user0/default.nix
+++ b/profiles/user0/default.nix
@@ -9,7 +9,6 @@ let
   inherit (flake) self;
   inherit (flake.config.people) user0;
   inherit (flake.config.machines) devices;
-  inherit (flake.config.services) instances;
   inherit (flake.config.people.users.${user0}) name paths;
 
   hostname = config.networking.hostName;
@@ -49,66 +48,17 @@ in
         username = user0;
         homeDirectory = "/home/${user0}";
         file = {
-          "./justfile" =
-            let
-              mars = devices.mars;
-              deimos = devices.deimos;
-              deviceLogic = if hostname == mars.name then deimos else mars;
-
-              vpnServers = [
-                "CA363"
-                "CA220"
-                "CA358"
-                "CA627"
-              ];
-
-              vpnCommands = lib.concatStrings (
-                lib.imap0 (i: server: ''
-                  vpn${toString i}:
-                      sudo systemctl start wg-quick-Proton-${server}.service
-
-                '') vpnServers
-              );
-            in
-            {
-              text = ''
-                rebuildBoot:
-                    nixos-rebuild boot --use-remote-sudo --flake ~/Files/Projects/dotfiles#${hostname} --show-trace
-
-                rebuild:
-                    nixos-rebuild switch --use-remote-sudo --flake ~/Files/Projects/dotfiles#${hostname} --show-trace
-
-                update:
-                    nix flake update --flake ~/Files/Projects/dotfiles
-
-                elm:
-                    cd ~/Files/Projects/website/frontend ; elm-land server
-
-                server:
-                    ssh ${devices.ceres.ip.address0}
-
-                serverRemote:
-                    ssh ${instances.web.remotehost.address0}
-
-                ${deviceLogic.name}:
-                    ssh ${deviceLogic.ip.address0}
-
-                vpnoff:
-                    sudo systemctl stop wg-quick-Proton-*.service
-
-                ${vpnCommands}
-              '';
-            };
+          "./justfile" = import ./files/misc/justfile.nix { inherit flake config lib; };
           "./Files/Scripts/list.sh" = {
-            source = ./files/list.sh;
+            source = ./files/scripts/list.sh;
             executable = true;
           };
           "./Files/Scripts/loop.sh" = {
-            source = ./files/loop.sh;
+            source = ./files/scripts/loop.sh;
             executable = true;
           };
           "./.config/scripts/get_weather.sh" = {
-            source = ./files/get_weather.sh;
+            source = ./files/scripts/get_weather.sh;
             executable = true;
           };
           ".config/wallpaper" = {
diff --git a/profiles/user0/files/misc/justfile.nix b/profiles/user0/files/misc/justfile.nix
new file mode 100755
index 0000000..c464c7c
--- /dev/null
+++ b/profiles/user0/files/misc/justfile.nix
@@ -0,0 +1,60 @@
+{
+  flake,
+  config,
+  lib,
+  ...
+}:
+
+let
+  inherit (flake.config.machines) devices;
+  inherit (flake.config.services) instances;
+
+  mars = devices.mars;
+  deimos = devices.deimos;
+  hostname = config.networking.hostName;
+  deviceLogic = if hostname == mars.name then deimos else mars;
+
+  vpnServers = [
+    "CA363"
+    "CA220"
+    "CA358"
+    "CA627"
+  ];
+
+  vpnCommands = lib.concatStrings (
+    lib.imap0 (i: server: ''
+      vpn${toString i}:
+          sudo systemctl start wg-quick-Proton-${server}.service
+
+    '') vpnServers
+  );
+in
+{
+  text = ''
+    rebuildBoot:
+        nixos-rebuild boot --use-remote-sudo --flake ~/Files/Projects/dotfiles#${hostname} --show-trace
+
+    rebuild:
+        nixos-rebuild switch --use-remote-sudo --flake ~/Files/Projects/dotfiles#${hostname} --show-trace
+
+    update:
+        nix flake update --flake ~/Files/Projects/dotfiles
+
+    elm:
+        cd ~/Files/Projects/website/frontend ; elm-land server
+
+    server:
+        ssh ${devices.ceres.ip.address0}
+
+    serverRemote:
+        ssh ${instances.web.remotehost.address0}
+
+    ${deviceLogic.name}:
+        ssh ${deviceLogic.ip.address0}
+
+    vpnoff:
+        sudo systemctl stop wg-quick-Proton-*.service
+
+    ${vpnCommands}
+  '';
+}
diff --git a/profiles/user0/files/get_weather.sh b/profiles/user0/files/scripts/get_weather.sh
similarity index 100%
rename from profiles/user0/files/get_weather.sh
rename to profiles/user0/files/scripts/get_weather.sh
diff --git a/profiles/user0/files/list.sh b/profiles/user0/files/scripts/list.sh
similarity index 100%
rename from profiles/user0/files/list.sh
rename to profiles/user0/files/scripts/list.sh
diff --git a/profiles/user0/files/loop.sh b/profiles/user0/files/scripts/loop.sh
similarity index 100%
rename from profiles/user0/files/loop.sh
rename to profiles/user0/files/scripts/loop.sh
diff --git a/profiles/user0/files/modnix.sh b/profiles/user0/files/scripts/modnix.sh
similarity index 100%
rename from profiles/user0/files/modnix.sh
rename to profiles/user0/files/scripts/modnix.sh
diff --git a/profiles/user0/files/reinstall.sh b/profiles/user0/files/scripts/reinstall.sh
similarity index 100%
rename from profiles/user0/files/reinstall.sh
rename to profiles/user0/files/scripts/reinstall.sh
diff --git a/profiles/user1/default.nix b/profiles/user1/default.nix
index c75cd5f..2d21b03 100755
--- a/profiles/user1/default.nix
+++ b/profiles/user1/default.nix
@@ -2,13 +2,14 @@
   config,
   flake,
   pkgs,
+  lib,
   ...
 }:
 let
   inherit (flake) self;
   inherit (flake.config.people) user1;
   inherit (flake.config.machines) devices;
-  inherit (flake.config.people.users.${user1}) name;
+  inherit (flake.config.people.users.${user1}) name paths;
   hostname = config.networking.hostName;
 in
 {
@@ -19,13 +20,15 @@ in
       isNormalUser = true;
       shell = pkgs.nushell;
       extraGroups = [
-        "libvirtd"
+        "adbusers"
         "disk"
+        "libvirtd"
+        "netdev"
         "networkmanager"
+        "plugdev"
+        "samba"
         "vboxusers"
         "wheel"
-        "adbusers"
-        "netdev"
       ];
     };
   };
@@ -35,19 +38,22 @@ in
         username = user1;
         homeDirectory = "/home/${user1}";
         file = {
-          "./justfile" = {
-            source = ./files/justfile;
-          };
           "./.config/scripts/get_weather.sh" = {
-            source = ./files/get_weather.sh;
+            source = ./files/scripts/get_weather.sh;
             executable = true;
           };
           ".config/wallpaper" = {
             source = ./files/wallpaper;
             recursive = true;
           };
+          "./.config/vesktop/themes/macchiato-theme.css" = {
+            source = ./files/themes/vesktop/macchiato-theme.css;
+          };
+        };
+        sessionVariables = {
+          VISUAL = lib.getExe pkgs.zed-editor;
+          GTK_THEME = "catppuccin-macchiato-mauve-compact";
         };
-        sessionVariables = { };
       };
       imports = [
         {
@@ -61,4 +67,25 @@ in
       ];
     };
   };
+  systemd.tmpfiles = {
+    rules =
+      [
+        "d ${paths.path0} 0755 ${user1} users -"
+      ]
+      ++ (map (path: "d /home/${user1}/${path} 0755 ${user1} users -") [
+        "Files"
+        "Files/Scripts"
+        "Files/Games"
+        "Files/Screenshots"
+      ])
+      ++ (map (path: "R /home/${user1}/${path} 0755 ${user1} users - -") [
+        "Desktop"
+        "Documents"
+        "Music"
+        "Pictures"
+        "Public"
+        "Templates"
+        "Videos"
+      ]);
+  };
 }
diff --git a/profiles/user1/files/justfile b/profiles/user1/files/justfile
deleted file mode 100755
index bb2295b..0000000
--- a/profiles/user1/files/justfile
+++ /dev/null
@@ -1,14 +0,0 @@
-ewwEdit:
-    eww --config /home/nick/dotfiles/home-manager/modules/eww/config/ open centerPanel
-
-ewwLaunch:
-    ./home/nick/dotfiles/home-manager/modules/eww/config/scripts/master.sh
-
-gobrrr:
-    home-manager switch --flake ~/dotfiles#desktop
-
-gobrrrl:
-    nixos-rebuild switch --use-remote-sudo --flake /home/nick/dotfiles#desktop
-
-fuckoff:
-    shutdown now
diff --git a/profiles/user1/files/get_weather.sh b/profiles/user1/files/scripts/get_weather.sh
similarity index 100%
rename from profiles/user1/files/get_weather.sh
rename to profiles/user1/files/scripts/get_weather.sh
diff --git a/profiles/user3/files/themes/vesktop/macchiato-theme.css b/profiles/user1/files/themes/vesktop/macchiato-theme.css
similarity index 100%
rename from profiles/user3/files/themes/vesktop/macchiato-theme.css
rename to profiles/user1/files/themes/vesktop/macchiato-theme.css
diff --git a/profiles/user1/files/wallpaper/0v1YQLSg6MTHNJwDdky4Igcc6nTTbMctPS8DhT_iGww.webp b/profiles/user1/files/wallpaper/0v1YQLSg6MTHNJwDdky4Igcc6nTTbMctPS8DhT_iGww.webp
deleted file mode 100755
index d2a4fa8..0000000
Binary files a/profiles/user1/files/wallpaper/0v1YQLSg6MTHNJwDdky4Igcc6nTTbMctPS8DhT_iGww.webp and /dev/null differ
diff --git a/profiles/user3/files/wallpaper/7yKtaRij2giAj0s09F6gmB8XIje.jpg b/profiles/user1/files/wallpaper/7yKtaRij2giAj0s09F6gmB8XIje.jpg
similarity index 100%
rename from profiles/user3/files/wallpaper/7yKtaRij2giAj0s09F6gmB8XIje.jpg
rename to profiles/user1/files/wallpaper/7yKtaRij2giAj0s09F6gmB8XIje.jpg
diff --git a/profiles/user1/files/wallpaper/9402963.jpg b/profiles/user1/files/wallpaper/9402963.jpg
deleted file mode 100755
index 3423e88..0000000
Binary files a/profiles/user1/files/wallpaper/9402963.jpg and /dev/null differ
diff --git a/profiles/user3/files/wallpaper/FTDCMyaXoAEUn5h.jpg b/profiles/user1/files/wallpaper/FTDCMyaXoAEUn5h.jpg
similarity index 100%
rename from profiles/user3/files/wallpaper/FTDCMyaXoAEUn5h.jpg
rename to profiles/user1/files/wallpaper/FTDCMyaXoAEUn5h.jpg
diff --git a/profiles/user3/files/wallpaper/cat-waves.png b/profiles/user1/files/wallpaper/cat-waves.png
similarity index 100%
rename from profiles/user3/files/wallpaper/cat-waves.png
rename to profiles/user1/files/wallpaper/cat-waves.png
diff --git a/profiles/user1/files/wallpaper/f.jpg b/profiles/user1/files/wallpaper/f.jpg
deleted file mode 100755
index 12c9bce..0000000
Binary files a/profiles/user1/files/wallpaper/f.jpg and /dev/null differ
diff --git a/profiles/user3/files/wallpaper/juliemao-1741428128332-6023.jpg b/profiles/user1/files/wallpaper/juliemao-1741428128332-6023.jpg
similarity index 100%
rename from profiles/user3/files/wallpaper/juliemao-1741428128332-6023.jpg
rename to profiles/user1/files/wallpaper/juliemao-1741428128332-6023.jpg
diff --git a/profiles/user1/files/wallpaper/murder-drones-action-scene-2hplnpxoeolfor3a.jpg b/profiles/user1/files/wallpaper/murder-drones-action-scene-2hplnpxoeolfor3a.jpg
deleted file mode 100755
index a78ad39..0000000
Binary files a/profiles/user1/files/wallpaper/murder-drones-action-scene-2hplnpxoeolfor3a.jpg and /dev/null differ
diff --git a/profiles/user1/files/wallpaper/murder-drones-wallpapers-8.jpg b/profiles/user1/files/wallpaper/murder-drones-wallpapers-8.jpg
deleted file mode 100755
index 0bf2e3f..0000000
Binary files a/profiles/user1/files/wallpaper/murder-drones-wallpapers-8.jpg and /dev/null differ
diff --git a/profiles/user3/files/wallpaper/pinksky.png b/profiles/user1/files/wallpaper/pinksky.png
similarity index 100%
rename from profiles/user3/files/wallpaper/pinksky.png
rename to profiles/user1/files/wallpaper/pinksky.png
diff --git a/profiles/user3/files/wallpaper/u6ne2q214dx71.jpg b/profiles/user1/files/wallpaper/u6ne2q214dx71.jpg
similarity index 100%
rename from profiles/user3/files/wallpaper/u6ne2q214dx71.jpg
rename to profiles/user1/files/wallpaper/u6ne2q214dx71.jpg
diff --git a/profiles/user3/files/wallpaper/wallhaven-0wj757.jpg b/profiles/user1/files/wallpaper/wallhaven-0wj757.jpg
similarity index 100%
rename from profiles/user3/files/wallpaper/wallhaven-0wj757.jpg
rename to profiles/user1/files/wallpaper/wallhaven-0wj757.jpg
diff --git a/profiles/user3/files/wallpaper/wallhaven-2ege2g.jpg b/profiles/user1/files/wallpaper/wallhaven-2ege2g.jpg
similarity index 100%
rename from profiles/user3/files/wallpaper/wallhaven-2ege2g.jpg
rename to profiles/user1/files/wallpaper/wallhaven-2ege2g.jpg
diff --git a/profiles/user3/files/wallpaper/wallhaven-4dj2qo.png b/profiles/user1/files/wallpaper/wallhaven-4dj2qo.png
similarity index 100%
rename from profiles/user3/files/wallpaper/wallhaven-4dj2qo.png
rename to profiles/user1/files/wallpaper/wallhaven-4dj2qo.png
diff --git a/profiles/user3/files/wallpaper/wallhaven-4xq6vv.png b/profiles/user1/files/wallpaper/wallhaven-4xq6vv.png
similarity index 100%
rename from profiles/user3/files/wallpaper/wallhaven-4xq6vv.png
rename to profiles/user1/files/wallpaper/wallhaven-4xq6vv.png
diff --git a/profiles/user3/files/wallpaper/wallhaven-5dyvy3.jpg b/profiles/user1/files/wallpaper/wallhaven-5dyvy3.jpg
similarity index 100%
rename from profiles/user3/files/wallpaper/wallhaven-5dyvy3.jpg
rename to profiles/user1/files/wallpaper/wallhaven-5dyvy3.jpg
diff --git a/profiles/user3/files/wallpaper/wallhaven-735xv3.jpg b/profiles/user1/files/wallpaper/wallhaven-735xv3.jpg
similarity index 100%
rename from profiles/user3/files/wallpaper/wallhaven-735xv3.jpg
rename to profiles/user1/files/wallpaper/wallhaven-735xv3.jpg
diff --git a/profiles/user3/files/wallpaper/wallhaven-8xe25y.jpg b/profiles/user1/files/wallpaper/wallhaven-8xe25y.jpg
similarity index 100%
rename from profiles/user3/files/wallpaper/wallhaven-8xe25y.jpg
rename to profiles/user1/files/wallpaper/wallhaven-8xe25y.jpg
diff --git a/profiles/user3/files/wallpaper/wallhaven-eyrj7o.jpg b/profiles/user1/files/wallpaper/wallhaven-eyrj7o.jpg
similarity index 100%
rename from profiles/user3/files/wallpaper/wallhaven-eyrj7o.jpg
rename to profiles/user1/files/wallpaper/wallhaven-eyrj7o.jpg
diff --git a/profiles/user3/files/wallpaper/wallhaven-g8ky73.jpg b/profiles/user1/files/wallpaper/wallhaven-g8ky73.jpg
similarity index 100%
rename from profiles/user3/files/wallpaper/wallhaven-g8ky73.jpg
rename to profiles/user1/files/wallpaper/wallhaven-g8ky73.jpg
diff --git a/profiles/user3/files/wallpaper/wallhaven-j8wzvp.jpg b/profiles/user1/files/wallpaper/wallhaven-j8wzvp.jpg
similarity index 100%
rename from profiles/user3/files/wallpaper/wallhaven-j8wzvp.jpg
rename to profiles/user1/files/wallpaper/wallhaven-j8wzvp.jpg
diff --git a/profiles/user3/files/wallpaper/wallhaven-nekxjk.png b/profiles/user1/files/wallpaper/wallhaven-nekxjk.png
similarity index 100%
rename from profiles/user3/files/wallpaper/wallhaven-nekxjk.png
rename to profiles/user1/files/wallpaper/wallhaven-nekxjk.png
diff --git a/profiles/user3/files/wallpaper/wallhaven-nryz87.jpg b/profiles/user1/files/wallpaper/wallhaven-nryz87.jpg
similarity index 100%
rename from profiles/user3/files/wallpaper/wallhaven-nryz87.jpg
rename to profiles/user1/files/wallpaper/wallhaven-nryz87.jpg
diff --git a/profiles/user3/files/wallpaper/wallhaven-r7yey1.jpg b/profiles/user1/files/wallpaper/wallhaven-r7yey1.jpg
similarity index 100%
rename from profiles/user3/files/wallpaper/wallhaven-r7yey1.jpg
rename to profiles/user1/files/wallpaper/wallhaven-r7yey1.jpg
diff --git a/profiles/user3/files/wallpaper/wallhaven-vge32m.jpg b/profiles/user1/files/wallpaper/wallhaven-vge32m.jpg
similarity index 100%
rename from profiles/user3/files/wallpaper/wallhaven-vge32m.jpg
rename to profiles/user1/files/wallpaper/wallhaven-vge32m.jpg
diff --git a/profiles/user3/files/wallpaper/wallhaven-vgxgem.jpg b/profiles/user1/files/wallpaper/wallhaven-vgxgem.jpg
similarity index 100%
rename from profiles/user3/files/wallpaper/wallhaven-vgxgem.jpg
rename to profiles/user1/files/wallpaper/wallhaven-vgxgem.jpg
diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (1).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (1).jpg
similarity index 100%
rename from profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (1).jpg
rename to profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (1).jpg
diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (10).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (10).jpg
similarity index 100%
rename from profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (10).jpg
rename to profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (10).jpg
diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (11).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (11).jpg
similarity index 100%
rename from profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (11).jpg
rename to profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (11).jpg
diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (12).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (12).jpg
similarity index 100%
rename from profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (12).jpg
rename to profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (12).jpg
diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (13).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (13).jpg
similarity index 100%
rename from profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (13).jpg
rename to profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (13).jpg
diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (14).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (14).jpg
similarity index 100%
rename from profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (14).jpg
rename to profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (14).jpg
diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (15).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (15).jpg
similarity index 100%
rename from profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (15).jpg
rename to profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (15).jpg
diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (16).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (16).jpg
similarity index 100%
rename from profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (16).jpg
rename to profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (16).jpg
diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (17).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (17).jpg
similarity index 100%
rename from profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (17).jpg
rename to profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (17).jpg
diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (19).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (19).jpg
similarity index 100%
rename from profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (19).jpg
rename to profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (19).jpg
diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (2).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (2).jpg
similarity index 100%
rename from profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (2).jpg
rename to profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (2).jpg
diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (20).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (20).jpg
similarity index 100%
rename from profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (20).jpg
rename to profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (20).jpg
diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (21).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (21).jpg
similarity index 100%
rename from profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (21).jpg
rename to profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (21).jpg
diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (22).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (22).jpg
similarity index 100%
rename from profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (22).jpg
rename to profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (22).jpg
diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (23).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (23).jpg
similarity index 100%
rename from profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (23).jpg
rename to profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (23).jpg
diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (24).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (24).jpg
similarity index 100%
rename from profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (24).jpg
rename to profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (24).jpg
diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (26).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (26).jpg
similarity index 100%
rename from profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (26).jpg
rename to profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (26).jpg
diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (27).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (27).jpg
similarity index 100%
rename from profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (27).jpg
rename to profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (27).jpg
diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (28).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (28).jpg
similarity index 100%
rename from profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (28).jpg
rename to profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (28).jpg
diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (29).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (29).jpg
similarity index 100%
rename from profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (29).jpg
rename to profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (29).jpg
diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (3).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (3).jpg
similarity index 100%
rename from profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (3).jpg
rename to profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (3).jpg
diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (30).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (30).jpg
similarity index 100%
rename from profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (30).jpg
rename to profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (30).jpg
diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (31).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (31).jpg
similarity index 100%
rename from profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (31).jpg
rename to profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (31).jpg
diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (32).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (32).jpg
similarity index 100%
rename from profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (32).jpg
rename to profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (32).jpg
diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (34).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (34).jpg
similarity index 100%
rename from profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (34).jpg
rename to profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (34).jpg
diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (35).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (35).jpg
similarity index 100%
rename from profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (35).jpg
rename to profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (35).jpg
diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (37).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (37).jpg
similarity index 100%
rename from profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (37).jpg
rename to profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (37).jpg
diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (38).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (38).jpg
similarity index 100%
rename from profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (38).jpg
rename to profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (38).jpg
diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (4).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (4).jpg
similarity index 100%
rename from profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (4).jpg
rename to profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (4).jpg
diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (5).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (5).jpg
similarity index 100%
rename from profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (5).jpg
rename to profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (5).jpg
diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (6).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (6).jpg
similarity index 100%
rename from profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (6).jpg
rename to profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (6).jpg
diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (7).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (7).jpg
similarity index 100%
rename from profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (7).jpg
rename to profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (7).jpg
diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (8).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (8).jpg
similarity index 100%
rename from profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (8).jpg
rename to profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (8).jpg
diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (9).jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (9).jpg
similarity index 100%
rename from profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper (9).jpg
rename to profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper (9).jpg
diff --git a/profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper.jpg b/profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper.jpg
similarity index 100%
rename from profiles/user3/files/wallpaper/wallpaperflare.com_wallpaper.jpg
rename to profiles/user1/files/wallpaper/wallpaperflare.com_wallpaper.jpg
diff --git a/profiles/user3/files/wallpaper/yrTphE7NymvE-bSD.mp4 b/profiles/user1/files/wallpaper/yrTphE7NymvE-bSD.mp4
similarity index 100%
rename from profiles/user3/files/wallpaper/yrTphE7NymvE-bSD.mp4
rename to profiles/user1/files/wallpaper/yrTphE7NymvE-bSD.mp4
diff --git a/profiles/user2/default.nix b/profiles/user2/default.nix
deleted file mode 100755
index 4603663..0000000
--- a/profiles/user2/default.nix
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  config,
-  flake,
-  pkgs,
-  ...
-}:
-let
-  inherit (flake) self;
-  inherit (flake.config.people) user2;
-  inherit (flake.config.machines) devices;
-  inherit (flake.config.people.users.${user2}) name paths;
-  hostname = config.networking.hostName;
-in
-
-{
-  users = {
-    users.${user2} = {
-      description = name;
-      name = user2;
-      isNormalUser = true;
-      shell = pkgs.nushell;
-      extraGroups = [
-        "adbusers"
-        "disk"
-        "libvirtd"
-        "minecraft"
-        "netdev"
-        "networkmanager"
-        "ollama"
-        "syncthing"
-        "vboxusers"
-        "wheel"
-      ];
-    };
-  };
-  home-manager.users = {
-    ${user2} = {
-      home = {
-        username = user2;
-        homeDirectory = "/home/${user2}";
-        file = {
-          "./justfile" = {
-            source = ./files/justfile;
-          };
-        };
-        sessionVariables = {
-          WLR_NO_HARDWARE_CURSORS = "1";
-          WLR_DRM_NO_ATOMIC = "1";
-          VIDEO_PLAYER = "vlc";
-          EDITOR = "vscode";
-          NIXPKGS_ALLOW_INSECURE = "1";
-        };
-      };
-
-      imports = [
-        {
-          home.stateVersion = config.system.stateVersion;
-        }
-        {
-          imports = [
-            self.homeModules."${devices.${hostname}.name}-${user2}"
-          ];
-        }
-      ];
-    };
-  };
-  systemd.tmpfiles =
-    let
-      directoriesAddedToHome = [
-        "Projects"
-      ];
-
-      directoriesRemovedFromHome = [
-        "Music"
-        "Public"
-        "Templates"
-      ];
-    in
-    {
-      rules =
-        [
-          "d ${paths.path0}/Projects 0755 ${user2} users -"
-          "Z ${paths.path0}/.ssh 700 ${user2} users -"
-        ]
-        ++ (map (path: "d /home/${user2}/${path} 0755 ${user2} users -") directoriesAddedToHome)
-        ++ (map (path: "R /home/${user2}/${path} 0755 ${user2} users - -") directoriesRemovedFromHome);
-    };
-
-}
diff --git a/profiles/user2/files/firefox/userChrome.css b/profiles/user2/files/firefox/userChrome.css
deleted file mode 100755
index 7ae6cc9..0000000
--- a/profiles/user2/files/firefox/userChrome.css
+++ /dev/null
@@ -1,266 +0,0 @@
-/**
- * Decrease size of the sidebar header
- */
-*, html, body, html body, :root, #sidebar, #sidebar-box, .sidebar-panel, #root.root, #PlacesToolbarItems .bookmark-item, #PlacesToolbarItems .tab-item, .sidebar-placesTreechildren::-moz-tree-cell-text, .sidebar-placesTreechildren, .form-control {
-    font: 7pt "Lucida Sans", Classica !important;
-    outline: 0px !important;
-    border: 0px !important;
-}
-
-html, body, :root, #sidebar, #sidebar-box, .sidebar-panel, #root.root, #PlacesToolbarItems.bookmark-item, #PlacesToolbarItems.tab-item, .titlebar, .toolbar, #PlacesToolbar, #personal-bookmarks, #bookmarks-toolbar-button, #navigator-toolbox, #nav-bar, #library {
-    background-color: #1a1920 !important;
-    outline: 0px !important;
-    border: 0px !important;
-}
-
-@-moz-document url-prefix("moz-extension://4bfeee63-c7b3-4bb9-a7df-a2c0fd73eec0") {
-    *, html, body, html body, #root, :root, .Tab .title, .main-items .nav-item .len {
-    font-size: 7pt !important;
-    font-family: "Lucida Sans", "Classica" !important;
-    --tabs-font: 7pt "Lucida Sans", "Classica" !important;
-    background-color: #1a1920 !important;
-    outline: 0px !important;
-    border: 0px !important;
-    }
-}
-
-/* extension icons opacity and fade */
-
-#nav-bar toolbarbutton {
-    filter: grayscale(100%) !important;
-    opacity: 0.3 !important;
-    transition: transform 200ms ease 0.5s, opacity 200ms ease 0.5s !important;
-}
-
-#nav-bar toolbarbutton:hover {
-    filter: grayscale(0%) !important;
-    opacity: 1 !important;
-    transition-duration: 200ms !important;
-    transition-delay: 0s !important;
-}
-
-#sidebar-header toolbarbutton {
-    filter: grayscale(100%) !important;
-    opacity: 0 !important;
-    transition: transform 200ms ease 0.5s, opacity 200ms ease 0.5s !important;
-    min-width:150px !important;
-    align: center !important;
-}
-#sidebar-header toolbarbutton:hover {
-    filter: grayscale(0%) !important;
-    opacity: 1 !important;
-    transition-duration: 200ms !important;
-    transition-delay: 0s !important;
-    min-width:150px !important;
-    align: center !important;
-}
-
-.close-icon {width:0px !important;}
-
-/* --- */
-
-
-/* hide address bar bloat */
-    #tracking-protection-icon-container { display: none; }
-    #identity-box { display: none; }
-    #reader-mode-button { display: none; }
-    #pageActionButton { display: none; }
-    #pocket-button { display: none; }
-    #star-button { display: none; }
-    #urlbar-zoom-button { display: none; }
-/* --- */
-
-/* Go to arrow button at the end of the urlbar when searching */
-#urlbar-go-button { display: none; }
-
-/* Bottom left page loading status or url preview */
-/* #statuspanel { display: none !important; } */
-
-
-/* hide address bar*/
-
-/* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/autohide_main_toolbar.css made available under Mozilla Public License v. 2.0
- S ee the above repository for updates as well as full license text. */                                                            *
-
- /* This style hides the main toolbar and shows it when the cursor is over the tabs toolbar as well as whenever the focus is inside nav-bar, such as when urlbar is focused. */
-
- :root{ --uc-navbar-transform: -40px }
- :root[uidensity="compact"]{ --uc-navbar-transform: -4px }
-
-
- #navigator-toolbox > div{ display: contents; }
- :root[sessionrestored] :where(#nav-bar,#PersonalToolbar,#tab-notification-deck,.global-notificationbox){
-     transform: translateY(var(--uc-navbar-transform))
- }
- :root:is([customizing],[chromehidden*="toolbar"]) :where(#nav-bar,#PersonalToolbar,#tab-notification-deck,.global-notificationbox){
-     transform: none !important;
-     opacity: 1 !important;
- }
-
- #nav-bar, #nav-bar-customization-target {
- height: 30px !important;
- }
-
- #nav-bar-content, #nav-bar-content {
- height: 20px !important;
- margin-top: 4px !important;
- }
-
- #urlbar {
-     width: 300px !important;
-     padding-left: 10px !important;
-     padding-right: -10px !important;
-     left: -50px !important;
-}
-
- #nav-bar:not([customizing]){
- opacity: 0;
- transition:  transform 400ms ease 1.5s, opacity 400ms ease 1.5s !important;
- position: relative;
- z-index: 2;
- }
- #titlebar{ position: relative; z-index: 3 }
-
- /* Show when toolbox is focused, like when urlbar has received focus */
- #navigator-toolbox:focus-within > .browser-toolbar{
- transform: translateY(0);
- opacity: 1;
- transition-duration: 500ms, 200ms !important;
- transition-delay: 0s !important;
- }
- /* Show when toolbox is hovered */
- #titlebar:hover ~ .browser-toolbar,
- #nav-bar:hover,
- #nav-bar:hover + #PersonalToolbar{
- transform: translateY(0);
- opacity: 1;
- transition-duration: 500ms, 200ms !important;
- transition-delay: 0s !important;
- }
- /* This ruleset is separate, because not having :has support breaks other selectors as well */
- #mainPopupSet:has(> #appMenu-popup:hover) ~ #navigator-toolbox > .browser-toolbar{
- transition-delay: 33ms !important;
- transform: translateY(0);
- opacity: 1;
- background-color: #1a1920 !important;
- }
-
- /* Bookmarks toolbar needs so extra rules */
- #PersonalToolbar{ transition: transform 400ms ease 1.5s !important; position: relative; z-index: 1; background-color: #1a1920 !important; }
-
- /* Move up the content view */
- :root[sessionrestored]:not([inFullscreen],[chromehidden~="toolbar"]) > body > #browser{ margin-top: var(--uc-navbar-transform); }
-
-/* --- end hide --- */
-
-
-
-#sidebar-header {color: #1a1920 !important;
-font-size: 1.2em !important;
-font-family: "Dumbledor 3", Times New Roman !important;
-padding: 2px 6px 2px 3px !important;
-}
-#sidebar-header #sidebar-close {
-padding: 3px !important;
-}
-#sidebar-header #sidebar-close .toolbarbutton-icon {
-width: 0px !important;
-height: 0px !important;
-opacity: 0.6 !important;
-}
-
-#TabsToolbar {
-font-size: 0.8em !important;
-font-family: "Troglodyte" !important;
-display: none;
-}
-
-
-/* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/autohide_sidebar.css made available under Mozilla Public License v. 2.0
- *See the above repository for updates as well as full license text. */
-
-/* Show sidebar only when the cursor is over it  */
-/* The border controlling sidebar width will be removed so you'll need to modify these values to change width */
-
-#sidebar-box{
---uc-sidebar-width: 30px;
---uc-sidebar-hover-width: 180px;
---uc-autohide-sidebar-delay: 600ms; /* Wait 0.6s before hiding sidebar */
---uc-autohide-transition-duration: 115ms;
---uc-autohide-transition-type: linear;
-position: relative;
-min-width: var(--uc-sidebar-width) !important;
-width: var(--uc-sidebar-width) !important;
-max-width: var(--uc-sidebar-width) !important;
-z-index:1;
-}
-
-#sidebar-box[positionend]{ direction: rtl }
-#sidebar-box[positionend] > *{ direction: ltr }
-
-#sidebar-box[positionend]:-moz-locale-dir(rtl){ direction: ltr }
-#sidebar-box[positionend]:-moz-locale-dir(rtl) > *{ direction: rtl }
-
-#main-window[sizemode="fullscreen"] #sidebar-box{ --uc-sidebar-width: 1px; }
-
-#sidebar-splitter{ display: none }
-
-#sidebar-header{
-overflow: hidden;
-color: var(--chrome-color, inherit) !important;
-padding-inline: 0 !important;
-}
-
-#sidebar-header::before,
-#sidebar-header::after{
-content: "";
-display: flex;
-padding-left: 8px;
-}
-
-#sidebar-header,
-#sidebar{
-transition: min-width var(--uc-autohide-transition-duration) var(--uc-autohide-transition-type) var(--uc-autohide-sidebar-delay) !important;
-min-width: var(--uc-sidebar-width) !important;
-will-change: min-width;
-}
-#sidebar-box:hover > #sidebar-header,
-#sidebar-box:hover > #sidebar{
-min-width: var(--uc-sidebar-hover-width) !important;
-transition-delay: 0ms !important;
-}
-
-.sidebar-panel{
-    background-color: transparent !important;
-    color: var(--newtab-text-primary-color) !important;
-}
-
-.sidebar-panel #search-box{
-    -moz-appearance: none !important;
-    background-color: rgba(249,249,250,0.1) !important;
-    color: inherit !important;
-}
-
-/* Add sidebar divider and give it background */
-
-#sidebar,
-#sidebar-header{
-background-color: inherit !important;
-border-inline: 1px solid rgb(80,80,80);
-border-inline-width: 0px 1px;
-}
-
-#sidebar-box:not([positionend]) > :-moz-locale-dir(rtl),
-#sidebar-box[positionend] > *{
-border-inline-width: 1px 0px;
-}
-
-/* Move statuspanel to the other side when sidebar is hovered so it doesn't get covered by sidebar */
-
-#sidebar-box:not([positionend]):hover ~ #appcontent #statuspanel{
-inset-inline: auto 0px !important;
-}
-#sidebar-box:not([positionend]):hover ~ #appcontent #statuspanel-label{
-margin-inline: 0px !important;
-border-left-style: solid !important;
-}
diff --git a/profiles/user2/files/firefox/userContent.css b/profiles/user2/files/firefox/userContent.css
deleted file mode 100755
index b6d02dc..0000000
--- a/profiles/user2/files/firefox/userContent.css
+++ /dev/null
@@ -1,126 +0,0 @@
-/* home page edits */
-
-@-moz-document url("about:home"), url("about:newtab"){
-    html, body, #root, input {
-        background-color: #1a1920 !important;
-    }
-
-    * { /* this is where I enforce the font everywhere */
-        font-size: 8pt !important;
-        font-family: "Lucida Grande", "Classica" !important;
-        line-height: 9pt !important;
-    } /* so that my sidebar tabs aren't fucking HUGE */
-
-    .collapsible-section.ds-layout {
-        max-height: 400px !important;
-        background-color: #000 !important;
-    }
-    .search-wrapper {
-        filter: grayscale(80%) !important;
-        opacity: 0 !important;
-        vertical-align: middle !important;
-    }
-    .personalizeButtonWrapper {
-        opacity: 0.2 !important;
-        transition: transform 200ms ease 0.5s, opacity 200ms ease 0.5s !important;
-    }
-    .personalizeButtonWrapper:hover {
-        opacity: 0.7 !important;
-        transition-duration: 200ms !important;
-        transition-delay: 0s !important;
-    }
-    .search-inner-wrapper { /* begone THOT */
-        display:none !important;
-        width: 300px !important;
-        min-height: 30px !important;
-        --newtab-search-icon: 0 !important;
-    }
-    .body-wrapper  {margin-top: -200px;}
-    .context-menu-button { /* the button that has the menu to edit your shortcuts */
-        margin-right: 10px !important; margin-top: 0px !important; opacity: 0 !important;
-        background-color: transparent !important;
-    }
-    .context-menu-button:hover {opacity: 0.7 !important;}
-    .top-site-outer, .top-site-inner {
-        margin-block-end: 0px !important;
-        background-color: transparent !important;
-    }
-    .top-site-outer:hover {
-        background-color: transparent !important;
-    }
-    .top-site-button {padding: 0px !important; background-color:transparent !important;}
-
-    .tile { /* here be buttons */
-        filter: grayscale(100%) !important;
-        background-color: transparent !important;
-        border: 0px !important;
-        opacity: 0.1 !important;
-        transition: 50ms ease 0.4s !important;
-        vertical-align: middle !important;
-    }
-    .tile:hover {
-        filter: grayscale(50%) !important;
-        opacity: 0.7 !important;
-        transition: 50ms ease 0.2s !important;
-    }
-    .icon-wrapper {
-        background-color: transparent !important;
-        border: 0px !important;
-    }
-
-    .top-site-button .top-site-icon{
-        background-color: transparent !important;
-        background-size: contain !important;
-        background-repeat: no-repeat !important;
-        background-position: center !important;
-        padding: 0px !important;
-        border-radius: 0px !important;
-    }
-
-/* custom icons so I can have custom+transparency on Home and New Tab pages */
-    .top-site-button[href="http://deck.blue"] .top-site-icon{
-        background-image: url("https://i.imgur.com/Z8IrhAY.png") !important;
-    }
-    .top-site-button[href="http://new.reddit.com"] .top-site-icon{
-        background-image: url("https://i.imgur.com/3QIQIeD.png") !important;
-    }
-    .top-site-button[href="http://gaiaonline.com"] .top-site-icon{
-        background-image: url("https://i.imgur.com/Vp7urqM.png") !important;
-    }
-    .top-site-button[href="http://orcanetwork.org"] .top-site-icon{
-        background-image: url("https://i.imgur.com/hvKM68l.png") !important;
-    }
-    .top-site-button[href="http://whaleresearch.com"] .top-site-icon{
-        background-image: url("https://i.imgur.com/uuBDA57.png") !important;
-    }
-    .top-site-button[href="http://whale-of-a-porpoise.blogspot.ca"] .top-site-icon{
-        background-image: url("https://i.imgur.com/qm2BYfR.png") !important;
-    }
-
-/* !!! icon alignment and size fix !!! */
-    .icon.icon-pin-small {
-        width: 0px !important;
-    }
-    .top-site-outer .title {
-        padding-top: 0px !important;
-    }
-    .top-site-outer {
-        margin-block-end: unset !important;
-    }
-    .top-site-outer .title span {
-        visibility: hidden !important;
-    }
-    .top-site-outer .title:not(.sponsored) .sponsored-label {
-        height: 0px !important;
-    }
-    .top-site-outer .context-menu-button:hover {
-        background-color: unset !important;
-    }
-    .top-site-outer .context-menu-button {
-        transition: none !important;
-        background-color: unset !important;
-        top: 0px !important;
-    }
-    .top-site-outer .default-icon {width:48px !important; height:48px !important;}
-}
-/* --- home page edits end --- */
diff --git a/profiles/user2/files/justfile b/profiles/user2/files/justfile
deleted file mode 100755
index 7a6d847..0000000
--- a/profiles/user2/files/justfile
+++ /dev/null
@@ -1,6 +0,0 @@
-gobrr:
-    nixos-rebuild switch --use-remote-sudo --flake ~/Projects/dotfiles#desktop
-
-
-fuckoff:
-    shutdown now
diff --git a/profiles/user2/files/loop.sh b/profiles/user2/files/loop.sh
deleted file mode 100755
index c904110..0000000
--- a/profiles/user2/files/loop.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-while true ; do date ; natpmpc -a 1 0 udp 60 -g 10.2.0.1 && natpmpc -a 1 0 tcp 60 -g 10.2.0.1 || { echo -e "ERROR with natpmpc command \a" ; break ; } ; sleep 45 ; done
diff --git a/profiles/user2/files/modnix.sh b/profiles/user2/files/modnix.sh
deleted file mode 100755
index 15f2ffa..0000000
--- a/profiles/user2/files/modnix.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-cp /etc/nixos/configuration.nix /etc/nixos/configuration.nix.backup
-
-sed -i '/services\.printing\.enable = true;/a\  nix.settings.experimental-features = ["nix-command" "flakes"];\n  services.openssh.enable = true;' /etc/nixos/configuration.nix
-sed -i '/thunderbird/a\      git\n      vscode\n      tomb' /etc/nixos/configuration.nix
-
-echo "/etc/nixos/configuration.nix updated successfully."
\ No newline at end of file
diff --git a/profiles/user3/default.nix b/profiles/user3/default.nix
deleted file mode 100755
index c9cdc1e..0000000
--- a/profiles/user3/default.nix
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-  config,
-  flake,
-  pkgs,
-  lib,
-  ...
-}:
-let
-  inherit (flake) self;
-  inherit (flake.config.people) user3;
-  inherit (flake.config.machines) devices;
-  inherit (flake.config.people.users.${user3}) name paths;
-  hostname = config.networking.hostName;
-in
-{
-  users = {
-    users.${user3} = {
-      description = name;
-      name = user3;
-      isNormalUser = true;
-      shell = pkgs.nushell;
-      extraGroups = [
-        "adbusers"
-        "disk"
-        "libvirtd"
-        "netdev"
-        "networkmanager"
-        "plugdev"
-        "samba"
-        "vboxusers"
-        "wheel"
-      ];
-    };
-  };
-  home-manager.users = {
-    ${user3} = {
-      home = {
-        username = user3;
-        homeDirectory = "/home/${user3}";
-        file = {
-          "./.config/scripts/get_weather.sh" = {
-            source = ./files/get_weather.sh;
-            executable = true;
-          };
-          ".config/wallpaper" = {
-            source = ./files/wallpaper;
-            recursive = true;
-          };
-          "./.config/vesktop/themes/macchiato-theme.css" = {
-            source = ./files/themes/vesktop/macchiato-theme.css;
-          };
-        };
-        sessionVariables = {
-          VISUAL = lib.getExe pkgs.zed-editor;
-          GTK_THEME = "catppuccin-macchiato-mauve-compact";
-        };
-      };
-      imports = [
-        {
-          home.stateVersion = config.system.stateVersion;
-        }
-        {
-          imports = [
-            self.homeModules."${devices.${hostname}.name}-${user3}"
-          ];
-        }
-      ];
-    };
-  };
-  systemd.tmpfiles = {
-    rules =
-      [
-        "d ${paths.path0} 0755 ${user3} users -"
-      ]
-      ++ (map (path: "d /home/${user3}/${path} 0755 ${user3} users -") [
-        "Files"
-        "Files/Scripts"
-        "Files/Games"
-        "Files/Screenshots"
-      ])
-      ++ (map (path: "R /home/${user3}/${path} 0755 ${user3} users - -") [
-        "Desktop"
-        "Documents"
-        "Music"
-        "Pictures"
-        "Public"
-        "Templates"
-        "Videos"
-      ]);
-  };
-}
diff --git a/profiles/user3/files/get_weather.sh b/profiles/user3/files/get_weather.sh
deleted file mode 100755
index 2aee731..0000000
--- a/profiles/user3/files/get_weather.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-for i in {1..5}
-do
-    text=$(curl -s "https://wttr.in/$1?format=1")
-    if [[ $? == 0 ]]
-    then
-        text=$(echo "$text" | sed -E "s/\s+/ /g")
-        tooltip=$(curl -s "https://wttr.in/$1?format=4")
-        if [[ $? == 0 ]]
-        then
-            tooltip=$(echo "$tooltip" | sed -E "s/\s+/ /g")
-            echo "{\"text\":\"$text\", \"tooltip\":\"$tooltip\"}"
-            exit
-        fi
-    fi
-    sleep 2
-done
-echo "{\"text\":\"error\", \"tooltip\":\"error\"}"
\ No newline at end of file
diff --git a/systems/charon/config/boot.nix b/systems/charon/config/boot.nix
deleted file mode 100755
index cc3f996..0000000
--- a/systems/charon/config/boot.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  pkgs,
-  config,
-  ...
-}:
-{
-  boot = {
-    extraModulePackages = [
-      config.boot.kernelPackages.v4l2loopback.out
-    ];
-    supportedFilesystems = [
-      "ntfs"
-    ];
-    initrd = {
-      network.openvpn.enable = true;
-      availableKernelModules = [
-        "nvme"
-        "ahci"
-        "xhci_pci"
-        "usb_storage"
-        "usbhid"
-        "sd_mod"
-      ];
-      kernelModules = [
-      ];
-    };
-
-    kernelModules = [
-      "kvm-amd"
-      "vfio-pci"
-      "v4l2loopback"
-    ];
-
-    kernelPackages = pkgs.linuxPackages_latest;
-
-    loader = {
-      efi = {
-        canTouchEfiVariables = true;
-        efiSysMountPoint = "/boot";
-      };
-      systemd-boot.enable = true;
-    };
-  };
-}
diff --git a/systems/charon/config/filesystem.nix b/systems/charon/config/filesystem.nix
deleted file mode 100755
index 0a7cbd4..0000000
--- a/systems/charon/config/filesystem.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  flake,
-  config,
-  ...
-}:
-let
-  inherit (flake.config.people) user1;
-  inherit (flake.config.machines.devices) charon;
-in
-{
-  fileSystems = {
-    "/" = {
-      device = "/dev/disk/by-uuid/0457d426-f166-4f35-b77b-93321dca2581";
-      fsType = "ext4";
-    };
-    "/boot" = {
-      device = "/dev/disk/by-uuid/1703-D452";
-      fsType = "vfat";
-      options = charon.boot.options;
-    };
-  };
-
-  swapDevices = [
-    { device = "/dev/disk/by-uuid/bedf4922-fa86-403a-846c-7d900dfb9086"; }
-  ];
-
-  systemd.tmpfiles.rules = [
-    "Z ${config.home-manager.users.${user1}.home.homeDirectory} 0755 ${user1} users -"
-  ];
-}
diff --git a/systems/charon/config/graphics.nix b/systems/charon/config/graphics.nix
deleted file mode 100755
index c2bfd98..0000000
--- a/systems/charon/config/graphics.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  hardware = {
-    graphics = {
-      enable = true;
-      extraPackages = [ ];
-      extraPackages32 = [ ];
-    };
-  };
-  boot.initrd.kernelModules = [
-  ];
-  services.xserver.videoDrivers = [ "modesetting" ];
-}
diff --git a/systems/charon/config/hardware.nix b/systems/charon/config/hardware.nix
deleted file mode 100755
index 448923f..0000000
--- a/systems/charon/config/hardware.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-{
-  hardware = {
-    firmware = builtins.attrValues {
-      inherit (pkgs)
-        rtl8761b-firmware
-        ;
-    };
-    enableAllFirmware = true;
-    cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-  };
-}
diff --git a/systems/charon/config/networking.nix b/systems/charon/config/networking.nix
deleted file mode 100755
index 64ecc59..0000000
--- a/systems/charon/config/networking.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  lib,
-  flake,
-  ...
-}:
-let
-  inherit (flake.config.machines.devices)
-    charon
-    ;
-in
-{
-  networking = {
-    hostName = charon.name;
-    networkmanager.enable = true;
-    nftables.enable = true;
-    useDHCP = lib.mkDefault true;
-    firewall = {
-      enable = true;
-      allowedTCPPorts = [
-      ];
-    };
-  };
-  services = {
-    avahi = {
-      enable = true;
-      openFirewall = true;
-      nssmdns4 = true;
-    };
-    sshd.enable = true;
-    openssh = {
-      enable = true;
-      settings.PasswordAuthentication = false;
-    };
-  };
-}
diff --git a/systems/charon/default.nix b/systems/charon/default.nix
deleted file mode 100755
index 3882556..0000000
--- a/systems/charon/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ lib, ... }:
-let
-  configPath = ./config;
-
-  desktopImports =
-    let
-      files = builtins.attrNames (builtins.readDir configPath);
-    in
-    map (name: configPath + "/${name}") (
-      builtins.filter (name: builtins.match ".*\\.nix$" name != null) files
-    );
-in
-{
-  imports = desktopImports;
-  nixpkgs.hostPlatform = lib.mkForce "x86_64-linux";
-  system.stateVersion = lib.mkForce "24.05";
-}
diff --git a/systems/deimos/config/filesystem.nix b/systems/deimos/config/filesystem.nix
index b43d12e..cad72b5 100755
--- a/systems/deimos/config/filesystem.nix
+++ b/systems/deimos/config/filesystem.nix
@@ -6,7 +6,6 @@
 let
   inherit (flake.config.people)
     user0
-    user1
     ;
   inherit (flake.config.machines.devices)
     deimos
@@ -14,7 +13,6 @@ let
     ceres
     ;
   inherit (flake.config.services.instances)
-    samba
     jellyfin
     audiobookshelf
     ;
@@ -100,7 +98,6 @@ in
 
   systemd.tmpfiles.rules = [
     "Z ${config.home-manager.users.${user0}.home.homeDirectory} 0755 ${user0} users -"
-    "Z ${config.home-manager.users.${user1}.home.homeDirectory} 0755 ${user1} users -"
   ];
 
   services.udisks2.enable = true;
diff --git a/systems/deimos/config/sops.nix b/systems/deimos/config/sops.nix
index 45e8114..90298ee 100755
--- a/systems/deimos/config/sops.nix
+++ b/systems/deimos/config/sops.nix
@@ -1,9 +1,3 @@
-{ flake, ... }:
-let
-  inherit (flake.config.people)
-    user1
-    ;
-in
 {
   sops = {
     secrets = {
@@ -17,11 +11,6 @@ in
         owner = "root";
         mode = "600";
       };
-      "network/${user1}" = {
-        path = "/var/lib/secrets/${user1}";
-        owner = "root";
-        mode = "600";
-      };
     };
   };
 }
diff --git a/systems/mars/config/filesystem.nix b/systems/mars/config/filesystem.nix
index 8ed6745..09021bb 100755
--- a/systems/mars/config/filesystem.nix
+++ b/systems/mars/config/filesystem.nix
@@ -4,9 +4,9 @@
   ...
 }:
 let
-  inherit (flake.config.people) user0 user1 user3;
+  inherit (flake.config.people) user0 user1;
   inherit (flake.config.machines.devices) mars ceres synology;
-  inherit (flake.config.services.instances) samba jellyfin audiobookshelf;
+  inherit (flake.config.services.instances) jellyfin audiobookshelf;
   synologySecrets = config.sops.secrets."network/synology".path;
   ceresSecrets = config.sops.secrets."network/server".path;
 in
@@ -16,8 +16,6 @@ in
       synologyDrives = [
         "folder0"
         "folder1"
-        "folder2"
-        "folder3"
       ];
 
       storageDrives = [
@@ -89,7 +87,6 @@ in
   systemd.tmpfiles.rules = [
     "Z ${config.home-manager.users.${user0}.home.homeDirectory} 0755 ${user0} users -"
     "Z ${config.home-manager.users.${user1}.home.homeDirectory} 0755 ${user1} users -"
-    "Z ${config.home-manager.users.${user3}.home.homeDirectory} 0755 ${user3} users -"
     "Z ${mars.storage0.mount} 0755 ${user0} users -"
     "Z ${mars.storage1.mount} 0755 ${user0} users -"
   ];
diff --git a/systems/phobos/config/filesystem.nix b/systems/phobos/config/filesystem.nix
index 084517a..2cb057d 100755
--- a/systems/phobos/config/filesystem.nix
+++ b/systems/phobos/config/filesystem.nix
@@ -6,7 +6,6 @@
 let
   inherit (flake.config.people)
     user0
-    user1
     ;
   inherit (flake.config.machines.devices)
     phobos
@@ -31,7 +30,6 @@ in
 
   systemd.tmpfiles.rules = [
     "Z ${config.home-manager.users.${user0}.home.homeDirectory} 0755 ${user0} users -"
-    "Z ${config.home-manager.users.${user1}.home.homeDirectory} 0755 ${user1} users -"
   ];
 
   services.udisks2.enable = true;
diff --git a/systems/venus/config/boot.nix b/systems/venus/config/boot.nix
deleted file mode 100755
index 6344c96..0000000
--- a/systems/venus/config/boot.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  pkgs,
-  config,
-  ...
-}:
-{
-  boot = {
-    extraModulePackages = [
-      config.boot.kernelPackages.v4l2loopback.out
-    ];
-    supportedFilesystems = [ "ntfs" ];
-    initrd = {
-      availableKernelModules = [
-        "amdgpu"
-        "nvme"
-        "ahci"
-        "xhci_pci"
-        "usb_storage"
-        "usbhid"
-        "sd_mod"
-      ];
-      kernelModules = [ ];
-    };
-
-    kernelModules = [
-      "kvm-amd"
-      "vfio-pci"
-      "v4l2loopback"
-    ];
-
-    kernelPackages = pkgs.linuxPackages_latest;
-
-    loader = {
-      efi = {
-        canTouchEfiVariables = true;
-        efiSysMountPoint = "/boot";
-      };
-      systemd-boot.enable = false;
-      grub = {
-        enable = true;
-        device = "nodev";
-        useOSProber = true;
-        efiSupport = true;
-      };
-    };
-  };
-}
diff --git a/systems/venus/config/filesystem.nix b/systems/venus/config/filesystem.nix
deleted file mode 100755
index c517920..0000000
--- a/systems/venus/config/filesystem.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  config,
-  flake,
-  ...
-}:
-let
-  inherit (flake.config.people) user2;
-  inherit (flake.config.machines.devices) venus;
-in
-{
-  imports = [ ];
-
-  fileSystems =
-    let
-      storageDrives = [
-        "storage0"
-        "storage1"
-      ];
-
-      storageMounts = storage: {
-        name = "${venus.${storage}.mount}";
-        value = {
-          device = venus.${storage}.device;
-          fsType = "ext4";
-          options = venus.${storage}.options;
-        };
-      };
-    in
-    {
-      "/" = {
-        device = "/dev/disk/by-uuid/d02cb367-26e0-4708-8840-75dcc4362ff4";
-        fsType = "ext4";
-      };
-      "/boot" = {
-        device = "/dev/disk/by-uuid/22BD-5A25";
-        fsType = "vfat";
-        options = venus.boot.options;
-      };
-    }
-    // (builtins.listToAttrs (map storageMounts storageDrives));
-
-  swapDevices = [
-    { device = "/dev/disk/by-uuid/cc7ab213-26c9-4567-91ca-9dba6e98c9d1"; }
-  ];
-
-  systemd.tmpfiles.rules = [
-    "Z ${config.home-manager.users.${user2}.home.homeDirectory} 0755 ${user2} users -"
-    "Z ${venus.storage0.mount} 0755 ${user2} users -"
-    "Z ${venus.storage1.mount} 0755 ${user2} users -"
-  ];
-
-  services.udisks2.enable = true;
-}
diff --git a/systems/venus/config/graphics.nix b/systems/venus/config/graphics.nix
deleted file mode 100755
index b67a5df..0000000
--- a/systems/venus/config/graphics.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ pkgs, ... }:
-{
-  hardware = {
-    graphics = {
-      enable = true;
-      extraPackages = builtins.attrValues {
-        inherit (pkgs)
-          amdvlk
-          ;
-        inherit (pkgs.rocmPackages.clr)
-          icd
-          ;
-      };
-      extraPackages32 = builtins.attrValues {
-        inherit (pkgs.driversi686Linux)
-          amdvlk
-          ;
-      };
-    };
-  };
-  boot.initrd.kernelModules = [
-    "amdgpu"
-  ];
-}
diff --git a/systems/venus/config/hardware.nix b/systems/venus/config/hardware.nix
deleted file mode 100755
index 8c79401..0000000
--- a/systems/venus/config/hardware.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-{
-  hardware = {
-    firmware = [ pkgs.rtl8761b-firmware ];
-    enableAllFirmware = true;
-    cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-  };
-}
diff --git a/systems/venus/config/networking.nix b/systems/venus/config/networking.nix
deleted file mode 100755
index b774ad9..0000000
--- a/systems/venus/config/networking.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  lib,
-  flake,
-  ...
-}:
-let
-  inherit (flake.config.machines.devices) venus;
-in
-{
-  networking = {
-    hostName = venus.name;
-    networkmanager.enable = true;
-    useDHCP = lib.mkDefault true;
-    firewall = {
-      enable = true;
-      allowedTCPPorts = [ ];
-    };
-  };
-  services = {
-    avahi = {
-      enable = true;
-      openFirewall = true;
-      nssmdns4 = true;
-    };
-    sshd.enable = true;
-    openssh = {
-      enable = true;
-      settings.PasswordAuthentication = false;
-    };
-  };
-}
diff --git a/systems/venus/default.nix b/systems/venus/default.nix
deleted file mode 100755
index e5f8f64..0000000
--- a/systems/venus/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  lib,
-  ...
-}:
-let
-  configPath = ./config;
-
-  venusImports =
-    let
-      files = builtins.attrNames (builtins.readDir configPath);
-    in
-    map (name: configPath + "/${name}") (
-      builtins.filter (name: builtins.match ".*\\.nix$" name != null) files
-    );
-in
-{
-  imports = venusImports;
-  nixpkgs.hostPlatform = lib.mkForce "x86_64-linux";
-  system.stateVersion = lib.mkForce "24.05";
-}
diff --git a/templates/elm/flake.nix b/templates/elm/flake.nix
index 4da66f2..176cb0d 100755
--- a/templates/elm/flake.nix
+++ b/templates/elm/flake.nix
@@ -4,21 +4,22 @@
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-23.11";
   };
-  outputs = inputs @ {
-    flake-parts,
-    self,
-    ...
-  }: let
-    system = "x86_64-linux";
-  in
-    flake-parts.lib.mkFlake {inherit inputs;} {
+  outputs =
+    inputs@{
+      flake-parts,
+      ...
+    }:
+    let
+      system = "x86_64-linux";
+    in
+    flake-parts.lib.mkFlake { inherit inputs; } {
       imports = [
         ./parts
       ];
       systems = [
         system
       ];
-      perSystem = {pkgs, ...}: {
+      perSystem = {
         _module.args.pkgs = import inputs.nixpkgs {
           inherit system;
         };
diff --git a/templates/elm/parts/default.nix b/templates/elm/parts/default.nix
index 27fb3cf..25b3a1c 100755
--- a/templates/elm/parts/default.nix
+++ b/templates/elm/parts/default.nix
@@ -1,20 +1,14 @@
-{
-  perSystem = {
-    pkgs,
-    lib,
-    config,
-    self',
-    ...
-  }: let
-    configPath = ./config;
+let
+  configPath = ./config;
 
-    devshellImports = let
+  devshellImports =
+    let
       files = builtins.attrNames (builtins.readDir configPath);
     in
-      map
-      (name: configPath + "/${name}")
-      (builtins.filter (name: builtins.match ".*\\.nix$" name != null) files);
-  in {
-    imports = devshellImports;
-  };
+    map (name: configPath + "/${name}") (
+      builtins.filter (name: builtins.match ".*\\.nix$" name != null) files
+    );
+in
+{
+  imports = devshellImports;
 }
diff --git a/templates/haskell/flake.nix b/templates/haskell/flake.nix
index d729ace..7d6da48 100755
--- a/templates/haskell/flake.nix
+++ b/templates/haskell/flake.nix
@@ -4,13 +4,13 @@
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
     pre-commit-hooks-nix.url = "github:cachix/pre-commit-hooks.nix";
   };
-  outputs = inputs @ {
-    self,
-    nixpkgs,
-    flake-parts,
-    ...
-  }:
-    flake-parts.lib.mkFlake {inherit inputs;} {
+  outputs =
+    inputs@{
+      nixpkgs,
+      flake-parts,
+      ...
+    }:
+    flake-parts.lib.mkFlake { inherit inputs; } {
       imports = [
         inputs.haskell-flake.flakeModule
         inputs.pre-commit-hooks-nix.flakeModule
diff --git a/templates/haskell/parts/default.nix b/templates/haskell/parts/default.nix
index 27fb3cf..87acc4b 100755
--- a/templates/haskell/parts/default.nix
+++ b/templates/haskell/parts/default.nix
@@ -1,20 +1,15 @@
-{
-  perSystem = {
-    pkgs,
-    lib,
-    config,
-    self',
-    ...
-  }: let
-    configPath = ./config;
+let
+  configPath = ./config;
 
-    devshellImports = let
+  devshellImports =
+    let
       files = builtins.attrNames (builtins.readDir configPath);
     in
-      map
-      (name: configPath + "/${name}")
-      (builtins.filter (name: builtins.match ".*\\.nix$" name != null) files);
-  in {
-    imports = devshellImports;
-  };
+    map (name: configPath + "/${name}") (
+      builtins.filter (name: builtins.match ".*\\.nix$" name != null) files
+    );
+in
+{
+  imports = devshellImports;
+
 }
diff --git a/templates/typst/flake.nix b/templates/typst/flake.nix
index 5115b35..2219c52 100755
--- a/templates/typst/flake.nix
+++ b/templates/typst/flake.nix
@@ -12,7 +12,6 @@
     inputs@{
       nixpkgs,
       flake-parts,
-      self,
       ...
     }:
     flake-parts.lib.mkFlake { inherit inputs; } {
diff --git a/templates/typst/parts/default.nix b/templates/typst/parts/default.nix
index 93ccb77..87acc4b 100755
--- a/templates/typst/parts/default.nix
+++ b/templates/typst/parts/default.nix
@@ -1,24 +1,15 @@
-{
-  perSystem =
-    {
-      pkgs,
-      lib,
-      config,
-      self',
-      ...
-    }:
-    let
-      configPath = ./config;
+let
+  configPath = ./config;
 
-      devshellImports =
-        let
-          files = builtins.attrNames (builtins.readDir configPath);
-        in
-        map (name: configPath + "/${name}") (
-          builtins.filter (name: builtins.match ".*\\.nix$" name != null) files
-        );
+  devshellImports =
+    let
+      files = builtins.attrNames (builtins.readDir configPath);
     in
-    {
-      imports = devshellImports;
-    };
+    map (name: configPath + "/${name}") (
+      builtins.filter (name: builtins.match ".*\\.nix$" name != null) files
+    );
+in
+{
+  imports = devshellImports;
+
 }
diff --git a/templates/website/flake.nix b/templates/website/flake.nix
index 63da19c..7d6da48 100755
--- a/templates/website/flake.nix
+++ b/templates/website/flake.nix
@@ -6,7 +6,6 @@
   };
   outputs =
     inputs@{
-      self,
       nixpkgs,
       flake-parts,
       ...
diff --git a/templates/website/parts/default.nix b/templates/website/parts/default.nix
index 93ccb77..25b3a1c 100755
--- a/templates/website/parts/default.nix
+++ b/templates/website/parts/default.nix
@@ -1,24 +1,14 @@
-{
-  perSystem =
-    {
-      pkgs,
-      lib,
-      config,
-      self',
-      ...
-    }:
-    let
-      configPath = ./config;
+let
+  configPath = ./config;
 
-      devshellImports =
-        let
-          files = builtins.attrNames (builtins.readDir configPath);
-        in
-        map (name: configPath + "/${name}") (
-          builtins.filter (name: builtins.match ".*\\.nix$" name != null) files
-        );
+  devshellImports =
+    let
+      files = builtins.attrNames (builtins.readDir configPath);
     in
-    {
-      imports = devshellImports;
-    };
+    map (name: configPath + "/${name}") (
+      builtins.filter (name: builtins.match ".*\\.nix$" name != null) files
+    );
+in
+{
+  imports = devshellImports;
 }