From a25a6a0cf7e988230d2a321ddf8a8f609d6da64f Mon Sep 17 00:00:00 2001
From: Tao Tien <29749622+taotien@users.noreply.github.com>
Date: Mon, 11 Mar 2024 22:10:35 -0700
Subject: [PATCH] open nvidia module, cosmic is back

---
 extras/cosmic.nix      |   5 +-
 flake.lock             | 119 ++++++++++++++++++++++++++++++++++++++---
 flake.nix              |  14 ++---
 systems/NOcomputer.nix |   1 +
 4 files changed, 124 insertions(+), 15 deletions(-)

diff --git a/extras/cosmic.nix b/extras/cosmic.nix
index 9e4f7f8..39e31be 100644
--- a/extras/cosmic.nix
+++ b/extras/cosmic.nix
@@ -1,4 +1,5 @@
 {...}: {
-  services.xserver.displayManager.cosmic-greeter.enable = false;
-  services.xserver.desktopManager.cosmic.enable = false;
+  services.xserver.displayManager.sddm.enable = false;
+  services.xserver.displayManager.cosmic-greeter.enable = true;
+  services.xserver.desktopManager.cosmic.enable = true;
 }
diff --git a/flake.lock b/flake.lock
index 3e8e6ff..e53e1f7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -21,6 +21,44 @@
         "type": "github"
       }
     },
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1688025799,
+        "narHash": "sha256-ktpB4dRtnksm9F5WawoIkEneh1nrEvuxb5lJFt1iOyw=",
+        "owner": "nix-community",
+        "repo": "flake-compat",
+        "rev": "8bf105319d44f6b9f0d764efa4fdef9f1cc9ba1c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "nixos-cosmic",
+          "nix-update",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1698882062,
+        "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
     "flake-utils": {
       "inputs": {
         "systems": "systems"
@@ -87,11 +125,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1710164657,
-        "narHash": "sha256-l64+ZjaQAVkHDVaK0VHwtXBdjcBD6nLBD+p7IfyBp/w=",
+        "lastModified": 1710281778,
+        "narHash": "sha256-bvWr9vvBrAxb44kHM3H3cY/uQg+4pYP1BM/Nu3e/7V8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "017b12de5b899ef9b64e2c035ce257bfe95b8ae2",
+        "rev": "49a266d2ca59df8a03249550e73a54626181b65d",
         "type": "github"
       },
       "original": {
@@ -109,11 +147,11 @@
         "rust-overlay": "rust-overlay_2"
       },
       "locked": {
-        "lastModified": 1710213958,
-        "narHash": "sha256-4U5pWM9uyybC4RG3OXlFkngYJm6hr9CK3YJPTHYrtHw=",
+        "lastModified": 1710294478,
+        "narHash": "sha256-nFaemf23bgkXE7l+3rjUDv0vUi9NXBpVg5TmNN+MGSE=",
         "owner": "martinvonz",
         "repo": "jj",
-        "rev": "6fd15dc7e52bd0479812cde66a4908c69ae1ff8d",
+        "rev": "17e46e09327c47687189ffce171916e7ddd314e0",
         "type": "github"
       },
       "original": {
@@ -122,6 +160,52 @@
         "type": "github"
       }
     },
+    "nix-update": {
+      "inputs": {
+        "flake-parts": "flake-parts",
+        "nixpkgs": [
+          "nixos-cosmic",
+          "nixpkgs"
+        ],
+        "treefmt-nix": "treefmt-nix"
+      },
+      "locked": {
+        "lastModified": 1709726721,
+        "narHash": "sha256-N0KdNvaWZF2Wn/sQgIpXzXYaYiSQcVxi7P3H/uoSkcg=",
+        "owner": "lilyinstarlight",
+        "repo": "nix-update",
+        "rev": "816d30da62f6a04fcbde8312246204920f73e7ae",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lilyinstarlight",
+        "ref": "tmp/fixed",
+        "repo": "nix-update",
+        "type": "github"
+      }
+    },
+    "nixos-cosmic": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "nix-update": "nix-update",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1710305957,
+        "narHash": "sha256-bEa94jUIZacJfVlYkH3F9+/LpZ9j7wnNJUWt7IHBZ7c=",
+        "owner": "lilyinstarlight",
+        "repo": "nixos-cosmic",
+        "rev": "6f75b673813905ce8b4aca63a5dfc78bb85ddcf7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lilyinstarlight",
+        "repo": "nixos-cosmic",
+        "type": "github"
+      }
+    },
     "nixos-hardware": {
       "locked": {
         "lastModified": 1710123225,
@@ -206,6 +290,7 @@
         "helix": "helix",
         "home-manager": "home-manager",
         "jujutsu": "jujutsu",
+        "nixos-cosmic": "nixos-cosmic",
         "nixos-hardware": "nixos-hardware",
         "nixos-raspberrypi": "nixos-raspberrypi",
         "nixpkgs": "nixpkgs_2"
@@ -290,6 +375,28 @@
         "repo": "default",
         "type": "github"
       }
+    },
+    "treefmt-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "nixos-cosmic",
+          "nix-update",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1698438538,
+        "narHash": "sha256-AWxaKTDL3MtxaVTVU5lYBvSnlspOS0Fjt8GxBgnU0Do=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "5deb8dc125a9f83b65ca86cf0c8167c46593e0b1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 3d4439f..f3c7bdd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -18,10 +18,10 @@
       url = "github:martinvonz/jj";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    # nixos-cosmic = {
-    #   url = "github:lilyinstarlight/nixos-cosmic";
-    #   inputs.nixpkgs.follows = "nixpkgs";
-    # };
+    nixos-cosmic = {
+      url = "github:lilyinstarlight/nixos-cosmic";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     # aagl.url = "github:ezKEa/aagl-gtk-on-nix";
     # aagl.inputs.nixpkgs.follows = "nixpkgs";
 
@@ -43,7 +43,7 @@
     # stylix,
     helix,
     jujutsu,
-    # nixos-cosmic,
+    nixos-cosmic,
     ...
   } @ inputs: {
     nixosConfigurations = {
@@ -61,8 +61,8 @@
           ./extras/uwuraid.nix
           ./extras/dev.nix
           ./extras/gaming.nix
-          # nixos-cosmic.nixosModules.default
-          # ./extras/cosmic.nix
+          nixos-cosmic.nixosModules.default
+          ./extras/cosmic.nix
         ];
       };
       NOlaptop = nixpkgs.lib.nixosSystem {
diff --git a/systems/NOcomputer.nix b/systems/NOcomputer.nix
index 3eb2090..60ee9ee 100644
--- a/systems/NOcomputer.nix
+++ b/systems/NOcomputer.nix
@@ -100,6 +100,7 @@
     powerManagement.enable = true;
     # options: production, beta, vulkan_beta, latest
     package = pkgs.linuxPackages_zen.nvidiaPackages.latest;
+    open = true;
   };
   # enable core and mem freq sliders for nvidia
   services.xserver.deviceSection = ''