diff --git a/flake.lock b/flake.lock
index b2d7ed6..ded4727 100644
--- a/flake.lock
+++ b/flake.lock
@@ -278,11 +278,11 @@
     "nix-secrets": {
       "flake": false,
       "locked": {
-        "lastModified": 1719585068,
-        "narHash": "sha256-SXos1BQQBWvuY55/N9C0MNQNp3vrokYFReFBJVssOsI=",
+        "lastModified": 1719594307,
+        "narHash": "sha256-n2fZDRl/X5rlx0fer7MMKAevtqflDKDsqKvHYuI9iR8=",
         "ref": "refs/heads/master",
-        "rev": "cbe3ecf4789c1dfcbfb531e50843941207653086",
-        "revCount": 123,
+        "rev": "97a12374b7ab681794f8cc7b1bee0414136cbf51",
+        "revCount": 131,
         "type": "git",
         "url": "ssh://git@git.bitlab21.com/sam/nix-secrets.git"
       },
@@ -384,11 +384,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1719584730,
-        "narHash": "sha256-O24Ms0iM0JE+duoXGlouxbzfaHRSXWUu0NKFKdveQ4c=",
+        "lastModified": 1719592641,
+        "narHash": "sha256-xgz6AcTVH1i8G3LPSitKNOQflfYU7wMTfAcUrO5FG+Y=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "d06168ffaa627c12e0d0ea2f993387b715934e1a",
+        "rev": "ee1f0944028ebd11098d45c8e13658cffcac3550",
         "type": "github"
       },
       "original": {
diff --git a/home/common/core/default.nix b/home/common/core/default.nix
index fa6bc24..ca3483a 100644
--- a/home/common/core/default.nix
+++ b/home/common/core/default.nix
@@ -4,7 +4,6 @@
     inputs.nix-colors.homeManagerModules.default
     ./zsh.nix
     ./nixvim
-    ./fonts.nix
   ];
 
   nixpkgs.overlays = [
diff --git a/hosts/common/core/default.nix b/hosts/common/core/default.nix
index e109f5a..1549749 100644
--- a/hosts/common/core/default.nix
+++ b/hosts/common/core/default.nix
@@ -4,6 +4,7 @@ let
 in
 {
   imports = [
+    inputs.impermanence.nixosModules.impermanence
     ./sops.nix
     ./locale.nix
   ];
diff --git a/hosts/common/users/admin/default.nix b/hosts/common/users/admin/default.nix
index 7843ebc..5b9827c 100644
--- a/hosts/common/users/admin/default.nix
+++ b/hosts/common/users/admin/default.nix
@@ -36,11 +36,6 @@ in
       mode = "0644";
       owner = "${username}";
     };
-    "ssh_keys/deploy_key/id_ed25519" = {
-      path = "/home/${username}/.ssh/deploy_key-ssh-ed25519";
-      mode = "0644";
-      owner = "${username}";
-    };
   };
 
   programs.zsh.enable = true;
diff --git a/hosts/nebula/default.nix b/hosts/nebula/default.nix
index 5f277a1..6fdab58 100644
--- a/hosts/nebula/default.nix
+++ b/hosts/nebula/default.nix
@@ -6,7 +6,6 @@ let
   encrypted = false; # currrently only applies to btrfs
   btrfsMountDevice = if encrypted then "/dev/mapper/crypted" else "/dev/root_vg/root";
   user = "admin";
-  enablePersistance = false;
 in
 {
   imports =
@@ -24,13 +23,17 @@ in
 
       # Import optional options
       ../common/optional/openssh.nix
-      (import ../common/optional/persistence.nix {enable = enablePersistance;})
 
 
     ];
 
-  boot.loader.grub.enable = true;
-  boot.loader.grub.device = "/dev/sda"; 
+  boot = {
+    loader = {
+      systemd-boot.enable = true;
+      efi.canTouchEfiVariables = true;
+      timeout = 3;
+    };
+  };
 
   networking = {
     hostName = "nebula";
diff --git a/hosts/semita/default.nix b/hosts/semita/default.nix
index 59185b8..ac93180 100644
--- a/hosts/semita/default.nix
+++ b/hosts/semita/default.nix
@@ -6,7 +6,6 @@ let
   encrypted = true; # currrently only applies to btrfs
   btrfsMountDevice = if encrypted then "/dev/mapper/crypted" else "/dev/root_vg/root";
   user = "sam";
-  enablePersistance = true;
 in
 {
   imports =
@@ -19,7 +18,6 @@ in
       (import ../common/disks { device = dev; fsType = fsType; encrypted = encrypted; })
 
       # Impermanence
-      inputs.impermanence.nixosModules.impermanence
       (import ../common/disks/btrfs-impermanence.nix { btrfsMountDevice = btrfsMountDevice; lib = lib; })
 
       # Import core options
@@ -27,7 +25,7 @@ in
       ../common/core
 
       # Import optional options
-      (import ../common/optional/persistence.nix {enable = enablePersistance;})
+      ../common/optional/persistence.nix
       ../common/optional/pipewire.nix
       ../common/optional/openssh.nix
       ../common/optional/dwm.nix
diff --git a/hosts/sparky/default.nix b/hosts/sparky/default.nix
index 566d8e7..0766dda 100644
--- a/hosts/sparky/default.nix
+++ b/hosts/sparky/default.nix
@@ -5,7 +5,6 @@ let
   dev = "/dev/sda"; # depends on target hardware
   encrypted = false; # currrently only applies to btrfs
   btrfsMountDevice = if encrypted then "/dev/mapper/crypted" else "/dev/root_vg/root";
-  enablePersistance = true;
 in
 {
   imports =
@@ -18,7 +17,6 @@ in
       (import ../common/disks { device = dev; fsType = fsType; encrypted = encrypted; })
 
       # Impermanence
-      inputs.impermanence.nixosModules.impermanence
       (import ../common/disks/btrfs-impermanence.nix { btrfsMountDevice = btrfsMountDevice; lib = lib; })
 
       # Import core options
@@ -27,7 +25,7 @@ in
 
       # Import optional options
       ../common/optional/openssh.nix
-      (import ../common/optional/persistence.nix {enable = enablePersistance;})
+      ../common/optional/persistence.nix
       ../common/optional/gaming.nix
 
     ];