diff --git a/config/hosts/aspects/doloro-laptop/disko.nix b/config/hosts/aspects/doloro-laptop/disko.nix
index b628df4..a162cea 100644
--- a/config/hosts/aspects/doloro-laptop/disko.nix
+++ b/config/hosts/aspects/doloro-laptop/disko.nix
@@ -35,7 +35,7 @@
                     };
                   };
                   plainSwap = {
-                    size = "48G";
+                    size = "24G";
                     content = {
                       type = "swap";
                       discardPolicy = "both"; # Both "once" and page discard policies
diff --git a/config/hosts/aspects/doloro-laptop/hardware.nix b/config/hosts/aspects/doloro-laptop/hardware.nix
index ecf5adf..6339224 100644
--- a/config/hosts/aspects/doloro-laptop/hardware.nix
+++ b/config/hosts/aspects/doloro-laptop/hardware.nix
@@ -16,22 +16,22 @@
       }:
       {
         imports = [
-          (modulesPath + "/hardware/cpu/intel-npu.nix")
-          (modulesPath + "/installer/scan/not-detected.nix")
-        ];
-        boot.initrd.availableKernelModules = [
-          "xhci_pci"
-          "thunderbolt"
-          "vmd"
-          "nvme"
+          # (modulesPath + "/hardware/cpu/intel-npu.nix")
+          # (modulesPath + "/installer/scan/not-detected.nix")
         ];
+        # boot.initrd.availableKernelModules = [
+        #   "xhci_pci"
+        #   "thunderbolt"
+        #   "vmd"
+        #   "nvme"
+        # ];
         boot.initrd.kernelModules = [ ];
-        boot.kernelModules = [ "kvm-intel" ];
+        # boot.kernelModules = [ "kvm-intel" ];
         boot.extraModulePackages = [ ];
 
-        nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-        hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-        hardware.cpu.intel.npu.enable = true;
+        nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
+        # hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+        # hardware.cpu.intel.npu.enable = true;
       };
   };
 }
diff --git a/config/hosts/aspects/doloro-laptop/home.nix b/config/hosts/aspects/doloro-laptop/home.nix
index 8886994..fc99bad 100644
--- a/config/hosts/aspects/doloro-laptop/home.nix
+++ b/config/hosts/aspects/doloro-laptop/home.nix
@@ -14,14 +14,14 @@
       <modules/hyprland/doloro-settings>
       modules.sops
       modules.fish
-      (<modules/helium> {
-        default = true;
-      })
+      # (<modules/helium> {
+      #   default = true;
+      # })
       modules.kitty
-      modules.stylix
-      modules.quickshell
-      modules.lavd
-      modules.podman
+      # modules.stylix
+      # modules.quickshell
+      # modules.lavd
+      # modules.podman
       # modules.openvivo
     ];
     nixos =
