diff --git a/flake.nix b/flake.nix
index ef64501..f222823 100644
--- a/flake.nix
+++ b/flake.nix
@@ -37,7 +37,12 @@
         { nixpkgs.overlays = [ nur.overlay ]; }
         {
           networking.hostName = host;
-          boot.loader.systemd-boot.enable = true;
+          boot.loader.systemd-boot = {
+              enable = true;
+              memtest86.enable = true;
+              netbootxyz.enable = true;
+          };
+          boot.loader.timeout = 1;
           boot.loader.efi.canTouchEfiVariables = true;
           time.timeZone = "Europe/Brussels";
 
@@ -45,6 +50,13 @@
             substituters = [ "https://hyprland.cachix.org" ];
             trusted-public-keys = [ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" ];
             experimental-features = [ "nix-command" "flakes" ];
+            auto-optimise-store = true;
+          };
+
+          nix.gc = {
+              automatic = true;
+              dates = "daily";
+              options = "--delete-older-than 2d";
           };
 
           programs.zsh.enable = true;
diff --git a/home/Kell.nix b/home/Kell.nix
index 32a8412..d6205a7 100644
--- a/home/Kell.nix
+++ b/home/Kell.nix
@@ -10,7 +10,6 @@
       ./firefox
       ./ssh
   ];
-
   services.hyprpaper = {
     settings = {
       wallpaper = [
@@ -21,6 +20,10 @@
     };
   };
 
+  gtk.iconTheme = {
+      name = "Papirus";
+      gtk.iconTheme.package = pkgs.papirus-icon-theme;
+  };
   programs.waybar = {
     settings = {
       mainBar = {
diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index 20f9b95..577d7a3 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -8,6 +8,7 @@ let
   wl-paste = "${pkgs.wl-clipboard}/bin/wl-paste";
   hyprpaper = "${pkgs.hyprpaper}/bin/hyprpaper";
   firefox = "${pkgs.firefox}/bin/firefox";
+  nautilus = "${pkgs.gnome.nautilus}/bin/nautilus";
   waybar = "${inputs.waybar.packages.${pkgs.system}.waybar}/bin/waybar";
   wpctl = "${pkgs.wireplumber}/bin/wpctl";
   alacritty = "${pkgs.alacritty}/bin/alacritty";
@@ -206,7 +207,7 @@ in
         "$mainMod, return, exec, ${launch_alacritty}/bin/launch_alacritty $(hyprctl activewindow -j | ${jq} .pid)"
         "$mainMod SHIFT, return, exec, ${alacritty}"
         "$mainMod, Q, killactive,"
-        "$mainMod, A, exec, nautilus"
+        "$mainMod, A, exec, ${nautilus}"
         "$mainMod, S, exec, gnome-calendar"
         "$mainMod, B, exec, MOZ_ENABLE_WAYLAND=1 ${firefox}"
         "$mainMod, M, fullscreen, 1"
diff --git a/hosts/Kell/default.nix b/hosts/Kell/default.nix
index 4eccac6..5d025b4 100644
--- a/hosts/Kell/default.nix
+++ b/hosts/Kell/default.nix
@@ -3,4 +3,52 @@
 {
   services.pcscd.enable = true;
   services.udev.packages = [ pkgs.yubikey-personalization ];
+   services.logind.extraConfig = ''
+    # don’t shutdown when power button is short-pressed
+    HandlePowerKey=suspend
+  '';
+
+   environment.systemPackages = with pkgs; [
+       wireguard-tools
+   ];
+   networking.wg-quick.interfaces = {
+       wg0 = {
+           address = [ "10.0.0.10/24" "	2a02:a03f:83ad:2101::2/128" ];
+           dns = [ "10.0.0.1" "fdc9:281f:04d7:9ee9::1" ];
+           privateKeyFile = "/home/user/.secrets/Wireguard/wg0.key";
+           listenPort = 51820;
+           peers = [
+           {
+               publicKey = "/9ppjm3yeD0duDvxrqgcHscHmftXko+0s2RbivNEy2c=";
+               allowedIPs = [ "10.0.0.1/8" ];
+               endpoint = "192.168.1.1:13231";
+           }
+           ];
+       };
+   };
+   fileSystems."/home/server" = {
+       device = "192.168.1.2:/home/server";
+       fsType = "nfs";
+       options = [ "x-systemd.automount" "noauto" ];
+   };
+   fileSystems."/home/user/Workspace" = {
+       device = "192.168.1.2:/home/server/Workspace";
+       fsType = "nfs";
+       options = [ "x-systemd.automount" "noauto" ];
+   };
+   fileSystems."/home/user/Documents" = {
+       device = "192.168.1.2:/home/server/Storage/Thomas/Documents";
+       fsType = "nfs";
+       options = [ "x-systemd.automount" "noauto" ];
+   };
+   fileSystems."/home/user/Pictures" = {
+       device = "192.168.1.2:/home/server/Storage/Thomas/Pictures";
+       fsType = "nfs";
+       options = [ "x-systemd.automount" "noauto" ];
+   };
+   fileSystems."/home/user/Videos" = {
+       device = "192.168.1.2:/home/server/Storage/Thomas/Videos";
+       fsType = "nfs";
+       options = [ "x-systemd.automount" "noauto" ];
+   };
 }