diff --git a/flake.lock b/flake.lock
index 2b57a89..7e3636d 100755
--- a/flake.lock
+++ b/flake.lock
@@ -433,6 +433,22 @@
       }
     },
     "flake-compat_5": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1746162366,
+        "narHash": "sha256-5SSSZ/oQkwfcAz/o/6TlejlVGqeK08wyREBQ5qFFPhM=",
+        "owner": "nix-community",
+        "repo": "flake-compat",
+        "rev": "0f158086a2ecdbb138cd0429410e44994f1b7e4b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_6": {
       "flake": false,
       "locked": {
         "lastModified": 1696426674,
@@ -1225,6 +1241,22 @@
       }
     },
     "nixpkgs-stable_5": {
+      "locked": {
+        "lastModified": 1746557022,
+        "narHash": "sha256-QkNoyEf6TbaTW5UZYX0OkwIJ/ZMeKSSoOMnSDPQuol0=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "1d3aeb5a193b9ff13f63f4d9cc169fb88129f860",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-24.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-stable_6": {
       "locked": {
         "lastModified": 1730741070,
         "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
@@ -1288,6 +1320,29 @@
         "type": "github"
       }
     },
+    "pi5-cosmic": {
+      "inputs": {
+        "flake-compat": "flake-compat_5",
+        "nixpkgs": [
+          "Pi5-nixpkgs"
+        ],
+        "nixpkgs-stable": "nixpkgs-stable_5",
+        "rust-overlay": "rust-overlay_4"
+      },
+      "locked": {
+        "lastModified": 1746800640,
+        "narHash": "sha256-JYIzK5YIuB23xhaHftCFlJgxbZQigmGR73tVsotQnxk=",
+        "owner": "lilyinstarlight",
+        "repo": "nixos-cosmic",
+        "rev": "745255df83cd31ce7cfbb1089d4b747b9f9d7d8b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lilyinstarlight",
+        "repo": "nixos-cosmic",
+        "type": "github"
+      }
+    },
     "poetry2nix": {
       "inputs": {
         "flake-utils": [
@@ -1384,7 +1439,7 @@
           "steamdeck-lanzaboote",
           "nixpkgs"
         ],
-        "nixpkgs-stable": "nixpkgs-stable_5"
+        "nixpkgs-stable": "nixpkgs-stable_6"
       },
       "locked": {
         "lastModified": 1731363552,
@@ -1429,6 +1484,7 @@
         "nixos-raspberrypi": "nixos-raspberrypi",
         "nixpkgs-stable": "nixpkgs-stable_4",
         "nixpkgs-unstable": "nixpkgs-unstable",
+        "pi5-cosmic": "pi5-cosmic",
         "steamdeck-chaotic": "steamdeck-chaotic",
         "steamdeck-home-manager": "steamdeck-home-manager",
         "steamdeck-impermanence": "steamdeck-impermanence",
@@ -1538,6 +1594,27 @@
       }
     },
     "rust-overlay_4": {
+      "inputs": {
+        "nixpkgs": [
+          "pi5-cosmic",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1746758179,
+        "narHash": "sha256-JECUw1YBEsTsVauvupRzE5ykZaJoyhHCpoY87ZZJGas=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "4fd00513eac6b6140c5dced3e1b8133e2369a0f8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
+    "rust-overlay_5": {
       "inputs": {
         "nixpkgs": [
           "steamdeck-lanzaboote",
@@ -1640,13 +1717,13 @@
     "steamdeck-lanzaboote": {
       "inputs": {
         "crane": "crane_3",
-        "flake-compat": "flake-compat_5",
+        "flake-compat": "flake-compat_6",
         "flake-parts": "flake-parts_4",
         "nixpkgs": [
           "steamdeck-nixpkgs"
         ],
         "pre-commit-hooks-nix": "pre-commit-hooks-nix_3",
-        "rust-overlay": "rust-overlay_4"
+        "rust-overlay": "rust-overlay_5"
       },
       "locked": {
         "lastModified": 1737639419,
diff --git a/flake.nix b/flake.nix
index 35fab43..c4043f3 100755
--- a/flake.nix
+++ b/flake.nix
@@ -421,7 +421,7 @@
                   ];
                 };
             }
-            pi5-cosmic.nixosModules.default
+            # pi5-cosmic.nixosModules.default
           ];
         };
 
diff --git a/hosts/pi5/configuration.nix b/hosts/pi5/configuration.nix
index 66332be..d123209 100755
--- a/hosts/pi5/configuration.nix
+++ b/hosts/pi5/configuration.nix
@@ -14,9 +14,10 @@ in
     ./hardware-configuration.nix
     ./impermanence.nix
     ./networking.nix
+    ./services.nix
     ./sops.nix
     ../default.nix
-    ../../modules/desktop-environments/cosmic/default.nix
+#    ../../modules/desktop-environments/cosmic/default.nix
   ];
 
   # Enable nix flakes and nix-command tools
diff --git a/hosts/pi5/home.nix b/hosts/pi5/home.nix
index a2e89a8..1c60d52 100755
--- a/hosts/pi5/home.nix
+++ b/hosts/pi5/home.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, lib, ... }:
 let
   shellAliases = {
     ll = "ls -alh";
@@ -92,9 +92,16 @@ in
 
   home.packages = with pkgs; [
     age
+    apple-cursor
+    colloid-icon-theme
+    colloid-gtk-theme
     btop
     fastfetch
     firefox
+    gnome-tweaks
+    gnomeExtensions.appindicator
+    gnomeExtensions.dash-to-dock
+    gnomeExtensions.tiling-assistant
     home-manager
     lm_sensors
     mission-center
@@ -102,4 +109,36 @@ in
     tree
     vscode
   ];
+
+  dconf = {
+    enable = true;
+    settings = {
+      "org/gnome/desktop/interface".clock-format = "12h";
+      "org/gnome/desktop/interface".color-scheme = "prefer-dark";
+      "org/gnome/desktop/interface".cursor-theme = lib.mkDefault "macOS";
+      "org/gnome/desktop/interface".enable-hot-corners = false;
+      "org/gnome/desktop/interface".font-antialiasing = "grayscale";
+      "org/gnome/desktop/interface".font-hinting = "slight";
+      "org/gnome/desktop/interface".gtk-theme = lib.mkDefault "Colloid-Dark";
+      "org/gnome/desktop/interface".icon-theme = lib.mkDefault "Colloid-Dark";
+      "org/gnome/desktop/peripherals/mouse".accel-profile = "flat";
+      "org/gnome/desktop/peripherals/touchpad".two-finger-scrolling-enabled = true;
+      "org/gnome/desktop/peripherals/touchpad".tap-to-click = true;
+      "org/gnome/mutter".experimental-features = [
+        "scale-monitor-framebuffer"
+        "variable-refresh-rate"
+      ];
+      "org/gnome/tweaks".show-extensions-notice = false;
+      "org/gnome/shell".enabled-extensions = [
+        "appindicatorsupport@rgcjonas.gmail.com"
+        "user-theme@gnome-shell-extensions.gcampax.github.com"
+        "tiling-assistant@leleat-on-github"
+        "dash-to-dock@micxgx.gmail.com"
+      ];
+      "org/gnome/shell/extensions/dash-to-panel".primary-monitor = 1;
+      "org/gnome/shell/extensions/dash-to-panel".multi-monitors = false;
+      "org/gnome/shell/extensions/user-theme".name = lib.mkDefault "Colloid-Dark";
+      "org/gtk/settings/file-chooser".clock-format = "12h";
+    };
+  };
 }
diff --git a/hosts/pi5/services.nix b/hosts/pi5/services.nix
new file mode 100644
index 0000000..060caba
--- /dev/null
+++ b/hosts/pi5/services.nix
@@ -0,0 +1,15 @@
+{ ... }:
+{
+  services = {
+    xserver.desktopManager.gnome.enable = true;
+    shairport-sync = {
+      enable = true;
+      openFirewall = true;
+      settings = {
+        general = {
+          name = "Living Room Speakers";
+        };
+      };
+    };
+  };
+}