From b137e67641f80cec07b5e83a6115dfaa28451ac9 Mon Sep 17 00:00:00 2001 From: Gerg-L Date: Tue, 7 Mar 2023 21:17:33 -0500 Subject: [PATCH] switched to nix unstable --- flake.lock | 83 +++++-------------------------------------------- flake.nix | 3 -- modules/nix.nix | 3 +- 3 files changed, 9 insertions(+), 80 deletions(-) diff --git a/flake.lock b/flake.lock index 47756c5..353ebe8 100644 --- a/flake.lock +++ b/flake.lock @@ -97,22 +97,6 @@ "type": "github" } }, - "lowdown-src": { - "flake": false, - "locked": { - "lastModified": 1633514407, - "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", - "type": "github" - }, - "original": { - "owner": "kristapsdz", - "repo": "lowdown", - "type": "github" - } - }, "master": { "locked": { "lastModified": 1678156552, @@ -157,7 +141,7 @@ "inputs": { "flake-compat": "flake-compat", "neovim-flake": "neovim-flake", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1676103239, @@ -173,26 +157,6 @@ "type": "github" } }, - "nix": { - "inputs": { - "lowdown-src": "lowdown-src", - "nixpkgs": "nixpkgs", - "nixpkgs-regression": "nixpkgs-regression" - }, - "locked": { - "lastModified": 1678111327, - "narHash": "sha256-KtJElK62t5jjSuCefvZhUKVh1EjlELfzXxw0ruwZMp8=", - "owner": "NixOS", - "repo": "nix", - "rev": "02bf5219685fcbd762188fa39946495293e6ce5f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nix", - "type": "github" - } - }, "nixlib": { "locked": { "lastModified": 1677373009, @@ -231,36 +195,20 @@ }, "nixpkgs": { "locked": { - "lastModified": 1670461440, - "narHash": "sha256-jy1LB8HOMKGJEGXgzFRLDU1CBGL0/LlkolgnqIsF0D8=", - "owner": "NixOS", + "lastModified": 1671983799, + "narHash": "sha256-Z2Ro6hFPZHkBqkVXY5/aBUzxi5xizQGvuHQ9+T5B/ks=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "04a75b2eecc0acf6239acf9dd04485ff8d14f425", + "rev": "fad51abd42ca17a60fc1d4cb9382e2d79ae31836", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-22.11-small", + "owner": "nixos", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-regression": { - "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - } - }, "nixpkgs-stable": { "locked": { "lastModified": 1677948530, @@ -277,22 +225,6 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1671983799, - "narHash": "sha256-Z2Ro6hFPZHkBqkVXY5/aBUzxi5xizQGvuHQ9+T5B/ks=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "fad51abd42ca17a60fc1d4cb9382e2d79ae31836", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nvim-flake": { "inputs": { "flake-utils": "flake-utils_3", @@ -320,7 +252,6 @@ "fetch-rs": "fetch-rs", "flake-utils": "flake-utils_2", "master": "master", - "nix": "nix", "nixos-generators": "nixos-generators", "nvim-flake": "nvim-flake", "sops-nix": "sops-nix", diff --git a/flake.nix b/flake.nix index d83c68b..35137e8 100644 --- a/flake.nix +++ b/flake.nix @@ -16,9 +16,6 @@ inputs.nixpkgs.follows = "unstable"; }; - #master branch of nix - nix.url = "github:NixOS/nix"; - #the-argus is awesome spicetify-nix = { url = "github:the-argus/spicetify-nix"; diff --git a/modules/nix.nix b/modules/nix.nix index 06d5b83..6108f9f 100644 --- a/modules/nix.nix +++ b/modules/nix.nix @@ -1,11 +1,12 @@ inputs: { lib, + pkgs, self, settings, ... }: { nix = { - # package = nix.packages.${pkgs.system}.nix; + package = pkgs.nixVersions.unstable; #automatically get registry from input flakes registry = ( lib.attrsets.mapAttrs (