diff --git a/configs/docker.nix b/configs/docker.nix
index 37d3f4d..55d80bb 100644
--- a/configs/docker.nix
+++ b/configs/docker.nix
@@ -12,12 +12,19 @@
     };
   };
 
-  environment.systemPackages = with pkgs; [
-    docker-compose
-    lazydocker
-    minikube
-    dive
+  environment = {
+    systemPackages = with pkgs; [
+      docker-compose
+      lazydocker
+      minikube
+      dive
 
-    distrobox
-  ];
+      distrobox
+    ];
+    persistence."/persist" = {
+      directories = [
+        "/var/lib/docker"
+      ];
+    };
+  };
 }
diff --git a/configs/hardware.nix b/configs/hardware.nix
index 3f4b6a1..4bd7350 100644
--- a/configs/hardware.nix
+++ b/configs/hardware.nix
@@ -7,4 +7,12 @@
   services = {
     fwupd.enable = true;
   };
+
+  environment = {
+    persistence."/persist" = {
+      directories = [
+        "/var/lib/bluetooth"
+      ];
+    };
+  };
 }
diff --git a/configs/plasma.nix b/configs/plasma.nix
index 8ac8d09..b8191d6 100644
--- a/configs/plasma.nix
+++ b/configs/plasma.nix
@@ -40,17 +40,24 @@
       kdePackages.kde-gtk-config
       kdePackages.breeze-gtk
       kdePackages.qtstyleplugin-kvantum
-      # kdePackages.kmail
       kdePackages.filelight
       kdePackages.plasma-disks
       kdePackages.kalk
       kdePackages.powerdevil
+      kdePackages.qtlocation
+      kdePackages.kdepim-addons
       krusader
       ktimetracker
       kdiff3
       kdiskmark
       maliit-keyboard
     ];
+
+    persistence."/persist" = {
+      directories = [
+        "/var/lib/sddm"
+      ];
+    };
   };
 
   services = {
diff --git a/configs/user-gui.nix b/configs/user-gui.nix
index 271e2d5..b0d5976 100644
--- a/configs/user-gui.nix
+++ b/configs/user-gui.nix
@@ -42,27 +42,34 @@
     # };
   };
 
-  environment.systemPackages = with pkgs; [
-    czkawka # fslint before
-    handbrake
-    keepassxc
-    nextcloud-client
-    pinta
-    # rustdesk-flutter
-    simple-scan
+  environment = {
+    systemPackages = with pkgs; [
+      czkawka # fslint before
+      handbrake
+      keepassxc
+      nextcloud-client
+      pinta
+      # rustdesk-flutter
+      simple-scan
 
-    telegram-desktop
-    discord
-    kdenlive
-    shotcut
+      telegram-desktop
+      discord
+      kdenlive
+      shotcut
 
-    vorta
-    kitty
+      vorta
+      kitty
 
-    lan-mouse_git
+      lan-mouse_git
 
-    libreoffice
-  ];
+      libreoffice
+    ];
+    persistence."/persist" = {
+      directories = [
+        "/etc/NetworkManager/system-connections"
+      ];
+    };
+  };
 
   home-manager.users.alex = {pkgs, ...}: {
     programs = {
diff --git a/machine/desktop/configuration.nix b/machine/desktop/configuration.nix
index b21f5b7..aa8f43d 100644
--- a/machine/desktop/configuration.nix
+++ b/machine/desktop/configuration.nix
@@ -137,15 +137,14 @@ in {
       ryzen-monitor-ng
       qdiskinfo
       jdk
+
+      xmrig
+      monero-gui
     ];
     persistence."/persist" = {
       directories = [
         "/etc/coolercontrol"
-        "/etc/NetworkManager/system-connections"
-        "/var/lib/bluetooth"
-        "/var/lib/docker"
         "/var/lib/samba"
-        "/var/lib/sddm"
         "/var/lib/systemd/rfkill"
       ];
     };
@@ -159,8 +158,13 @@ in {
     graphics = {
       enable = true;
       enable32Bit = true;
+      extraPackages = with pkgs; [ rocmPackages.clr.icd ];
     };
 
+    # cpu.x86.msr = {
+    #   enable = true;
+    # };
+
     pulseaudio.enable = false;
   };
 
diff --git a/machine/framework/configuration.nix b/machine/framework/configuration.nix
index 7602503..9e23a6b 100644
--- a/machine/framework/configuration.nix
+++ b/machine/framework/configuration.nix
@@ -224,15 +224,11 @@ in {
       # fahviewer
       # fahcontrol
     ];
-    persistence."/persist" = {
-      directories = [
-        "/etc/NetworkManager/system-connections"
-        # "/var/lib/bluetooth"
-        "/var/lib/docker"
-        # "/var/lib/samba"
-        "/var/lib/sddm"
-      ];
-    };
+    # persistence."/persist" = {
+    #   directories = [
+    #     # "/var/lib/samba"
+    #   ];
+    # };
   };
 
   # Partition swapfile is on (after LUKS decryption)
diff --git a/machine/nixos-virtualbox/configuration.nix b/machine/nixos-virtualbox/configuration.nix
index 9550b6f..b878248 100644
--- a/machine/nixos-virtualbox/configuration.nix
+++ b/machine/nixos-virtualbox/configuration.nix
@@ -42,14 +42,6 @@
     hostName = "nixos-virtualbox"; # Define your hostname.
   };
 
