diff --git a/modules/services/greetd/module.nix b/modules/services/greetd/module.nix
index fad5c66..ffec7f4 100644
--- a/modules/services/greetd/module.nix
+++ b/modules/services/greetd/module.nix
@@ -4,14 +4,11 @@
   pkgs,
   ...
 }: let
-  inherit (lib.meta) getExe;
-  inherit (lib.modules) mkIf;
-  inherit (lib.options) mkOption mkEnableOption;
-  inherit (lib.types) str listOf;
-
-  inherit (config.meta.mainUser) username;
   cfg = config.modules.services.greetd;
   uwsmEnabled = config.modules.services.uwsm.enable;
+  inherit (lib.options) mkOption mkEnableOption;
+  inherit (lib.types) str listOf;
+  inherit (lib.modules) mkIf;
 in {
   options.modules.services.greetd = {
     enable = mkEnableOption "greetd";
@@ -28,31 +25,24 @@ in {
       type = str;
       default =
         if uwsmEnabled
-        then "${getExe config.programs.uwsm.package} start Hyprland"
+        then "uwsm start Hyprland"
         else "Hyprland";
     };
   };
 
   config = mkIf cfg.enable {
-    services.greetd = let
-      session = {
-        # command = ''
-        # ${pkgs.greetd.tuigreet}/bin/tuigreet \
-        #   -c \"${cfg.session}\" \
-        #   -r
-        #   -t --time-format "DD.MM.YYYY"
-        #   --asteriks'';
-        command = "${getExe config.programs.uwsm.package} start hyprland-uwsm.desktop";
-        user = username;
-      };
-    in {
+    services.greetd = {
       enable = true;
       package = pkgs.greetd;
-      vt = 7;
-      settings = {
-        default_session = session;
-        initial_session = session;
+      settings.default_session = {
+        command = ''
+          ${pkgs.greetd.tuigreet}/bin/tuigreet \
+            -c \"${cfg.session}\" \
+            -r 
+            -t --time-format "DD.MM.YYYY"
+            --asteriks'';
       };
+      vt = 7;
     };
   };
 }
diff --git a/modules/system/boot/module.nix b/modules/system/boot/module.nix
index dbc245b..bc3eeb1 100644
--- a/modules/system/boot/module.nix
+++ b/modules/system/boot/module.nix
@@ -18,7 +18,6 @@ in {
         Set the boot loader's timeout. This is 0 by default, but preferably longer on remote servers to make switching to previous generations easier.
       '';
       type = int;
-      # I love spamming space
       default = 0;
     };
   };
@@ -36,20 +35,16 @@ in {
     boot = {
       tmp.useTmpfs = true;
       initrd = {
-        verbose = false;
+        verbose = true;
         systemd.enable = true;
       };
       loader = {
         efi.canTouchEfiVariables = true;
+        # I love spamming space
         timeout = cfg.timeout;
         systemd-boot = {
           enable = cfg.systemd-boot.enable;
-          # INFO: Leaving this enabled is a security vulneratibility,
-          # since we can just start /bin/sh from there and get root access.
-          # Since I have FDE, this isn't _as_ critical, but it would still be
-          # a bad idea to leave it enabled
           editor = mkForce false;
-          consoleMode = "auto";
           configurationLimit = 5;
         };
         grub = {
@@ -60,25 +55,11 @@ in {
         };
       };
       plymouth = {
-        enable = true;
-        themePackages = [
-          (pkgs.adi1090x-plymouth-themes.override
-            {
-              selected_themes = [
-                "hud_3"
-              ];
-            })
-        ];
-        theme = "hud_3";
+        enable = false;
+        # font = "${pkgs.jetbrains-mono}/share/fonts/truetype/JetBrainsMono-Regular.ttf";
+        themePackages = [pkgs.plymouth-matrix-theme];
+        theme = "matrix";
       };
     };
-    powerManagement = {
-      powerDownCommands = ''
-        ${pkgs.plymouth} --show-splash
-      '';
-      resumeCommands = ''
-        ${pkgs.plymouth} --quit
-      '';
-    };
   };
 }
diff --git a/modules/system/os/networking/module.nix b/modules/system/os/networking/module.nix
index dd7b01c..fd4ca78 100644
--- a/modules/system/os/networking/module.nix
+++ b/modules/system/os/networking/module.nix
@@ -6,17 +6,6 @@ in {
   ];
   networking = {
     enableIPv6 = true;
-
-    # INFO: This disables wpa_supplicant,
-    # I use nenetworkmanager instead.
-    wireless.enable = false;
-
-    dhcpcd = {
-      # faster boot times
-      wait = "background";
-      extraConfig = "noarp";
-    };
-
     nameservers = [
       # quad9 DNS
       "9.9.9.9"
@@ -25,16 +14,8 @@ in {
   };
   services.resolved = {
     enable = true;
-    dnssec = "false";
     # quad9 dns
     fallbackDns = ["9.9.9.9" "2620::fe::fe"];
   };
   users.users.${username}.extraGroups = ["networkmanager"];
-
-  systemd = {
-    network = {
-      enable = true;
-      wait-online.anyInterface = true;
-    };
-  };
 }
diff --git a/modules/system/os/systemd/module.nix b/modules/system/os/systemd/module.nix
index d1c15d5..6033e84 100644
--- a/modules/system/os/systemd/module.nix
+++ b/modules/system/os/systemd/module.nix
@@ -1,12 +1,7 @@
-{lib, ...}: let
-  inherit (lib.modules) mkForce;
-in {
+{pkgs, ...}: {
   config.systemd = {
     # faster startup
-    targets.network-online.wantedBy = mkForce []; # Normally ["multi-user.target"]
-    services = {
-      NetworkManager-wait-online.wantedBy = mkForce []; # Normally ["network-online.target"]
-      systemd-udev-settle.enable = false;
-    };
+    targets.network-online.wantedBy = pkgs.lib.mkForce []; # Normally ["multi-user.target"]
+    services.NetworkManager-wait-online.wantedBy = pkgs.lib.mkForce []; # Normally ["network-online.target"]
   };
 }
diff --git a/modules/wms/wayland/hyprland/exec.nix b/modules/wms/wayland/hyprland/exec.nix
index c3b09cf..6a2c5f5 100644
--- a/modules/wms/wayland/hyprland/exec.nix
+++ b/modules/wms/wayland/hyprland/exec.nix
@@ -1,18 +1,15 @@
 {
   config,
-  lib,
   pkgs,
   ...
 }: let
   # inherit (config.modules.style) cursor;
-  inherit (lib.meta) getExe;
+  inherit (builtins) toString;
 in {
   programs.hyprland.settings = {
     # Hyprland settings
     # Programs which get executed at Hyprland start.
     exec-once = [
-      "uwsm finalize"
-
       "hyprctl setcursor BreezeX-RosePine-Linux 32"
 
       "[workspace special:keepassxc; silent;tile] ${pkgs.keepassxc}/bin/keepassxc"
@@ -25,8 +22,6 @@ in {
       "${pkgs.wlsunset}/bin/wlsunset -S 06:00 -s 20:00"
       "${pkgs.lxqt.lxqt-policykit}/bin/lxqt-policykit-agent"
       "hyprctl dispatch split-workspace 1"
-
-      "${getExe pkgs.hyprlock}"
     ];
   };
 }