From 475ad55c4ba73935b8a3428ad2efa384b2b4be8e Mon Sep 17 00:00:00 2001
From: mjallen18 <matt.l.jallen@gmail.com>
Date: Fri, 13 Jun 2025 10:44:36 -0500
Subject: [PATCH] pi5 cosmic

---
 flake.lock                  | 83 +++++++++++++++++++++++++++++++++++--
 flake.nix                   |  7 ++++
 hosts/pi5/configuration.nix |  1 +
 3 files changed, 88 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 08a009e..48385c1 100755
--- a/flake.lock
+++ b/flake.lock
@@ -404,6 +404,22 @@
       }
     },
     "flake-compat_6": {
+      "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_7": {
       "flake": false,
       "locked": {
         "lastModified": 1696426674,
@@ -1266,6 +1282,22 @@
       }
     },
     "nixpkgs-stable_6": {
+      "locked": {
+        "lastModified": 1749488106,
+        "narHash": "sha256-b9GIWdF/8jKpCC5JIMgDLZgwe8cEbty2fyTyo1eDFfI=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "8fe3e32e7f210522377c3bcff80931a3284ace6a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-24.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-stable_7": {
       "locked": {
         "lastModified": 1730741070,
         "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
@@ -1484,6 +1516,29 @@
         "type": "github"
       }
     },
+    "pi5-cosmic": {
+      "inputs": {
+        "flake-compat": "flake-compat_6",
+        "nixpkgs": [
+          "pi5-nixpkgs"
+        ],
+        "nixpkgs-stable": "nixpkgs-stable_6",
+        "rust-overlay": "rust-overlay_6"
+      },
+      "locked": {
+        "lastModified": 1749770917,
+        "narHash": "sha256-3jOhroFAAKg/vPmgmDnOKUGJp6GfLycUkhyMaJKZ7zg=",
+        "owner": "lilyinstarlight",
+        "repo": "nixos-cosmic",
+        "rev": "f5d076cdc61fe2f268d624a34a3df52573620396",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lilyinstarlight",
+        "repo": "nixos-cosmic",
+        "type": "github"
+      }
+    },
     "pi5-disko": {
       "inputs": {
         "nixpkgs": [
@@ -1657,7 +1712,7 @@
           "steamdeck-lanzaboote",
           "nixpkgs"
         ],
-        "nixpkgs-stable": "nixpkgs-stable_6"
+        "nixpkgs-stable": "nixpkgs-stable_7"
       },
       "locked": {
         "lastModified": 1731363552,
@@ -1757,6 +1812,7 @@
         "pi4-nixos-hardware": "pi4-nixos-hardware",
         "pi4-nixpkgs": "pi4-nixpkgs",
         "pi4-sops-nix": "pi4-sops-nix",
+        "pi5-cosmic": "pi5-cosmic",
         "pi5-disko": "pi5-disko",
         "pi5-home-manager": "pi5-home-manager",
         "pi5-impermanence": "pi5-impermanence",
@@ -1915,6 +1971,27 @@
       }
     },
     "rust-overlay_6": {
+      "inputs": {
+        "nixpkgs": [
+          "pi5-cosmic",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1749695868,
+        "narHash": "sha256-debjTLOyqqsYOUuUGQsAHskFXH5+Kx2t3dOo/FCoNRA=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "55f914d5228b5c8120e9e0f9698ed5b7214d09cd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
+    "rust-overlay_7": {
       "inputs": {
         "nixpkgs": [
           "steamdeck-lanzaboote",
@@ -2038,13 +2115,13 @@
     "steamdeck-lanzaboote": {
       "inputs": {
         "crane": "crane_3",
-        "flake-compat": "flake-compat_6",
+        "flake-compat": "flake-compat_7",
         "flake-parts": "flake-parts_4",
         "nixpkgs": [
           "steamdeck-nixpkgs"
         ],
         "pre-commit-hooks-nix": "pre-commit-hooks-nix_3",
-        "rust-overlay": "rust-overlay_6"
+        "rust-overlay": "rust-overlay_7"
       },
       "locked": {
         "lastModified": 1737639419,
diff --git a/flake.nix b/flake.nix
index a9a23ae..5d43664 100755
--- a/flake.nix
+++ b/flake.nix
@@ -161,6 +161,11 @@
       inputs.nixpkgs.follows = "pi5-nixpkgs";
     };
 
+    pi5-cosmic = {
+      url = "github:lilyinstarlight/nixos-cosmic";
+      inputs.nixpkgs.follows = "pi5-nixpkgs";
+    };
+
     #####################################################
     #                     pi4                           #
     #####################################################
@@ -325,6 +330,7 @@
       pi5-nixos-hardware,
       pi5-sops-nix,
       pi5-disko,
+      pi5-cosmic,
 
       # pi4
       pi4-nixpkgs,
@@ -516,6 +522,7 @@
             ./base/base-gui
             pi5-disko.nixosModules.disko
             ./share/disko/pi-uefi-disko.nix
+            pi5-cosmic.nixosModules.default
             pi5-impermanence.nixosModules.impermanence
             pi5-sops-nix.nixosModules.sops
             ./hosts/pi5/configuration.nix
diff --git a/hosts/pi5/configuration.nix b/hosts/pi5/configuration.nix
index 401d080..279a5e7 100755
--- a/hosts/pi5/configuration.nix
+++ b/hosts/pi5/configuration.nix
@@ -16,6 +16,7 @@ in
     ./networking.nix
     ./services.nix
     ./sops.nix
+    ../../modules/desktop-environments/cosmic
 #    ./hass.nix
   ];