From 6dbe355f7223c3f2c3a8baca3bd795041c678d68 Mon Sep 17 00:00:00 2001
From: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
Date: Thu, 20 Jul 2023 10:36:26 +0800
Subject: [PATCH] fenix

---
 flake.lock | 74 ++++++++++++++++++++++++++++++++++++------------------
 flake.nix  | 65 +++++++++++++++++++++++++++++++++--------------
 2 files changed, 96 insertions(+), 43 deletions(-)

diff --git a/flake.lock b/flake.lock
index e5c27f1..ebb4391 100644
--- a/flake.lock
+++ b/flake.lock
@@ -49,7 +49,9 @@
     "catppuccin": {
       "inputs": {
         "flake-compat": "flake-compat_2",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1689265071,
@@ -117,6 +119,27 @@
         "type": "github"
       }
     },
+    "fenix": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "rust-analyzer-src": "rust-analyzer-src"
+      },
+      "locked": {
+        "lastModified": 1689747703,
+        "narHash": "sha256-abwTXTz2u2P32fN9XRQKV+TUkcRZDfNIQ73mq9fyTxg=",
+        "owner": "nix-community",
+        "repo": "fenix",
+        "rev": "5e70fbab6c431bd8454d336ef06ef609f4d6e6f3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "fenix",
+        "type": "github"
+      }
+    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -227,17 +250,18 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1685655444,
-        "narHash": "sha256-6EujQNAeaUkWvpEZZcVF8qSfQrNVWFNNGbUJxv/A5a8=",
+        "lastModified": 1689631193,
+        "narHash": "sha256-AGSkBZaiTODQc8eT1rZDrQIjtb8JtFwJ0wVPzArlrnM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e635192892f5abbc2289eaac3a73cdb249abaefd",
+        "rev": "57695599bdc4f7bfe5d28cfa23f14b3d8bdf8a5f",
         "type": "github"
       },
       "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-unstable",
-        "type": "indirect"
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
       }
     },
     "nixpkgs-stable": {
@@ -256,30 +280,32 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1689631193,
-        "narHash": "sha256-AGSkBZaiTODQc8eT1rZDrQIjtb8JtFwJ0wVPzArlrnM=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "57695599bdc4f7bfe5d28cfa23f14b3d8bdf8a5f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "agenix": "agenix",
         "attic": "attic",
         "catppuccin": "catppuccin",
+        "fenix": "fenix",
         "home-manager": "home-manager_2",
         "nix-darwin": "nix-darwin",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs"
+      }
+    },
+    "rust-analyzer-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1689689012,
+        "narHash": "sha256-zC4p3/A34hio7uEAHlewOmSZkBWSKReSpplVuVHPrwo=",
+        "owner": "rust-lang",
+        "repo": "rust-analyzer",
+        "rev": "3759c41d3c6966eb3aa18ad5916c0da65ff19641",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rust-lang",
+        "ref": "nightly",
+        "repo": "rust-analyzer",
+        "type": "github"
       }
     },
     "rust-overlay": {
diff --git a/flake.nix b/flake.nix
index a83f082..c3d845d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,19 +3,35 @@
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
-    nix-darwin.url = "github:LnL7/nix-darwin";
-    nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
+    nix-darwin = {
+      url = "github:LnL7/nix-darwin";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
-    home-manager.url = "github:nix-community/home-manager";
-    home-manager.inputs.nixpkgs.follows = "nixpkgs";
+    home-manager = {
+      url = "github:nix-community/home-manager";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
-    attic.url = "github:zhaofengli/attic";
-    attic.inputs.nixpkgs.follows = "nixpkgs";
+    attic = {
+      url = "github:zhaofengli/attic";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
-    agenix.url = "github:ryantm/agenix";
-    agenix.inputs.nixpkgs.follows = "nixpkgs";
+    agenix = {
+      url = "github:ryantm/agenix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
-    catppuccin.url = "github:Stonks3141/ctp-nix";
+    fenix = {
+      url = "github:nix-community/fenix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    catppuccin = {
+      url = "github:Stonks3141/ctp-nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = {
@@ -23,6 +39,7 @@
     nix-darwin,
     home-manager,
     agenix,
+    fenix,
     attic,
     catppuccin,
     ...
@@ -32,18 +49,24 @@
         nil
         alejandra
         attic-client
-        exa
+        cachix
+        direnv
+
+        fenix.packages.${system}.stable.defaultToolchain
+        ccache
+        ccacheWrapper
+        deno
+        fnm
+        go
+        bun
+
         pkgs."_1password"
         age
         pkgs.agenix
         asciinema
         bat
         btop
-        ccache
-        ccacheWrapper
         cloudflared
-        deno
-        direnv
         doggo
         doppler
         du-dust
@@ -53,9 +76,7 @@
         ffmpeg
         fish
         flyctl
-        fnm
         fzf
-        go
         gh
         git
         git-lfs
@@ -68,7 +89,6 @@
         mkcert
         nerdfix
         opencv
-        bun
         pipx
         pscale
         pyenv
@@ -78,7 +98,6 @@
         starship
         tealdeer
         tokei
-        # ttfautohint
         vhs
         vivid
         xh
@@ -94,13 +113,22 @@
         trusted-users = ["ryanccn"];
         auto-optimise-store = true;
         extra-platforms = ["x86_64-darwin" "aarch64-darwin"];
+
         extra-sandbox-paths = ["/nix/var/cache/ccache"];
+
+        extra-substituters = [
+          "https://nix-community.cachix.org"
+        ];
+        extra-trusted-public-keys = [
+          "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+        ];
       };
 
       nixpkgs = {
         overlays = [
           attic.overlays.default
           agenix.overlays.default
+          fenix.overlays.default
           (import ./overlays/ccache-wrapper.nix)
         ];
 
@@ -132,7 +160,6 @@
             agenixModule = agenix.homeManagerModules.age;
             ctpModule = catppuccin.homeManagerModules.catppuccin;
           };
-          nixpkgs.overlays = [attic.overlays.default];
 
           users.users.ryanccn.home = "/Users/ryanccn";
           home-manager.users.ryanccn = import ./home.nix;