diff --git a/modules/core/boot.nix b/modules/core/boot.nix
index 0a7fc412..4f82a4b0 100644
--- a/modules/core/boot.nix
+++ b/modules/core/boot.nix
@@ -33,10 +33,10 @@ in {
         };
       };
 
-      loader.systemd-boot.enable = true;
+      loader.systemd-boot.enable = lib.mkDefault true;
 
       # Use latest LTS linux kernel by default
-      kernelPackages = pkgs.linuxPackages_5_15;
+      kernelPackages = lib.mkDefault pkgs.linuxPackages_5_15;
 
       # Support ntfs drives
       supportedFilesystems = ["ntfs"];
diff --git a/modules/core/hibernation.nix b/modules/core/hibernation.nix
index c0dd97bb..74befd77 100644
--- a/modules/core/hibernation.nix
+++ b/modules/core/hibernation.nix
@@ -15,8 +15,8 @@ in {
     };
 
     resumeDevice = mkOption {
-      type = types.str;
-      default = "/dev/sda1";
+      type = types.nullOr types.str;
+      default = null;
       description = "The location of the hibernation resume swap file.";
     };
 
@@ -29,7 +29,7 @@ in {
 
   config = {
     boot = mkIf cfg.enable {
-      resumeDevice = cfg.resumeDevice;
+      resumeDevice = mkIf (cfg.resumeDevice != null) cfg.resumeDevice;
       kernelParams = mkIf (cfg.resumeOffset != null) ["resume_offset=${builtins.toString cfg.resumeOffset}"];
     };
   };
diff --git a/modules/core/services.nix b/modules/core/services.nix
index 7a825bc8..2d53dd74 100644
--- a/modules/core/services.nix
+++ b/modules/core/services.nix
@@ -10,7 +10,7 @@
     # If you don't want the host to have SSH actually opened up to the net,
     # set `services.openssh.openFirewall` to false in your config.
     openFirewall = lib.mkDefault true;
-    passwordAuthentication = false;
+    passwordAuthentication = lib.mkDefault false;
   };
 
   # Service that makes Out of Memory Killer more effective
diff --git a/modules/terminal-life/default.nix b/modules/terminal-life/default.nix
index 3b58243f..083f05e9 100644
--- a/modules/terminal-life/default.nix
+++ b/modules/terminal-life/default.nix
@@ -55,6 +55,7 @@ in {
         programs.neovim = import ./nvim {
           inherit config;
           inherit pkgs;
+          inherit lib;
         };
         programs.fzf = import ./fzf {
           inherit config;
diff --git a/modules/terminal-life/nvim/default.nix b/modules/terminal-life/nvim/default.nix
index 93c8b15b..e1bfd4e6 100644
--- a/modules/terminal-life/nvim/default.nix
+++ b/modules/terminal-life/nvim/default.nix
@@ -1,6 +1,7 @@
 {
   config,
   pkgs,
+  lib,
   ...
 }: let
   psCfg = config.pub-solar;
@@ -42,7 +43,8 @@ in {
       universal-ctags
     ];
 
-  plugins = with pkgs.vimPlugins; [
+  plugins = with pkgs.vimPlugins; [ ]
+  ++ lib.optionals (!cfg.lite) [
     nvim-cmp
     cmp-nvim-lsp
     cmp_luasnip