From 579c4083956891d26b7f741405db66d055475249 Mon Sep 17 00:00:00 2001
From: b3nj5m1n <b3nj4m1n@gmx.net>
Date: Sun, 11 Aug 2024 16:34:21 +0200
Subject: [PATCH] Add cosmic DE

---
 flake.lock                       | 83 ++++++++++++++++++++++++++++++--
 flake.nix                        | 13 +++++
 nix/modules/nixos/networking.nix |  2 +-
 nix/nixos/adelie.nix             |  2 +
 4 files changed, 96 insertions(+), 4 deletions(-)

diff --git a/flake.lock b/flake.lock
index aaca2b3..a6d11b2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -100,6 +100,22 @@
         "type": "github"
       }
     },
+    "flake-compat_2": {
+      "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"
@@ -447,6 +463,29 @@
         "url": "https://flakehub.com/f/NixOS/nix/2.20.tar.gz"
       }
     },
+    "nixos-cosmic": {
+      "inputs": {
+        "flake-compat": "flake-compat_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": "nixpkgs-stable",
+        "rust-overlay": "rust-overlay"
+      },
+      "locked": {
+        "lastModified": 1723340593,
+        "narHash": "sha256-SYrNboypGpiFlE6g3UWdfqJeMihR0dBJPAwTwO6T64A=",
+        "owner": "lilyinstarlight",
+        "repo": "nixos-cosmic",
+        "rev": "94a1e5a4888ab0cb5ad0fe602d03d867a320348b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lilyinstarlight",
+        "repo": "nixos-cosmic",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1705033721,
@@ -492,6 +531,22 @@
       }
     },
     "nixpkgs-stable": {
+      "locked": {
+        "lastModified": 1722987190,
+        "narHash": "sha256-68hmex5efCiM2aZlAAEcQgmFI4ZwWt8a80vOeB/5w3A=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "21cc704b5e918c5fbf4f9fff22b4ac2681706d90",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-24.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-stable_2": {
       "locked": {
         "lastModified": 1722668055,
         "narHash": "sha256-pZ2gll2YOU27TKw/Nn+aL4uNaJDXW1tC6rGLVejbSjM=",
@@ -507,7 +562,7 @@
         "type": "github"
       }
     },
-    "nixpkgs-stable_2": {
+    "nixpkgs-stable_3": {
       "locked": {
         "lastModified": 1721524707,
         "narHash": "sha256-5NctRsoE54N86nWd0psae70YSLfrOek3Kv1e8KoXe/0=",
@@ -691,8 +746,9 @@
         "flake-utils": "flake-utils",
         "hardware": "hardware",
         "home-manager": "home-manager",
+        "nixos-cosmic": "nixos-cosmic",
         "nixpkgs": "nixpkgs_2",
-        "nixpkgs-stable": "nixpkgs-stable",
+        "nixpkgs-stable": "nixpkgs-stable_2",
         "pfui": "pfui",
         "sops-nix": "sops-nix",
         "xremap-flake": "xremap-flake"
@@ -715,10 +771,31 @@
         "type": "github"
       }
     },
+    "rust-overlay": {
+      "inputs": {
+        "nixpkgs": [
+          "nixos-cosmic",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1723256423,
+        "narHash": "sha256-9iDTrfVM+mbcad31a47oqW8t8tfSA4C/si6F8F2DO/w=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "615cfd85b4d9c51811a8d875374268fab5bd4089",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
     "sops-nix": {
       "inputs": {
         "nixpkgs": "nixpkgs_5",
-        "nixpkgs-stable": "nixpkgs-stable_2"
+        "nixpkgs-stable": "nixpkgs-stable_3"
       },
       "locked": {
         "lastModified": 1722114803,
diff --git a/flake.nix b/flake.nix
index 52658ca..e78b63d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -30,6 +30,11 @@
     dwarffs.url = "github:edolstra/dwarffs";
 
     pfui.url = "github:b3nj5m1n/pfui";
+
+    nixos-cosmic = {
+      url = "github:lilyinstarlight/nixos-cosmic";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = {
@@ -42,6 +47,7 @@
     sops-nix,
     dwarffs,
     pfui,
+    nixos-cosmic,
     ...
   } @ inputs: let
     inherit (self) outputs;
@@ -107,6 +113,13 @@
         # I know it's Adélie
         specialArgs = {inherit inputs outputs;};
         modules = [
+          {
+            nix.settings = {
+              substituters = [ "https://cosmic.cachix.org/" ];
+              trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ];
+            };
+          }
+          nixos-cosmic.nixosModules.default
           # dwarffs.nixosModules.dwarffs
           ./nix/nixos/adelie.nix
           sops-nix.nixosModules.sops
diff --git a/nix/modules/nixos/networking.nix b/nix/modules/nixos/networking.nix
index 30d1278..c9b6dab 100644
--- a/nix/modules/nixos/networking.nix
+++ b/nix/modules/nixos/networking.nix
@@ -21,7 +21,7 @@
       allowedTCPPorts = [22 30021];
     };
     networking.wireless.userControlled.enable = true;
-    networking.wireless.enable = true;
+    # networking.wireless.enable = true;
     networking.wireless.extraConfig = ''
 
     '';
diff --git a/nix/nixos/adelie.nix b/nix/nixos/adelie.nix
index 9d7a2c9..81ff146 100644
--- a/nix/nixos/adelie.nix
+++ b/nix/nixos/adelie.nix
@@ -28,6 +28,8 @@
     ../hardware/x270.nix
   ];
 
+  services.desktopManager.cosmic.enable = true;
+
   nixpkgs = {
     overlays = [
       outputs.overlays.modifications