diff --git a/common/tmux.nix b/common/tmux.nix
index ded400f7..60661dd0 100644
--- a/common/tmux.nix
+++ b/common/tmux.nix
@@ -5,7 +5,7 @@
     if [ "$(tmux display-message -p -F "#{session_name}")" = "scratch" ];then
         tmux detach-client
     else
-        tmux popup -d '#{pane_current_path}' -xC -yC -w$width -h$height -E "tmux attach -t scratch || tmux new -s scratch"
+        tmux popup -d '#{pane_current_path}' -xC -yC -w$width -h$height -E "tmux new -A -s scratch"
     fi
   '';
 in {
diff --git a/flake.lock b/flake.lock
index 0c81a98c..05f95c7f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1498,7 +1498,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-JVbSYTJfcy9GUhEuD9PSXvgnHc5QwQIFQkf/xu9r0vI=",
+        "narHash": "sha256-seTVgA8Df4rzadXlItYv3+HWqjeKatFvGSQZI1FViB0=",
         "path": "./neovim",
         "type": "path"
       },
diff --git a/flake.nix b/flake.nix
index 4ed7fda0..0f97909a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -102,6 +102,7 @@
         user = "fs0c131y";
         hasGui = false; # Don't wan't to run GUI apps on a headless server
         isServer = true;
+        live = true;
       }
       {
         name = "ryu";
@@ -157,6 +158,10 @@
         if (builtins.hasAttr "monitors" device)
         then device.monitors
         else null;
+      live =
+        if (builtins.hasAttr "live" device)
+        then device.live
+        else false;
       system = device.system;
       name = device.name;
       user = device.user;
diff --git a/neovim/nvim.nix b/neovim/nvim.nix
index dc083ca3..191da280 100644
--- a/neovim/nvim.nix
+++ b/neovim/nvim.nix
@@ -450,7 +450,7 @@ in rec {
                 height = 0.99,
                 width = 0.95,
             },
-            cmd        = "sh -c 'tmux attach -t scratch || tmux new -s scratch'",
+            cmd        = "sh -c 'tmux new -As scratch'",
             blend      = 10,
         })
 
@@ -516,9 +516,8 @@ in rec {
                     tmux_show_only_in_active_window = true,
                 }
             }
-            require("pets").setup({
-              -- your options here
-            })
+            -- require("pets").setup({
+            -- })
         else
             vim.o.guifont = "Hasklug Nerd Font Mono:h13"
             vim.g.neovide_cursor_vfx_mode = "railgun"
@@ -676,7 +675,7 @@ in rec {
       image-nvim
       ChatGPT-nvim
       # gp-nvim
-      pets-nvim
+      # pets-nvim
 
       # UI and UX
       vim-abolish
diff --git a/nixos/device.nix b/nixos/device.nix
index 925a1e5c..85eafde2 100644
--- a/nixos/device.nix
+++ b/nixos/device.nix
@@ -3,6 +3,7 @@
   devices,
   inputs,
   overlays,
+  lib,
   home-manager,
   nur,
   ...
@@ -15,25 +16,29 @@ builtins.listToAttrs (builtins.map (device: {
         inherit device;
         lanzaboote = inputs.lanzaboote;
       };
-      modules = [
-        nur.nixosModules.nur
-        {nixpkgs.overlays = overlays;}
-        ./configuration.nix
-        home-manager.nixosModules.home-manager
-        inputs.lanzaboote.nixosModules.lanzaboote
-        {
-          nixpkgs.config.allowUnfree = true;
-          home-manager = {
-            useGlobalPkgs = true;
-            useUserPackages = true;
-            extraSpecialArgs = {
-              inherit inputs;
-              inherit device;
+      modules =
+        [
+          nur.nixosModules.nur
+          {nixpkgs.overlays = overlays;}
+          ./configuration.nix
+          home-manager.nixosModules.home-manager
+          inputs.lanzaboote.nixosModules.lanzaboote
+          {
+            nixpkgs.config.allowUnfree = true;
+            home-manager = {
+              useGlobalPkgs = true;
+              useUserPackages = true;
+              extraSpecialArgs = {
+                inherit inputs;
+                inherit device;
+              };
+              users.${device.user}.imports = [../common/home.nix];
             };
-            users.${device.user}.imports = [../common/home.nix];
-          };
-        }
-      ];
+          }
+        ]
+        ++ lib.optionals device.live [
+          (nixpkgs + "/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix")
+        ];
     };
   })
   devices)