From dc1627fe5efe5f487f99ed186454853978f06605 Mon Sep 17 00:00:00 2001
From: thiloho <123883702+thiloho@users.noreply.github.com>
Date: Thu, 7 Sep 2023 17:21:34 +0200
Subject: [PATCH] Update flake

---
 flake.lock                              | 93 +++++++++++++++++++++++--
 flake.nix                               |  1 +
 nixos-configurations/shared-desktop.nix | 11 +--
 3 files changed, 96 insertions(+), 9 deletions(-)

diff --git a/flake.lock b/flake.lock
index ffa1e5c..4a2b032 100644
--- a/flake.lock
+++ b/flake.lock
@@ -18,6 +18,58 @@
         "type": "github"
       }
     },
+    "cachix": {
+      "locked": {
+        "lastModified": 1635350005,
+        "narHash": "sha256-tAMJnUwfaDEB2aa31jGcu7R7bzGELM9noc91L2PbVjg=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "1c1f5649bb9c1b0d98637c8c365228f57126f361",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-20.09",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "firefox": {
+      "inputs": {
+        "cachix": "cachix",
+        "flake-compat": "flake-compat",
+        "mozilla": "mozilla",
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "lastModified": 1693917765,
+        "narHash": "sha256-LtNhYwnIrp9UuSxv3AnYdOwGqypTYkW+20bdzCfzMdI=",
+        "owner": "colemickens",
+        "repo": "flake-firefox-nightly",
+        "rev": "131d2f932ced539afdb2390d6245f5c62d31e26d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "colemickens",
+        "repo": "flake-firefox-nightly",
+        "type": "github"
+      }
+    },
+    "flake-compat": {
+      "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"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -38,6 +90,22 @@
         "type": "github"
       }
     },
+    "mozilla": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1690536331,
+        "narHash": "sha256-aRIf2FB2GTdfF7gl13WyETmiV/J7EhBGkSWXfZvlxcA=",
+        "owner": "mozilla",
+        "repo": "nixpkgs-mozilla",
+        "rev": "db89c8707edcffefcd8e738459d511543a339ff5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "mozilla",
+        "repo": "nixpkgs-mozilla",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1684787197,
@@ -69,22 +137,39 @@
         "type": "github"
       }
     },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1693663421,
+        "narHash": "sha256-ImMIlWE/idjcZAfxKK8sQA7A1Gi/O58u5/CJA+mxvl8=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "e56990880811a451abd32515698c712788be5720",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "aurora-blog-template": "aurora-blog-template",
+        "firefox": "firefox",
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs_3",
         "website": "website"
       }
     },
     "website": {
       "flake": false,
       "locked": {
-        "lastModified": 1692298405,
-        "narHash": "sha256-LhBchuvoeRMnWxJaP0T03FhzODPzBOK92w/KwcZtSYc=",
+        "lastModified": 1693764772,
+        "narHash": "sha256-lTRGYpgNXPsPn28FxI0hnOQLpnZlrGmxxw/NDra9dQs=",
         "owner": "thiloho",
         "repo": "website",
-        "rev": "25346de32ae7a4c740e67acba2c99d46d004ed18",
+        "rev": "19a36679d16edbce818e8c1160f50e84824c9df2",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index c472c1b..14e0624 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,6 +12,7 @@
       flake = false;
     };
     aurora-blog-template.url = "github:thiloho/aurora";
+    firefox.url = "github:colemickens/flake-firefox-nightly";
   };
 
   outputs = inputs@{ nixpkgs, home-manager, ... }: {
diff --git a/nixos-configurations/shared-desktop.nix b/nixos-configurations/shared-desktop.nix
index af93d20..850dfca 100644
--- a/nixos-configurations/shared-desktop.nix
+++ b/nixos-configurations/shared-desktop.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ inputs, ... }:
 
 {
   services = {
@@ -31,10 +31,10 @@
 
   home-manager.users.thiloho = { pkgs, lib, config, ... }: {
     programs = {
-      firefox = {
-        enable = true;
-        package = pkgs.firefox-devedition;
-      };
+      # firefox = {
+      #   enable = true;
+      #   package = pkgs.firefox-devedition;
+      # };
       chromium = {
         enable = true;
         extensions = [
@@ -85,6 +85,7 @@
         teamspeak5_client
         discord
         qbittorrent
+        inputs.firefox.packages.${pkgs.system}.firefox-nightly-bin
       ];
     };
   };