diff --git a/desktop/configuration.nix b/desktop/configuration.nix
index 23cdbd6..7539ed2 100644
--- a/desktop/configuration.nix
+++ b/desktop/configuration.nix
@@ -1,4 +1,6 @@
 {
+  config,
+  lib,
   pkgs,
   ...
 }:
@@ -9,13 +11,12 @@
   ];
 
   environment.shellAliases = {
-    boot = "sudo nixos-rebuild boot --flake ~/NixOS/.#nvidia";
     rebuild = "sudo nixos-rebuild switch --flake ~/NixOS/.#nvidia";
-    c = "nix-shell ~/NixOS/shells/c.nix";
-    js = "nix-shell ~/NixOS/shells/js.nix";
-    nix = "nix-shell ~/NixOS/shells/nix.nix";
-    rust = "nix-shell ~/NixOS/shells/rust.nix";
-    python = "nix-shell ~/NixOS/shells/python.nix";
+    c = "nix-shell ~/nixos/shells/c.nix";
+    js = "nix-shell ~/nixos/shells/js.nix";
+    nix = "nix-shell ~/nixos/shells/nix.nix";
+    rust = "nix-shell ~/nixos/shells/rust.nix";
+    python = "nix-shell ~/nixos/shells/python.nix";
   };
 
   programs.steam.enable = true;
diff --git a/flake.nix b/flake.nix
index 5ef733f..1420c93 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,6 +14,7 @@
 
   outputs =
     {
+      self,
       disko,
       home-manager,
       nixpkgs,
diff --git a/home.nix b/home.nix
index 42eb8f4..75b81e9 100644
--- a/home.nix
+++ b/home.nix
@@ -10,8 +10,6 @@
     fd
     nil
     nixd
-    nixfmt
-    package-version-server
     unzip
     ghostty
     flatpak
diff --git a/laptop/configuration.nix b/laptop/configuration.nix
index 1ec72f1..74df5ca 100644
--- a/laptop/configuration.nix
+++ b/laptop/configuration.nix
@@ -11,7 +11,7 @@
   ];
 
   environment.shellAliases = {
-    rebuild = "sudo nixos-rebuild switch --flake ~/nixos/.#laptop";
+    rebuild = "sudo nixos-rebuild switch --flake ~/NixOS/.#laptop";
     c = "nix-shell ~/nixos/shells/c.nix";
     js = "nix-shell ~/nixos/shells/js.nix";
     nix = "nix-shell ~/nixos/shells/nix.nix";
@@ -41,12 +41,8 @@
     "flakes"
   ];
 
-  # Gnome Desktop.
-  services.desktopManager.gnome.enable = true;
-  services.displayManager.gdm.enable = true;
-  services.gnome.gnome-software.enable = true;
-  services.gnome.core-apps.enable = true;
-  services.gnome.games.enable = false;
+  services.displayManager.cosmic-greeter.enable = true;
+  services.desktopManager.cosmic.enable = true;
 
   services.flatpak.enable = true;
   hardware.graphics.enable = true;
diff --git a/nvidia/nvidia.nix b/nvidia/nvidia.nix
index 52982d7..ce283b4 100644
--- a/nvidia/nvidia.nix
+++ b/nvidia/nvidia.nix
@@ -1,5 +1,7 @@
 {
   config,
+  lib,
+  pkgs,
   ...
 }:
 {
diff --git a/servers/black/configuration.nix b/servers/black/configuration.nix
index eb6c848..2483fc9 100644
--- a/servers/black/configuration.nix
+++ b/servers/black/configuration.nix
@@ -1,4 +1,6 @@
 {
+  config,
+  lib,
   pkgs,
   ...
 }:
@@ -9,7 +11,6 @@
   ];
 
   environment.shellAliases = {
-    boot = "sudo nixos-rebuild boot --flake ~/NixOS/.#nvidia";
     rebuild = "sudo nixos-rebuild switch --flake ~/NixOS/.#black";
   };
 
diff --git a/shells/js.nix b/shells/js.nix
index 9c8703d..e69de29 100644
--- a/shells/js.nix
+++ b/shells/js.nix
@@ -1,10 +0,0 @@
-{
-  pkgs ? import <nixpkgs> { },
-}:
-
-pkgs.mkShell {
-  buildInputs = with pkgs; [
-    pnpm
-    typescript-language-server
-  ];
-}