add brave catppuccin theme, switch to newer cosmic comp release

Author: kasper-nil

environments/cosmic/home-manager/catppuccin.nix

@@ -25,6 +25,8 @@ in
       force = true;
     };
 
+    brave.enable = true;
+
     cursors.enable = true;
 
     zsh-syntax-highlighting.enable = true;

environments/cosmic/home-manager/home.nix

@@ -16,7 +16,6 @@ in
       libreoffice
       gearlever
       bottles
-      brave
       fastfetch
       lutris
       tmux

environments/cosmic/home-manager/programs/default.nix

@@ -13,5 +13,6 @@ in
 
   programs = lib.mkIf cfg.enable {
     firefox.enable = true;
+    brave.enable = true;
   };
 }

environments/cosmic/modules/nixpkgs.nix

@@ -9,35 +9,35 @@ in
 {
   nixpkgs = lib.mkIf cfg.enable {
     overlays = [
-      # (final: prev: {
-      #   cosmic-comp = prev.cosmic-comp.overrideAttrs (
-      #     old:
-      #     let
-      #       rev = "15b6b678c1303b6ace3af47d21abb2df1d583824"; # full commit
-      #       newSrc = prev.fetchFromGitHub {
-      #         owner = "pop-os";
-      #         repo = "cosmic-comp";
-      #         rev = rev;
-      #         hash = "sha256-ZDer2a1qYFmIEDbH8eZ18AFyvPoG/g6eLvKCpSZ4Wkc=";
-      #       };
-      #     in
-      #     {
-      #       src = newSrc;
-      #       version = "git-${builtins.substring 0 8 rev}";
+      (final: prev: {
+        cosmic-comp = prev.cosmic-comp.overrideAttrs (
+          old:
+          let
+            rev = "4adb07443a4ba472bfa3ffebdb719949c72fa644"; # full commit
+            newSrc = prev.fetchFromGitHub {
+              owner = "pop-os";
+              repo = "cosmic-comp";
+              rev = rev;
+              hash = "sha256-ZDer2a1qYFmIEDbH8eZ18AFyvPoG/g6eLvKCpSZ4Wkc=";
+            };
+          in
+          {
+            src = newSrc;
+            version = "git-${builtins.substring 0 8 rev}";
 
-      #       # This is the crucial part: make cargoDeps correspond to the new src
-      #       cargoDeps = prev.rustPlatform.fetchCargoVendor {
-      #         src = newSrc;
-      #         # empty => Nix will print the correct hash to paste back
-      #         hash = "sha256-1NwI2vQpfQ8y/cVJGA+vYkiB+bAsVgZCb114A0yfWho=";
-      #       };
+            # This is the crucial part: make cargoDeps correspond to the new src
+            cargoDeps = prev.rustPlatform.fetchCargoVendor {
+              src = newSrc;
+              # empty => Nix will print the correct hash to paste back
+              hash = "sha256-1NwI2vQpfQ8y/cVJGA+vYkiB+bAsVgZCb114A0yfWho=";
+            };
 
-      #       # Some packages use cargoDeps + dont need cargoHash at all,
-      #       # but setting it doesn't hurt if the derivation reads it:
-      #       cargoHash = "";
-      #     }
-      #   );
-      # })
+            # Some packages use cargoDeps + dont need cargoHash at all,
+            # but setting it doesn't hurt if the derivation reads it:
+            cargoHash = "";
+          }
+        );
+      })
     ];
   };
 }