@@ -37,9 +37,9 @@
       { pkgs, ... }:
       {
         wayland.windowManager.hyprland.settings = {
-          monitor = [
-            "eDP-1, 2880x1800@120, 0x0, 2"
-          ];
+          # monitor = [
+          #   "eDP-1, 2880x1800@120, 0x0, 2"
+          # ];
           input = {
             kb_layout = "gb";
             follow_mouse = 2;
@@ -58,7 +58,7 @@
           telegram-desktop
           equibop
           obsidian
-          intel-gpu-tools
+          # intel-gpu-tools
           brightnessctl
         ];
         nixpkgs.config.allowUnfree = true;
diff --git a/config/hosts/aspects/doloro-laptop/host.nix b/config/hosts/aspects/doloro-laptop/host.nix
index d0d7faa..d13c7fd 100644
--- a/config/hosts/aspects/doloro-laptop/host.nix
+++ b/config/hosts/aspects/doloro-laptop/host.nix
@@ -11,30 +11,32 @@
     includes = [
       modules.nix
       modules.tuigreet
-      <modules/common/laptop-power-management>
+      # <modules/common/laptop-power-management>
       modules.fonts
-      (modules.tdp {
-        batt = {
-          cpu = {
-            long-term = 13;
-            short-term = 7;
-          };
-          mmio = {
-            long-term = 10;
-            short-term = 7;
-          };
-        };
-        ac = {
-          cpu = {
-            long-term = 120;
-            short-term = 120;
-          };
-          mmio = {
-            long-term = 40;
-            short-term = 20;
-          };
-        };
-      })
+      modules.surface-patches
+      modules.nikpkgs
+      # (modules.tdp {
+      #   batt = {
+      #     cpu = {
+      #       long-term = 13;
+      #       short-term = 7;
+      #     };
+      #     mmio = {
+      #       long-term = 10;
+      #       short-term = 7;
+      #     };
+      #   };
+      #   ac = {
+      #     cpu = {
+      #       long-term = 120;
+      #       short-term = 120;
+      #     };
+      #     mmio = {
+      #       long-term = 40;
+      #       short-term = 20;
+      #     };
+      #   };
+      # })
     ];
     nixos =
       { pkgs, config, ... }:
@@ -44,10 +46,10 @@
         boot.loader.efi.canTouchEfiVariables = true;
         # boot.kernelPackages = pkgs.linuxPackages_6_12; # Hibernate works on 6.12 but not on latest
         # boot.kernelPackages = pkgs.linuxPackages_latest; # Unpinned the linux version for now.. as i am not using hibernate that often
-        boot.kernelPackages =
-          inputs.nix-cachyos-kernel.legacyPackages.x86_64-linux.linuxPackages-cachyos-latest-lto-x86_64-v3;
+        # boot.kernelPackages =
+        #   inputs.nix-cachyos-kernel.legacyPackages.x86_64-linux.linuxPackages-cachyos-latest-lto-x86_64-v3;
         networking.hostName = "doloro-nixos-laptop"; # Define your hostname.
-        security.rtkit.enable = true;
+        # security.rtkit.enable = true;
 
         # Configure network connections interactively with nmcli or nmtui.
         networking.networkmanager.enable = true;
@@ -55,6 +57,7 @@
         # Set your time zone.
         # time.timeZone = "Europe/London";
         services.automatic-timezoned.enable = true;
+        networking.wireless.iwd.enable = false;
 
         nix.settings = {
           substituters = [
@@ -75,7 +78,7 @@
           ];
         };
 
-        services.gnome.gnome-keyring.enable = true;
+        # services.gnome.gnome-keyring.enable = true;
 
         nixpkgs.config.packageOverrides = pkgs: {
           intel-vaapi-driver = pkgs.intel-vaapi-driver.override { enableHybridCodec = true; };
@@ -86,9 +89,9 @@
             enable = true;
             extraPackages = with pkgs; [
               # vpl-gpu-rt
-              intel-media-driver # VA-API (iHD) userspace
+              # intel-media-driver # VA-API (iHD) userspace
               # vpl-gpu-rt # oneVPL (QSV) runtime
-              intel-compute-runtime # OpenCL (NEO) + Level Zero for Arc/Xe
+              # intel-compute-runtime # OpenCL (NEO) + Level Zero for Arc/Xe
             ];
           };
         };
@@ -129,7 +132,7 @@
 
         services.libinput.enable = true;
 
-        boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
+        # boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
         # Define a user account. Don't forget to set a password with ‘passwd’.
         # users.users.doloro = {
         # isNormalUser = true;
@@ -157,20 +160,20 @@
 
         boot.kernelParams = [
           # "mem_sleep_default=deep"
-          "i915.fastboot=1"
-          "i915.modeset=1"
-          "ahci.mobile_lpm_policy=1"
-          "intel_idle.max_cstate=10"
-          "processor.max_cstate=10"
+          # "i915.fastboot=1"
+          # "i915.modeset=1"
+          # "ahci.mobile_lpm_policy=1"
+          # "intel_idle.max_cstate=10"
+          # "processor.max_cstate=10"
           # "quiet"
           # "splash"
           # "idle=halt"
         ];
 
         services.logind.settings.Login = {
-          HandleLidSwitch = "suspend";
-          HandleLidSwitchExternalPower = "suspend";
-          HandleLidSwitchDocked = "ignore";
+          # HandleLidSwitch = "suspend";
+          # HandleLidSwitchExternalPower = "suspend";
+          # HandleLidSwitchDocked = "ignore";
         };
         # systemd.sleep.extraConfig = ''
         #       HibernateDelaySec=30min
diff --git a/config/hosts/computers.nix b/config/hosts/computers.nix
index 15b2cea..4eb99ed 100644
--- a/config/hosts/computers.nix
+++ b/config/hosts/computers.nix
@@ -10,7 +10,7 @@
     userName = "doloro";
   };
   # TODO
-  den.homes.x86_64-linux.doloro-laptop = {
+  den.homes.aarch64-linux.doloro-laptop = {
     userName = "doloro";
   };
   # Machines
@@ -21,7 +21,7 @@
     };
   };
   # TODO