-  environment = {
-    persistence."/persist" = {
-      directories = [
-        "/var/lib/docker"
-      ];
-    };
-  };
-
   programs.nix-ld.enable = true;
 
   # services = {
diff --git a/machine/vps-arm/configuration.nix b/machine/vps-arm/configuration.nix
index d04c7cb..b5c5984 100644
--- a/machine/vps-arm/configuration.nix
+++ b/machine/vps-arm/configuration.nix
@@ -135,24 +135,15 @@ in {
 
   environment = {
     systemPackages = with pkgs; [
-      goaccess
       xd
       nyx
-      headscale
     ];
     persistence."/persist" = {
       directories = [
         "/var/lib/acme"
-        # "/var/lib/docker"
         "/var/lib/fail2ban"
-        "/var/lib/frigate"
-        "/var/lib/gitea"
-        "/var/lib/headscale"
-        "/var/lib/nextcloud"
-        "/var/lib/postgresql"
         "/var/lib/private"
-        "/var/lib/redis-nextcloud"
-        "/var/www"
+        "/var/www/alexander.szczepan.ski"
       ];
     };
   };
diff --git a/services/frigate.nix b/services/frigate.nix
index 3d76aa6..fbc7724 100644
--- a/services/frigate.nix
+++ b/services/frigate.nix
@@ -6,6 +6,14 @@
 }: let
   secrets = import ../configs/secrets.nix;
 in {
+  environment = {
+    persistence."/persist" = {
+      directories = [
+        "/var/lib/frigate"
+      ];
+    };
+  };
+
   services = {
     nginx = {
       virtualHosts = {
diff --git a/services/gitea.nix b/services/gitea.nix
index 0d84397..fcd3ee0 100644
--- a/services/gitea.nix
+++ b/services/gitea.nix
@@ -4,6 +4,14 @@
   pkgs,
   ...
 }: {
+  environment = {
+    persistence."/persist" = {
+      directories = [
+        "/var/lib/gitea"
+      ];
+    };
+  };
+
   services = {
     nginx = {
       virtualHosts = {
diff --git a/services/goaccess.nix b/services/goaccess.nix
index 32a7c80..ad305b2 100644
--- a/services/goaccess.nix
+++ b/services/goaccess.nix
@@ -6,6 +6,17 @@
 }: let
   secrets = import ../configs/secrets.nix;
 in {
+  environment = {
+    systemPackages = with pkgs; [
+      goaccess
+    ];
+    persistence."/persist" = {
+      directories = [
+        "/var/www/goaccess"
+      ];
+    };
+  };
+
   services = {
     nginx = {
       virtualHosts = {
diff --git a/services/headscale.nix b/services/headscale.nix
index e3c5343..e6f0bcf 100644
--- a/services/headscale.nix
+++ b/services/headscale.nix
@@ -4,7 +4,16 @@
   pkgs,
   ...
 }: {
-  environment.systemPackages = with pkgs; [headscale];
+  environment = {
+    systemPackages = with pkgs; [headscale];
+    environment = {
+      persistence."/persist" = {
+        directories = [
+          "/var/lib/headscale"
+        ];
+      };
+    };
+  };
 
   services = {
     nginx = {
diff --git a/services/nextcloud.nix b/services/nextcloud.nix
index 154e412..2c62faf 100644
--- a/services/nextcloud.nix
+++ b/services/nextcloud.nix
@@ -4,6 +4,21 @@
   pkgs,
   ...
 }: {
+  environment = {
+    systemPackages = with pkgs; [
+      goaccess
+      xd
+      nyx
+    ];
+    persistence."/persist" = {
+      directories = [
+        "/var/lib/nextcloud"
+        "/var/lib/postgresql"
+        "/var/lib/redis-nextcloud"
+      ];
+    };
+  };
+
   services = {
     nginx = {
       virtualHosts = {