feat(nix): using nix (CLI) from master branch

r17x · Oct 17, 2024 · 693d104 · 693d104
1 parent 056c776
commit 693d104
Show file tree

Hide file tree

Showing 4 changed files with 106 additions and 5 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -25,6 +25,9 @@
     nixpkgs-stable.url = "github:NixOS/nixpkgs/release-24.05";
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
     nixpkgs.follows = "nixpkgs-unstable";
+    ### -- nix related tools
+    nixd.url = "github:nix-community/nixd";
+    nixd.inputs.nixpkgs.follows = "nixpkgs";
 
     ## -- Languages
     ocaml-overlay.url = "github:nix-ocaml/nix-overlays";

diff --git a/nix/default.nix b/nix/default.nix
@@ -23,6 +23,7 @@
         let
           overlays = [
             inputs.ocaml-overlay.overlays.default
+            inputs.nixd.overlays.default
           ] ++ lib.attrValues self.overlays;
         in
         rec {
@@ -33,7 +34,7 @@
               inherit (pkgs) stdenv;
             }
             // {
-              package = branches.stable.nix;
+              package = branches.master.nix;
             };
 
           pkgs = import inputs.nixpkgs {

diff --git a/nix/overlays/default.nix b/nix/overlays/default.nix
@@ -27,6 +27,7 @@
     });
 
     nixfmt = prev.nixfmt-rfc-style;
+
     sketchybar-app-font = prev.stdenv.mkDerivation {
       name = "sketchybar-app-font";
       src = inputs.sketchybar-app-font;