diff --git a/flake.lock b/flake.lock
index f9acb87..2c5d497 100644
--- a/flake.lock
+++ b/flake.lock
@@ -175,6 +175,64 @@
         "type": "github"
       }
     },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1778869304,
+        "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "d233902339c02a9c334e7e593de68855ad26c4cb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "noctalia-qs": {
+      "inputs": {
+        "nixpkgs": [
+          "noctalia-shell",
+          "nixpkgs"
+        ],
+        "systems": "systems_3",
+        "treefmt-nix": "treefmt-nix"
+      },
+      "locked": {
+        "lastModified": 1778983195,
+        "narHash": "sha256-hE3EFK5GoSdbO5WHZ8bZDUVYkofbDLQN/KK25z7IOOI=",
+        "owner": "noctalia-dev",
+        "repo": "noctalia-qs",
+        "rev": "4116b41cdc89e186be7cb8b24a9b6022af95d742",
+        "type": "github"
+      },
+      "original": {
+        "owner": "noctalia-dev",
+        "repo": "noctalia-qs",
+        "type": "github"
+      }
+    },
+    "noctalia-shell": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_4",
+        "noctalia-qs": "noctalia-qs"
+      },
+      "locked": {
+        "lastModified": 1779125269,
+        "narHash": "sha256-vMF9Hd5/UoLggIJcLKK/oC1SnxoQdgIaUMdVB48zQ7A=",
+        "owner": "noctalia-dev",
+        "repo": "noctalia-shell",
+        "rev": "da95089dfe5148ee7fb33b3faa314e86de1e6f25",
+        "type": "github"
+      },
+      "original": {
+        "owner": "noctalia-dev",
+        "repo": "noctalia-shell",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "amp-pkgs": "amp-pkgs",
@@ -182,7 +240,8 @@
         "home-manager": "home-manager",
         "k": "k",
         "nixpkgs": "nixpkgs_3",
-        "nixpkgs-unstable": "nixpkgs-unstable"
+        "nixpkgs-unstable": "nixpkgs-unstable",
+        "noctalia-shell": "noctalia-shell"
       }
     },
     "systems": {
@@ -214,6 +273,43 @@
         "repo": "default",
         "type": "github"
       }
+    },
+    "systems_3": {
+      "locked": {
+        "lastModified": 1689347949,
+        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "type": "github"
+      }
+    },
+    "treefmt-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "noctalia-shell",
+          "noctalia-qs",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1775636079,
+        "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index d328941..38e730f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,9 +9,10 @@
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
     k.url = "github:rothgar/k";
     claude-code.url = "github:sadjow/claude-code-nix";
+    noctalia-shell.url = "github:noctalia-dev/noctalia-shell";
   };
 
-  outputs = { self, nixpkgs, nixpkgs-unstable, amp-pkgs, home-manager, k, claude-code, ... }:
+  outputs = { self, nixpkgs, nixpkgs-unstable, amp-pkgs, home-manager, k, claude-code, noctalia-shell, ... }:
     let
       system = "x86_64-linux";
       unstablePkgs = import nixpkgs-unstable { inherit system; config.allowUnfree = true; };
@@ -35,7 +36,7 @@
               amp = ampPkgs;
             };
             home-manager.users.jgarr = {
-              imports = [ ./home.nix ] ++ homeModules;
+              imports = [ ./home.nix noctalia-shell.homeModules.default ] ++ homeModules;
               home.username = "jgarr";
               home.homeDirectory = "/home/jgarr";
               home.stateVersion = "25.11";
diff --git a/hosts/s-home.nix b/hosts/s-home.nix
index 1791276..9382977 100644
--- a/hosts/s-home.nix
+++ b/hosts/s-home.nix
@@ -1,6 +1,8 @@
-{ lib, ... }:
+{ lib, pkgs, ... }:
 
 {
+  home.packages = [ pkgs.nvtopPackages.nvidia ];
+
   dconf.settings = {
     "org/gnome/desktop/input-sources" = {
       sources = [ (lib.hm.gvariant.mkTuple [ "xkb" "us+dvorak" ]) ];
diff --git a/packages.txt b/packages.txt
index a7215de..3b4a61a 100644
--- a/packages.txt
+++ b/packages.txt
@@ -138,7 +138,6 @@ localsend
 sunshine
 tigervnc
 _1password-gui
-nvtopPackages.nvidia
 zip
 
 # GNOME extensions