diff --git a/flake.nix b/flake.nix
index fb99f26..c6fc6b7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -16,7 +16,7 @@
     };
   };
 
-  outputs = { flake-parts, ... }@inputs:
+  outputs = inputs@{ flake-parts, ... }:
     flake-parts.lib.mkFlake { inherit inputs; } {
       debug = true;
 
diff --git a/lib/module/default.nix b/lib/module/default.nix
deleted file mode 100644
index 3f58942..0000000
--- a/lib/module/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  lib,
-  ...
-}:
-{
-  ## Create a NixOS module option as a one-liner.
-  ##
-  ## ```nix
-  ## lib.mkOpt nixpkgs.lib.types.str "My default" "Option description"
-  ## ```
-  ##
-  #@ Type -> Any -> String
-  mkOpt =
-    type: default: description:
-    lib.mkOption { inherit type default description; };
-}
diff --git a/modules/flake/arguments.nix b/modules/flake/arguments.nix
index d335adf..a7b2aa2 100644
--- a/modules/flake/arguments.nix
+++ b/modules/flake/arguments.nix
@@ -1,43 +1,13 @@
 {
-  lib,
   inputs,
   config,
   ...
 }:
-let
-  ## Recursive loading of libraries, similar to snowfall lib.
-  ## Logical flow: read files => merge all file outputs to single attr. set
-  ## The directory in question is flake-root => lib
-  ## The directory structure is:
-  ## lib/
-  ##   => libname
-  ##     => default.nix
-  ##   => libname2
-  ##     => default.nix
-  ##
-  ## The structure of multiple libs is simply for organization and the attrs. of all default.nix files should still be merged
-  ## into a single set.
-  loadLibs = directory:
-    builtins.foldl' (acc: name:
-      let
-        path = "${directory}/${name}";
-        isDir = (builtins.getAttr name (builtins.readDir directory)) == "directory";
-      in
-        if isDir then
-          lib.mergeAttrs acc (loadLibs path)
-        else if name == "default.nix" then
-          lib.mergeAttrs acc (import path { inherit lib; })
-        else
-          acc
-    ) {} (builtins.attrNames (builtins.readDir directory));
-in
 {
   # Overwrite and add new arguments to all flake modules.
   _module.args = {
     namespace = config.flake.namespace;
 
-    puzzlelib = loadLibs ../../lib;
-
     # Initialize nixpkgs instance with custom overlays.
     pkgs = import inputs.nixpkgs {
       overlays = [
diff --git a/systems/x86_64-nixos/puzzlevision/default.nix b/systems/x86_64-nixos/puzzlevision/default.nix
index 09a52fd..d0874c5 100644
--- a/systems/x86_64-nixos/puzzlevision/default.nix
+++ b/systems/x86_64-nixos/puzzlevision/default.nix
@@ -7,13 +7,6 @@
     ./hardware.nix
   ];
 
-  virtualisation.vmVariant = {
-    virtualisation = {
-      cores = 6;
-      memorySize = 2048;
-    };
-  };
-
   # Todo: pass a set of users to enable from within easy-hosts and automatically map the corresponding home-manager configurations
   # ${namespace} = {
   #   mainUser = "jo";
@@ -25,7 +18,7 @@
 
   # Enable Plasma6
   services.xserver.enable = true;
-  services.displayManager.sddm.enable = true;
+  services.displayManager.sddm.wayland.enable = true;
   services.desktopManager.plasma6.enable = true;
 
   environment.systemPackages = with pkgs; [