From e608eba9e9cd671e60c78dc4d494e9735cc94d48 Mon Sep 17 00:00:00 2001
From: Kopatz <7265381+Kropatz@users.noreply.github.com>
Date: Mon, 19 Aug 2024 15:24:29 +0200
Subject: [PATCH] update ente and enable cosmic

---
 flake.lock                     | 18 +++++++++---------
 modules/graphical/cosmic.nix   |  8 +++-----
 pkgs/ente-frontend/default.nix |  2 +-
 systems/pc/configuration.nix   |  2 +-
 4 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/flake.lock b/flake.lock
index b245ad6..a92c278 100644
--- a/flake.lock
+++ b/flake.lock
@@ -729,11 +729,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1722913682,
-        "narHash": "sha256-7KX4YDBpWJFtoWGA/rSRGoc7PfOyshrmyxlhSM2ApAw=",
+        "lastModified": 1723858482,
+        "narHash": "sha256-ibjVgJIcWDRr8NBHDoa0jgi/nVT7l/yQx6EJmwa5FIk=",
         "owner": "lilyinstarlight",
         "repo": "nixos-cosmic",
-        "rev": "b32bb5899e83d45a8f518cc6b8c8fb28ed104f8b",
+        "rev": "cb56227f6aa62646b2d77a292144c921a4b10d4f",
         "type": "github"
       },
       "original": {
@@ -813,11 +813,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1722791413,
-        "narHash": "sha256-rCTrlCWvHzMCNcKxPE3Z/mMK2gDZ+BvvpEVyRM4tKmU=",
+        "lastModified": 1723688146,
+        "narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8b5b6723aca5a51edf075936439d9cd3947b7b2c",
+        "rev": "c3d4ac725177c030b1e289015989da2ad9d56af0",
         "type": "github"
       },
       "original": {
@@ -937,11 +937,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1722824458,
-        "narHash": "sha256-2k3/geD5Yh8JT1nrGaRycje5kB0DkvQA/OUZoel1bIU=",
+        "lastModified": 1723774846,
+        "narHash": "sha256-m53hVat6XXiKooV1oUDEMnPcdNKqSn/kAW+g8juSq84=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "a8a937c304e62a5098c6276c9cdf65c19a43b1a5",
+        "rev": "519f4892641bc04a6ac7c2d260cc68356f9ae90f",
         "type": "github"
       },
       "original": {
diff --git a/modules/graphical/cosmic.nix b/modules/graphical/cosmic.nix
index e7aa9e4..0541b1d 100644
--- a/modules/graphical/cosmic.nix
+++ b/modules/graphical/cosmic.nix
@@ -1,21 +1,19 @@
 { config, pkgs, inputs, lib, ... }:
-with lib;
 let
   cfg = config.custom.graphical.cosmic;
 in
 {
   options.custom.graphical.cosmic = {
-    enable = mkEnableOption "Enables cosmic";
+    enable = lib.mkEnableOption "Enables cosmic";
   };
   
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     nix.settings = {
       substituters = [ "https://cosmic.cachix.org/" ];
       trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ];
     };
-    boot.kernelParams = [ "nvidia_drm.fbdev=1" ];
     services.desktopManager.cosmic.enable = true;
-    services.displayManager.cosmic-greeter.enable = true;
+    services.displayManager.cosmic-greeter.enable = if (config.custom.graphical.sddm.enable == false) then true else false;
   };
 }
 
diff --git a/pkgs/ente-frontend/default.nix b/pkgs/ente-frontend/default.nix
index 336872e..454ab45 100644
--- a/pkgs/ente-frontend/default.nix
+++ b/pkgs/ente-frontend/default.nix
@@ -7,7 +7,7 @@ buildNpmPackage rec {
   src = "${(fetchGit {
     url = "git@github.com:oberprofis/ente.git";
     ref = "master";
-    rev = "9a3545396fded13006fe804b2e75020ad65b9eaf";
+    rev = "336db364d0a16f8a64abf309f3f1dede6caab2f2";
   })}/website/tracker-site";
   npmDepsHash = "sha256-pNU7Y/73iltMSzGbQwUZWdD7GbIToXMFR5y763Bi50o=";
 
diff --git a/systems/pc/configuration.nix b/systems/pc/configuration.nix
index 434d031..436ae99 100644
--- a/systems/pc/configuration.nix
+++ b/systems/pc/configuration.nix
@@ -66,7 +66,7 @@
       i3.enable = true;
       hyprland.enable = true;
       #gnome.enable = true;
-      #cosmic.enable = true;
+      cosmic.enable = true;
       shared.enable = true;
       stylix.enable = true;
     };