diff --git a/hosts/satori/boot.nix b/hosts/satori/boot.nix
index 69fc0a9..c445a03 100644
--- a/hosts/satori/boot.nix
+++ b/hosts/satori/boot.nix
@@ -15,7 +15,7 @@
         '';*/
       kernelModules = [ ];
     };
-    kernelParams = [ "intel_pstate=active" "intel_iommu=on" "nvidia_drm.modeset=1" ];
+    kernelParams = [ "intel_pstate=active" "intel_iommu=on" "nvidia_drm.modeset=1" "clearcpuid=512" ];
     kernelModules = [ "kvm-intel" "snd-seq" "snd-rawmidi" "joydev" ];
     extraModulePackages = with config.boot.kernelPackages; [ nvidia_x11 v4l2loopback ];
     loader = {
diff --git a/hosts/satori/hardware.nix b/hosts/satori/hardware.nix
index f98f04c..7f133ec 100644
--- a/hosts/satori/hardware.nix
+++ b/hosts/satori/hardware.nix
@@ -19,6 +19,13 @@
       fsType = "vfat";
     };
 
+  fileSystems."/media/real" =
+    {
+      device = "/dev/disk/by-uuid/8086be20-c770-46be-bd8f-5bd2d7735c7d";
+      fsType = "btrfs";
+      options = [ "rw" ];
+    };
+
   fileSystems."/media/ntfs" =
     {
       device = "/dev/disk/by-uuid/A4CC66B6CC668282";
@@ -26,13 +33,6 @@
       options = [ "uid=natto" "gid=users" "umask=0022" "rw" ];
     };
 
-  fileSystems."/media/real" =
-    {
-      device = "/dev/disk/by-uuid/6372bc0c-0917-469d-a845-2ce65513e306";
-      fsType = "ext4";
-      options = [ "rw" ];
-    };
-
   zramSwap = {
     enable = true;
     algorithm = "lz4";
@@ -40,6 +40,10 @@
     priority = -1;
   };
 
+  swapDevices = [
+    { device = "/var/swap"; size = 4096; }
+  ];
+
   powerManagement = {
     enable = true;
     cpuFreqGovernor = "powersave";
diff --git a/hosts/satori/networking.nix b/hosts/satori/networking.nix
index a95da1b..ecee7eb 100644
--- a/hosts/satori/networking.nix
+++ b/hosts/satori/networking.nix
@@ -4,7 +4,6 @@
   networking = {
     hostName = "satori";
     hostId = "beca3df0";
-    defaultGateway = "192.168.1.1";
     networkmanager = {
       enable = true;
       wifi = {
@@ -12,16 +11,12 @@
         backend = "iwd";
       };
     };
+
     firewall = {
       allowedTCPPorts = [ 22 18172 6600 8001 25565 ];
       allowedUDPPorts = [ 22 17840 18172 ];
       trustedInterfaces = [ "docker0" ];
     };
-    interfaces = {
-      enp7s0 = {
-        useDHCP = true;
-      };
-    };
 
     wireguard.interfaces.wg0 = with network.addresses.wireguard.ips; {
       ips = [ satori ];
@@ -37,5 +32,8 @@
         }
       ];
     };
+
+    defaultGateway = "192.168.1.1";
+    nameservers = [ "1.1.1.1" "8.8.8.8" ];
   };
 }
diff --git a/hosts/satori/pkgs.nix b/hosts/satori/pkgs.nix
index f8fe626..22e511e 100644
--- a/hosts/satori/pkgs.nix
+++ b/hosts/satori/pkgs.nix
@@ -23,6 +23,8 @@
   ];
 
   programs = {
+    git.enable = true;
+
     gnupg = {
       agent = {
         enableSSHSupport = true;
diff --git a/hosts/satori/services.nix b/hosts/satori/services.nix
index b0f72cf..c7ead8a 100644
--- a/hosts/satori/services.nix
+++ b/hosts/satori/services.nix
@@ -3,21 +3,17 @@
 {
   services = {
     tor.enable = true;
-    openssh = {
-      enable = true;
-      permitRootLogin = "yes";
-    };
+    openssh.enable = true;
     ratbagd.enable = true;
     btrfs.autoScrub.enable = true;
+    zfs.autoScrub.enable = true;
     udev.extraRules = ''
       ACTION=="add|change", KERNEL=="sda", ATTR{queue/rotational}=="0", ATTR{queue/scheduler}="bfq"
     '';
-    zfs.autoScrub.enable = true;
     gvfs.enable = true;
     tlp = {
       enable = true;
       settings = {
-        CPU_SCALING_GOVERNOR_ON_AC = "performance";
         CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
       };
     };