-  den.hosts.x86_64-linux.laptop = {
+  den.hosts.aarch64-linux.laptop = {
     users.doloro = {
       aspect = "doloro-laptop";
       home-manager.enable = true;
diff --git a/config/modules/nikpkgs.nix b/config/modules/nikpkgs.nix
new file mode 100644
index 0000000..ba7b27f
--- /dev/null
+++ b/config/modules/nikpkgs.nix
@@ -0,0 +1,19 @@
+{
+  den,
+  modules,
+  inputs,
+  ...
+}:
+{
+  flake-file.inputs = {
+    nik-pkgs = {
+      url = "git+https://git.scug.io/nikkuss/pkgs.git";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+  };
+  modules.nikpkgs = {
+    nixos = {
+      nixpkgs.overlays = [ inputs.nik-pkgs.overlays.default ];
+    };
+  };
+}
diff --git a/config/modules/surface_patches.nix b/config/modules/surface_patches.nix
new file mode 100644
index 0000000..b52120b
--- /dev/null
+++ b/config/modules/surface_patches.nix
@@ -0,0 +1,20 @@
+{
+  den,
+  modules,
+  inputs,
+  ...
+}:
+{
+  flake-file.inputs = {
+    x1e-kernel.url = "file:///home/doloro/x1e-kernel-main.zip";
+  };
+  modules.surface-patches = {
+    nixos =
+      { pkgs, ... }:
+      {
+        imports = with inputs; [
+          x1e-kernel.nixosModules.default
+        ];
+      };
+  };
+}
diff --git a/flake.lock b/flake.lock
index 5a605c6..efb3ed6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -309,6 +309,24 @@
         "type": "github"
       }
     },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems_3"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "font-patcher": {
       "inputs": {
         "nixpkgs": "nixpkgs_2"
@@ -791,6 +809,27 @@
         "type": "github"
       }
     },
+    "nik-pkgs": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1775766941,
+        "narHash": "sha256-uDBTnE+ps/f7HFN1kwdKDl+1T0bNz5HO+9x2A6v/M/4=",
+        "ref": "refs/heads/main",
+        "rev": "6e29baf59605d3a9da7dbb37076c759f7a4a37ef",
+        "revCount": 56,
+        "type": "git",
+        "url": "https://git.scug.io/nikkuss/pkgs.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.scug.io/nikkuss/pkgs.git"
+      }
+    },
     "niri-flake": {
       "inputs": {
         "niri-stable": "niri-stable",
@@ -1012,7 +1051,7 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "systems": "systems_3"
+        "systems": "systems_4"
       },
       "locked": {
         "lastModified": 1775307257,
@@ -1114,6 +1153,7 @@
         "home-manager": "home-manager",
         "hyprland": "hyprland",
         "import-tree": "import-tree",
+        "nik-pkgs": "nik-pkgs",
         "niri-flake": "niri-flake",
         "nix-cachyos-kernel": "nix-cachyos-kernel",
         "nixpkgs": "nixpkgs_5",
@@ -1125,6 +1165,7 @@
         "sops-nix": "sops-nix",
         "spicetify-nix": "spicetify-nix",
         "stylix": "stylix",
+        "x1e-kernel": "x1e-kernel",
         "zen-browser": "zen-browser"
       }
     },
@@ -1270,7 +1311,7 @@
     "spicetify-nix": {
       "inputs": {
         "nixpkgs": "nixpkgs_7",
-        "systems": "systems_4"
+        "systems": "systems_5"
       },
       "locked": {
         "lastModified": 1775421933,
@@ -1299,7 +1340,7 @@
           "nixpkgs"
         ],
         "nur": "nur",
-        "systems": "systems_5",
+        "systems": "systems_6",
         "tinted-kitty": "tinted-kitty",
         "tinted-schemes": "tinted-schemes",
         "tinted-tmux": "tinted-tmux",
@@ -1394,6 +1435,21 @@
         "type": "github"
       }
     },
+    "systems_6": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "tinted-kitty": {
       "flake": false,
       "locked": {
@@ -1476,6 +1532,18 @@
         "type": "github"
       }
     },
+    "x1e-kernel": {
+      "locked": {
+        "lastModified": 1775750605,
+        "narHash": "sha256-qHeSM7bY9FLsdyi4iKsZshYjR/zRm8WJTzO8NmtUfyg=",
+        "type": "tarball",
+        "url": "file:///home/doloro/x1e-kernel-main.zip"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "file:///home/doloro/x1e-kernel-main.zip"
+      }
+    },
     "xdph": {
       "inputs": {
         "hyprland-protocols": [
diff --git a/flake.nix b/flake.nix
index b3707fd..edc0478 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,6 +21,10 @@
     };
     hyprland.url = "github:hyprwm/Hyprland";
     import-tree.url = "github:vic/import-tree";
+    nik-pkgs = {
+      url = "git+https://git.scug.io/nikkuss/pkgs.git";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     niri-flake = {
       url = "github:sodiboo/niri-flake";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -42,6 +46,7 @@
       url = "github:nix-community/stylix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    x1e-kernel.url = "file:///home/doloro/x1e-kernel-main.zip";
     zen-browser = {
       url = "github:youwen5/zen-browser-flake";
       inputs.nixpkgs.follows = "nixpkgs";