diff --git a/os/basado/configuration.nix b/os/basado/configuration.nix
index ed2033a..0078dcf 100644
--- a/os/basado/configuration.nix
+++ b/os/basado/configuration.nix
@@ -11,7 +11,6 @@ in
     (import ../remote-disk-unlock.nix ["igb"] sshKeys)
     ../builder.nix
     ../kdeconnect-ports.nix
-    (import ../swapfile.nix 64) 
   ];
 
   boot.loader = {
@@ -30,6 +29,11 @@ in
   hardware.bluetooth.enable = true; # enables support for Bluetooth
   hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot
 
+  swapDevices = [{
+    device = "/var/lib/swapfile";
+    size = 64 * 1024;
+  }];
+
   boot.kernelParams = [ "quiet" "amd_iommu=on" ];
   boot.supportedFilesystems = [ "ntfs" ];
   networking.hostName = "basado"; # Define your hostname.
diff --git a/os/ccache.nix b/os/ccache.nix
deleted file mode 100644
index 8e03016..0000000
--- a/os/ccache.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ config, ... }:
-{
-  programs.ccache.enable = true;
-  nix.settings.extra-sandbox-paths = [ config.programs.ccache.cacheDir ];
-}
diff --git a/os/hs/configuration.nix b/os/hs/configuration.nix
index 7806ad4..e243959 100644
--- a/os/hs/configuration.nix
+++ b/os/hs/configuration.nix
@@ -19,8 +19,6 @@ in {
     ../forgejo.nix
     (import ../remote-disk-unlock.nix ["r8169"] sshKeys)
     ../builder.nix
-    ../ccache.nix
-    (import ../swapfile.nix 64) 
   ];
 
   boot = {
diff --git a/os/swapfile.nix b/os/swapfile.nix
deleted file mode 100644
index a20bddf..0000000
--- a/os/swapfile.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-sizeGiB:
-{
-  swapDevices = [
-    {
-      device = "/var/lib/swapfile";
-      size = sizeGiB * 1024;
-    }
-  ];
-}