diff --git a/configs/desktop.nix b/configs/desktop.nix
index e13c883..70ea5dc 100644
--- a/configs/desktop.nix
+++ b/configs/desktop.nix
@@ -2,11 +2,13 @@
   lib,
   pkgs,
   config,
+  catppuccin,
   lanzaboote,
   ...
 }:
 {
   imports = [
+    catppuccin.nixosModules.catppuccin
     lanzaboote.nixosModules.lanzaboote
 
     ./client.nix
@@ -75,6 +77,7 @@
 
   hm = {
     imports = [
+      catppuccin.homeManagerModules.catppuccin
       ../programs/java.nix
     ];
 
diff --git a/flake.lock b/flake.lock
index dec19c4..e7d397b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -70,6 +70,21 @@
         "url": "https://git.uku3lig.net/uku/camasca"
       }
     },
+    "catppuccin": {
+      "locked": {
+        "lastModified": 1735028008,
+        "narHash": "sha256-crbQNRVQgPH0hX5vZk8xL9JStXo74Es7zDBjRcc4i+A=",
+        "owner": "Stonks3141",
+        "repo": "ctp-nix",
+        "rev": "bfd20bcf45f1de0e97b551be51495abf8a727f1a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Stonks3141",
+        "repo": "ctp-nix",
+        "type": "github"
+      }
+    },
     "crane": {
       "locked": {
         "lastModified": 1734808813,
@@ -282,6 +297,7 @@
         "agenix": "agenix",
         "api-rs": "api-rs",
         "camasca": "camasca",
+        "catppuccin": "catppuccin",
         "crane": "crane",
         "flake-parts": "flake-parts",
         "flake-utils": "flake-utils",
diff --git a/flake.nix b/flake.nix
index 082bce7..69240f1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -73,6 +73,8 @@
       inputs.darwin.follows = "";
     };
 
+    catppuccin.url = "github:Stonks3141/ctp-nix";
+
     crane.url = "github:ipetkov/crane";
 
     flake-parts = {
diff --git a/justfile b/justfile
index b5d6a80..54fd3a5 100644
--- a/justfile
+++ b/justfile
@@ -6,7 +6,7 @@ check:
 
 switch *args:
     @sudo -v
-    nh os switch --no-nom --ask . -- --keep-going {{args}}
+    nh os switch --ask . -- --keep-going {{args}}
 
 rollback:
     @sudo -v
@@ -14,7 +14,7 @@ rollback:
 
 boot *args:
     @sudo -v
-    nh os boot --no-nom --ask . -- --keep-going {{args}}
+    nh os boot --ask . -- --keep-going {{args}}
 
 deploy system user="leo":
     #!/usr/bin/env bash
@@ -23,7 +23,7 @@ deploy system user="leo":
     nix copy "$flake" --to "ssh://{{user}}@{{system}}"
     # -R/--bypass-root-check is needed because of a Git CVE regression in Nix 2.20
     # See NixOS/nix#10202, viperML/nh#200
-    ssh -t "{{user}}@{{system}}" "sudo flock -w 60 /dev/shm/deploy-{{system}} nix run n#nh -- os switch --no-nom -R -H {{system}} --ask $flake"
+    ssh -t "{{user}}@{{system}}" "sudo flock -w 60 /dev/shm/deploy-{{system}} nix run n#nh -- os switch -R -H {{system}} --ask $flake"
 
 lint *args:
     statix check -i flake.nix **/hardware-configuration.nix {{args}}
diff --git a/programs/dotnet.nix b/programs/dotnet.nix
index 58cb4ce..5be6ac3 100644
--- a/programs/dotnet.nix
+++ b/programs/dotnet.nix
@@ -12,7 +12,8 @@ in
     packages = [ pkgs.jetbrains.rider ];
 
     file = {
-      ".dotnet/8".source = mkOutOfStoreSymlink "${pkgs.dotnet-sdk_8}/share/dotnet";
+      ".dotnet/8".source =
+        mkOutOfStoreSymlink "${pkgs.dotnetCorePackages.dotnet_8.sdk.unwrapped}/share/dotnet";
       ".dotnet/mono".source = mkOutOfStoreSymlink pkgs.mono;
     };
   };