diff --git a/flake.nix b/flake.nix
index 6e43330..75b9fac 100644
--- a/flake.nix
+++ b/flake.nix
@@ -62,7 +62,7 @@
             (
               { nixpkgs, ... }:
               {
-                nixpkgs.overlays = [ overlay-unstable ];
+                nixpkgs.overlays = [ overlay-unstable overlay-fw-pkgs ];
               }
             )
             ./maskiner/laptop/configuration.nix
diff --git a/maskiner/laptop/configuration.nix b/maskiner/laptop/configuration.nix
index 762036b..936e1d8 100644
--- a/maskiner/laptop/configuration.nix
+++ b/maskiner/laptop/configuration.nix
@@ -1,59 +1,60 @@
-# This is your system's configuration file.
-# Use this to configure your system environment (it replaces /etc/nixos/configuration.nix)
+# Edit this configuration file to define what should be installed on
+# your system.  Help is available in the configuration.nix(5) man page
+# and in the NixOS manual (accessible by running ‘nixos-help’).
+
 {
   inputs,
-  lib,
   config,
   pkgs,
   myhostname,
   ...
 }:
+let
+in
 {
-  # You can import other NixOS modules here
   imports = [
     ./hardware-configuration.nix
+
     ../../moduler/base.nix
+
+    inputs.home-manager.nixosModules.home-manager
     ../../moduler/users.nix
+    ../../moduler/network.nix
+    ../../moduler/programs.nix
+    ../../moduler/system.nix
+    ../../moduler/dev.nix
+    ../../moduler/lsp.nix
+    ../../moduler/hyprland.nix
+    ../../moduler/sound.nix
   ];
 
+  home-manager.extraSpecialArgs = { inherit inputs pkgs; };
+  home-manager.users.fw = {
+    imports = [
+      ./../../moduler/home.nix
+    ];
+  };
+
+  boot.kernelPackages = pkgs.linuxPackages_latest;
+
   networking.hostName = myhostname;
 
-  services.xserver.dpi = 140;
 
   services = {
-    openssh = {
+    tailscale = {
       enable = true;
-      ports = [ 55504 ];
-      settings = {
-        PermitRootLogin = "no";
-        PasswordAuthentication = false;
-        X11Forwarding = true;
+      package = pkgs.unstable.tailscale;
+    };
+    searx = {
+      enable = true;
+      redisCreateLocally = true;
+      settings.server = {
+        bind_address = "::1";
+        port = 8000;
+        secret_key = "alsjdioefj.asdi";
       };
-      extraConfig = ''
-        			  AllowUsers fw
-        			'';
     };
   };
-  services.syncthing = {
-	  enable = true;
-	  user = "fw";
-	  openDefaultPorts = true; # Open ports in the firewall for Syncthing
-	  dataDir = "/home/fw";  # default location for new folders
-		configDir = "/home/fw/.config/syncthing";
-	  settings = {
-		  devices = {
-			  "laptop" = { id = "SCW3Z3J-NQHIKXZ-T4MR7JR-YE2VL4S-RDZ7W4F-PMSPWCQ-SGF2XLQ-CDQ3SQT"; };
-			  "fw-iphone" = { id = "CWKHS4T-PTMW6A7-EBKRQJW-YOLUWIX-CC5IBYD-Z4LDXTO-MMRHXYM-A2FA2AQ"; };
-			};
-		  folders = {
-			  "vaults" = {
-				path = "/home/fw/vaults";
-				devices = [ "laptop" "fw-iphone" ];
-				ignorePerms = false; # Enable file permission syncing
-			  };
-			};
-		};
-	};
 
-  system.stateVersion = "23.11";
+  system.stateVersion = "25.05";
 }
diff --git a/maskiner/laptop/hardware-configuration.nix b/maskiner/laptop/hardware-configuration.nix
index 6d99d1f..483d941 100644
--- a/maskiner/laptop/hardware-configuration.nix
+++ b/maskiner/laptop/hardware-configuration.nix
@@ -8,24 +8,24 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/0f9de0d5-cdca-42a8-bb8a-070e3147396a";
+    { device = "/dev/disk/by-uuid/9c9b1ed1-a641-4ac5-a468-74a7ee5d33a9";
       fsType = "ext4";
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/3340-1019";
+    { device = "/dev/disk/by-uuid/C8FB-C0AC";
       fsType = "vfat";
       options = [ "fmask=0077" "dmask=0077" ];
     };
 
   swapDevices =
-    [ { device = "/dev/disk/by-uuid/36870c0d-2200-4850-a8af-7021f6776651"; }
+    [ { device = "/dev/disk/by-uuid/8a224134-94e1-4df8-9c17-f60b5881ff1c"; }
     ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
@@ -33,7 +33,7 @@
   # still possible to use this option, but it's recommended to use it in conjunction
   # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
diff --git a/moduler/hyprland.nix b/moduler/hyprland.nix
index 194bd8d..27b0868 100644
--- a/moduler/hyprland.nix
+++ b/moduler/hyprland.nix
@@ -94,6 +94,7 @@ in
 
             wallpaper = [
               "DP-1,/home/fw/nix/wallpapers/blue.png"
+              "eDP-1,/home/fw/nix/wallpapers/blue.png"
             ];
           };
         };
diff --git a/moduler/radicale.nix b/moduler/radicale.nix
index cc55891..7a9d49f 100644
--- a/moduler/radicale.nix
+++ b/moduler/radicale.nix
@@ -24,6 +24,9 @@
   };
   services.radicale = {
     enable = true;
-    settings.server.hosts = [ "0.0.0.0:5232" ];
+    settings = {
+		auth.type = "none";
+		server.hosts = [ "0.0.0.0:5232" ];
+	};
   };
 }