diff --git a/flake.nix b/flake.nix
index c03534c..2f545bf 100644
--- a/flake.nix
+++ b/flake.nix
@@ -26,7 +26,6 @@
           inputs.home-manager.nixosModules.default
           inputs.stylix.nixosModules.stylix
           nixos-hardware.nixosModules.lenovo-thinkpad-x13-yoga
-          (import ./overlays/ollama.nix)
         ];
       };
 
@@ -45,7 +44,6 @@
           ./hosts/server/configuration.nix
           inputs.home-manager.nixosModules.default
           nixos-hardware.nixosModules.system76
-          (import ./overlays/ollama.nix)
         ];
       };
 
diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix
index 28f803a..bd6968d 100644
--- a/hosts/laptop/configuration.nix
+++ b/hosts/laptop/configuration.nix
@@ -38,23 +38,9 @@
     firewall.enable = true;
   };
 
-  i18n = {
-    defaultLocale = "en_US.UTF-8";
-    extraLocaleSettings = {
-      LC_ADDRESS = "en_US.UTF-8";
-      LC_IDENTIFICATION = "en_US.UTF-8";
-      LC_MEASUREMENT = "en_US.UTF-8";
-      LC_MONETARY = "en_US.UTF-8";
-      LC_NAME = "en_US.UTF-8";
-      LC_NUMERIC = "en_US.UTF-8";
-      LC_PAPER = "en_US.UTF-8";
-      LC_TELEPHONE = "en_US.UTF-8";
-      LC_TIME = "en_US.UTF-8";
-    };
-  };
+  i18n.defaultLocale = "en_US.UTF-8";
 
   services = {
-    hardware.bolt = {enable = true;};
     displayManager.ly = {
       enable = true;
       x11Support = false;
@@ -75,7 +61,7 @@
       jack.enable = true;
     };
     auto-cpufreq = {
-      enable = false;
+      enable = true;
       settings = {
         battery = {
           governor = "powersave";
@@ -91,12 +77,8 @@
       lidSwitch = "suspend-then-hibernate";
       lidSwitchExternalPower = "suspend";
     };
-    avahi = {
-      enable = false;
-      nssmdns4 = true;
-      openFirewall = true;
-    };
 
+    hardware.bolt.enable = true;
     blueman.enable = true;
     fwupd.enable = true;
     printing.enable = true;
@@ -109,7 +91,6 @@
     autoEnable = true;
     polarity = "light";
     image = ./wallpaper.png;
-    targets.chromium.enable = false;
     base16Scheme = {
       base00 = "#ffffea";
       base01 = "#eaffff";
@@ -128,7 +109,8 @@
       base0E = "#8888cc";
       base0F = "#5d3a1a";
     };
-    #"${pkgs.base16-schemes}/share/themes/everforest.yaml";
+    targets.chromium.enable = false;
+    targets.gnome.enable = false;
     opacity = {
       terminal = 0.85;
       popups = 0.75;
@@ -160,25 +142,14 @@
 
   hardware = {
     sensor.iio.enable = true;
-    graphics.enable32Bit = true;
-    graphics.extraPackages = with pkgs; [
-      intel-vaapi-driver
-      intel-media-driver
-      intel-compute-runtime
-    ];
   };
 
   programs = {
     zsh.enable = true;
-    virt-manager.enable = true;
-    niri = {
-      enable = true;
-    };
+    niri.enable = true;
   };
 
   virtualisation = {
-    libvirtd = {enable = true;};
-    kvmgt = {enable = true;};
     docker = {enable = true;};
   };
 
diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix
index 5208358..853c2d9 100644
--- a/hosts/laptop/home.nix
+++ b/hosts/laptop/home.nix
@@ -33,6 +33,8 @@
       direnv
       texliveFull
       ispell
+
+      calc
     ];
   };
 
@@ -71,5 +73,6 @@
   stylix = {
     enable = true;
     autoEnable = true;
+    targets.gnome.enable = false;
   };
 }