diff --git a/build-iso.sh b/build-iso.sh
new file mode 100755
index 0000000..d86c0d2
--- /dev/null
+++ b/build-iso.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+nix build .#nixosConfigurations.live.config.system.build.isoImage
diff --git a/flake.lock b/flake.lock
index 5a4f583..9a87a9f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -49,6 +49,21 @@
         "type": "github"
       }
     },
+    "catppuccin": {
+      "locked": {
+        "lastModified": 1726952185,
+        "narHash": "sha256-l/HbsQjJMT6tlf8KCooFYi3J6wjIips3n6/aWAoLY4g=",
+        "owner": "catppuccin",
+        "repo": "nix",
+        "rev": "630b559cc1cb4c0bdd525af506935323e4ccd5d1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "catppuccin",
+        "repo": "nix",
+        "type": "github"
+      }
+    },
     "devshell": {
       "inputs": {
         "nixpkgs": [
@@ -177,7 +192,9 @@
     },
     "home-manager": {
       "inputs": {
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1727246346,
@@ -250,7 +267,7 @@
         "hyprlang": "hyprlang",
         "hyprutils": "hyprutils",
         "hyprwayland-scanner": "hyprwayland-scanner",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
         "systems": "systems",
         "xdph": "xdph"
       },
@@ -503,22 +520,6 @@
       }
     },
     "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1726755586,
-        "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
       "locked": {
         "lastModified": 1726937504,
         "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=",
@@ -534,7 +535,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1727348695,
         "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
@@ -558,7 +559,7 @@
         "git-hooks": "git-hooks",
         "home-manager": "home-manager_2",
         "nix-darwin": "nix-darwin",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_3",
         "nuschtosSearch": "nuschtosSearch",
         "treefmt-nix": "treefmt-nix"
       },
@@ -600,10 +601,11 @@
     },
     "root": {
       "inputs": {
+        "catppuccin": "catppuccin",
         "home-manager": "home-manager",
         "hyprland": "hyprland",
         "nix-colors": "nix-colors",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_2",
         "nixvim": "nixvim"
       }
     },
diff --git a/flake.nix b/flake.nix
index ac12fda..4958423 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,7 +5,10 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    home-manager.url = "github:nix-community/home-manager";
+    home-manager = {
+      url = "github:nix-community/home-manager";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     hyprland = {
       type = "git";
       url = "https://github.com/hyprwm/Hyprland.git";
@@ -14,6 +17,7 @@
     };
     nix-colors.url = "github:misterio77/nix-colors";
     nixvim.url = "github:nix-community/nixvim";
+    catppuccin.url = "github:catppuccin/nix";
   };
 
   outputs = { self, nixpkgs, home-manager, ... }@inputs:
@@ -40,6 +44,7 @@
         desktop = mkNixOS [ ./hosts/desktop ];
         test = mkNixOS [ ./hosts/test ];
         pi = mkNixOS [ ./hosts/pi ];
+        live = mkNixOS [ ./hosts/live ];
       };
 
       homeConfigurations = {
diff --git a/home-manager/common/programs/basePrograms.nix b/home-manager/common/programs/basePrograms.nix
index 78d19d9..510f0c6 100644
--- a/home-manager/common/programs/basePrograms.nix
+++ b/home-manager/common/programs/basePrograms.nix
@@ -1,12 +1,6 @@
 { inputs, ... }: {
   programs = {
-    home-manager.enable = true;
-    git.enable = true;
-    fzf.enable = true;
-    neovim.enable = true;
-    ripgrep.enable = true;
     gh.enable = true;
-    btop.enable = true;
     lazygit.enable = true;
   };
 }
diff --git a/hosts/common/global/default.nix b/hosts/common/global/default.nix
index a6965a3..79a4afc 100644
--- a/hosts/common/global/default.nix
+++ b/hosts/common/global/default.nix
@@ -1,8 +1,16 @@
-{ inputs, ... }: {
+{ inputs, pkgs, ... }: {
   imports =
     [ inputs.home-manager.nixosModules.home-manager ./nix.nix ./zsh.nix ];
 
-  programs = { zsh.enable = true; };
+  environment.systemPackages = [
+    pkgs.btop
+    pkgs.fzf
+    pkgs.home-manager
+    pkgs.ripgrep
+    pkgs.zsh
+    pkgs.git
+    pkgs.neovim
+  ];
 
   time = { timeZone = "Europe/Lisbon"; };
 
diff --git a/hosts/live/default.nix b/hosts/live/default.nix
new file mode 100644
index 0000000..cee95ac
--- /dev/null
+++ b/hosts/live/default.nix
@@ -0,0 +1,7 @@
+{ inputs, pkgs, modulesPath, ... }: {
+  imports = [
+    (modulesPath + "/installer/cd-dvd/installation-cd-minimal.nix")
+    ../common/global
+    ../common/docker.nix
+  ];
+}