From a09e13d9af409f1613383bac7a8baa9f52de8f4c Mon Sep 17 00:00:00 2001
From: deva <hi@dessa.dev>
Date: Sun, 29 Sep 2024 19:28:45 -0400
Subject: [PATCH] use COSMIC DE again

---
 flake.lock                     | 77 ++++++++++++++++++++++++++++++++++
 flake.nix                      | 13 ++++++
 system/waves/configuration.nix |  4 +-
 3 files changed, 92 insertions(+), 2 deletions(-)

diff --git a/flake.lock b/flake.lock
index ed3febc..bfb6d3c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -61,6 +61,22 @@
         "type": "github"
       }
     },
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1717312683,
+        "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=",
+        "owner": "nix-community",
+        "repo": "flake-compat",
+        "rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": "nixpkgs-lib"
@@ -255,6 +271,29 @@
         "type": "github"
       }
     },
+    "nixos-cosmic": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": "nixpkgs-stable",
+        "rust-overlay": "rust-overlay_2"
+      },
+      "locked": {
+        "lastModified": 1727487343,
+        "narHash": "sha256-aY4Qq1tY5zTTbIkaxGwK6r5MRAaKNIqgD7z96TnC3o0=",
+        "owner": "lilyinstarlight",
+        "repo": "nixos-cosmic",
+        "rev": "b4f5f62726ada74385f2eec846b47b7fafa876b6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lilyinstarlight",
+        "repo": "nixos-cosmic",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1709961763,
@@ -283,6 +322,22 @@
         "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz"
       }
     },
+    "nixpkgs-stable": {
+      "locked": {
+        "lastModified": 1727264057,
+        "narHash": "sha256-KQPI8CTTnB9CrJ7LrmLC4VWbKZfljEPBXOFGZFRpxao=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "759537f06e6999e141588ff1c9be7f3a5c060106",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-24.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs-unstable": {
       "locked": {
         "lastModified": 1725983898,
@@ -423,6 +478,7 @@
         "nh": "nh",
         "nix-gaming": "nix-gaming",
         "nix-inspect": "nix-inspect",
+        "nixos-cosmic": "nixos-cosmic",
         "nixpkgs": "nixpkgs_2",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "st": "st"
@@ -444,6 +500,27 @@
         "type": "github"
       }
     },
+    "rust-overlay_2": {
+      "inputs": {
+        "nixpkgs": [
+          "nixos-cosmic",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1727404165,
+        "narHash": "sha256-kZCiYpQJBZ3kL9QymS88mCxpQwqo8KqvZeHk6LATuY8=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "76f0a61e733259e1034dd6523e039d04932ffefc",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
     "slimlock": {
       "inputs": {
         "nixpkgs": [
diff --git a/flake.nix b/flake.nix
index 8053d0f..32a41fd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -28,6 +28,11 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    nixos-cosmic = {
+      url = "github:lilyinstarlight/nixos-cosmic";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     st.url = "github:devawaves/st";
   };
 
@@ -36,6 +41,7 @@
     nixpkgs,
     home-manager,
     flake-utils,
+    nixos-cosmic,
     ...
   } @ inputs: let
     mkApp = flake-utils.lib.mkApp;
@@ -64,6 +70,13 @@
         modules = [
           inputs.disko.nixosModules.default
           (import ./disko.nix {device = "/dev/disk/by-id/nvme-Samsung_SSD_980_PRO_with_Heatsink_1TB_S6WSNJ0T900943T";})
+          {
+            nix.settings = {
+              substituters = [ "https://cosmic.cachix.org/" ];
+              trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ];
+            };
+          }
+          nixos-cosmic.nixosModules.default
           ./system/waves/configuration.nix
           home-manager.nixosModules.home-manager
           {
diff --git a/system/waves/configuration.nix b/system/waves/configuration.nix
index 424d204..b74d737 100644
--- a/system/waves/configuration.nix
+++ b/system/waves/configuration.nix
@@ -312,8 +312,8 @@
       geary # email reader
       evince # document viewer
     ]);
-  # services.displayManager.cosmic-greeter.enable = false;
-  # services.desktopManager.cosmic.enable = true;
+  services.displayManager.cosmic-greeter.enable = false;
+  services.desktopManager.cosmic.enable = true;
 
   # i18n
   time.timeZone = "America/Indiana/Indianapolis";