diff --git a/home/raexera/shell/zsh.nix b/home/raexera/shell/zsh.nix
index 583b52aa..71c05ed8 100644
--- a/home/raexera/shell/zsh.nix
+++ b/home/raexera/shell/zsh.nix
@@ -109,7 +109,7 @@
     '';
 
     shellAliases = let
-      inherit (lib.meta) getExe;
+      inherit (lib) getExe;
       inherit (pkgs) bat ripgrep dust procs;
     in {
       cat = "${getExe bat} --color=always --theme=base16 --style=plain --paging=never";
diff --git a/lib/themes/default.nix b/home/raexera/themes/default.nix
similarity index 100%
rename from lib/themes/default.nix
rename to home/raexera/themes/default.nix
diff --git a/lib/themes/assets/chifuri-wallpaper.jpg b/home/raexera/themes/wallpapers/chifuri-wallpaper.jpg
similarity index 100%
rename from lib/themes/assets/chifuri-wallpaper.jpg
rename to home/raexera/themes/wallpapers/chifuri-wallpaper.jpg
diff --git a/lib/themes/assets/nix-wallpaper.png b/home/raexera/themes/wallpapers/nix-wallpaper.png
similarity index 100%
rename from lib/themes/assets/nix-wallpaper.png
rename to home/raexera/themes/wallpapers/nix-wallpaper.png
diff --git a/hosts/default.nix b/hosts/default.nix
index a96af493..85cd434e 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -1,12 +1,12 @@
 {
   inputs,
-  lib,
   self,
   themes,
   ...
 }: {
   flake.nixosConfigurations = let
-    inherit (lib.lists) concatLists flatten singleton;
+    inherit (inputs.self) lib;
+    inherit (lib) concatLists flatten singleton;
 
     nixosModules = [
       inputs.disko.nixosModules.default
diff --git a/hosts/modules/hardware/gpu/nvidia.nix b/hosts/modules/hardware/gpu/nvidia.nix
index 198934a9..592339e4 100644
--- a/hosts/modules/hardware/gpu/nvidia.nix
+++ b/hosts/modules/hardware/gpu/nvidia.nix
@@ -3,7 +3,7 @@
   lib,
   ...
 }: let
-  inherit (lib) mkIf versionOlder;
+  inherit (lib) mkIf mkDefault versionOlder;
 
   nvStable = config.boot.kernelPackages.nvidiaPackages.stable.version;
   nvBeta = config.boot.kernelPackages.nvidiaPackages.beta.version;
@@ -33,10 +33,10 @@ in {
     };
 
     hardware.nvidia = {
-      package = nvidiaPackage;
-      open = false;
-      modesetting.enable = true;
-      powerManagement.enable = true;
+      package = mkDefault nvidiaPackage;
+      open = mkDefault false;
+      modesetting.enable = mkDefault true;
+      powerManagement.enable = mkDefault true;
       prime.offload = {
         enable = mkIf (pCfg.nvidiaBusId != "" && (pCfg.intelBusId != "" || pCfg.amdgpuBusId != "")) true;
         enableOffloadCmd = mkIf pCfg.offload.enable true;
diff --git a/lib/default.nix b/lib/default.nix
deleted file mode 100644
index 469a9daa..00000000
--- a/lib/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{lib, ...}: {
-  _module.args = {
-    themes = import ./themes lib;
-  };
-}