From e08a63224eb5ab147f5772fbedacf612ecd07267 Mon Sep 17 00:00:00 2001 From: Daniel Kempkens Date: Tue, 14 Dec 2021 20:34:31 +0100 Subject: [PATCH] Add custom overlay --- flake.lock | 67 +++++++++++++++++++++++++++++++++++++++++------------- flake.nix | 4 ++++ home.nix | 1 + 3 files changed, 56 insertions(+), 16 deletions(-) diff --git a/flake.lock b/flake.lock index 32695db..98534c2 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ ] }, "locked": { - "lastModified": 1639329010, - "narHash": "sha256-k9OXwR06419/s0FAnRalUs24+8EI6GepGaatAXhBc+0=", + "lastModified": 1639504434, + "narHash": "sha256-QUsa52u5s0bjQeP55f7xz4y51jIA0RlXmpn0FwFb1Dg=", "owner": "nix-community", "repo": "home-manager", - "rev": "3d46c011d2cc2c9ca24d9b803e9daf156d9429ea", + "rev": "3d9eb1cecd3f2d9f96c60bf9f78899fe54291e9f", "type": "github" }, "original": { @@ -61,11 +61,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1639307139, - "narHash": "sha256-NqODk+iSvC5+d7YiF8wBmG4kJLxnOw3ACg1QQsBnZLs=", + "lastModified": 1639406162, + "narHash": "sha256-jxGDDMB51uJMb2OqRd3maWDjE4pdO1YrnvFNCxktZzQ=", "owner": "neovim", "repo": "neovim", - "rev": "1f3c0593eb1d4e54ce1edf35da67d184807a9280", + "rev": "f37c5f180a12d0f3a36a8f10ca6719c6f1eb0d49", "type": "github" }, "original": { @@ -82,11 +82,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1639383249, - "narHash": "sha256-fbJwXCA+IfqhPhlvtJoXFsOUjfLi3X7cJQgACxmIiz0=", + "lastModified": 1639469681, + "narHash": "sha256-t0NBhfqoXIPIeVBgNFKqT58yktC7yuOBdnL7xlefM6Q=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "cfe0badfe14533bff914a55a1871f4a962609664", + "rev": "6ac65995bbfeab184c36c427eec9b4df068d9940", "type": "github" }, "original": { @@ -95,13 +95,31 @@ "type": "github" } }, + "nifoc-overlay": { + "inputs": { + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1639505561, + "narHash": "sha256-HPZ7UoWXoOXug+FlR+WcD7JKUuY9gV74yGvTAuCHH4U=", + "owner": "nifoc", + "repo": "nix-overlay", + "rev": "600e4c59ca6ca1e75a63bf743e00dbe412a9ae9d", + "type": "github" + }, + "original": { + "owner": "nifoc", + "repo": "nix-overlay", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1639256808, - "narHash": "sha256-RRKWi6grwe5lioKUyfZNQ4ojc5kjUTX55fPNzsGH2PY=", + "lastModified": 1639347265, + "narHash": "sha256-q5feWoC64+h6T6J89o2HJJ8DOnB/4vwMODBlZIgeIlA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e675946ecde5606c505540de2024e2732bae4185", + "rev": "b0bf5f888d377dd2f36d90340df6dc9f035aaada", "type": "github" }, "original": { @@ -113,11 +131,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1639357775, - "narHash": "sha256-mJJFCPqZi1ZO3CvgEfN2nFAYv4uAJSRnTKzLFi61+WA=", + "lastModified": 1639442420, + "narHash": "sha256-GL4Q5gDXDHxLPZD1Rg8kk6M6S+NqxDjTu0XqGF/Xhuc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "69958994ab2c4c41f82db658ae6333b91079bcf6", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1639442420, + "narHash": "sha256-GL4Q5gDXDHxLPZD1Rg8kk6M6S+NqxDjTu0XqGF/Xhuc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c473cc8714710179df205b153f4e9fa007107ff9", + "rev": "69958994ab2c4c41f82db658ae6333b91079bcf6", "type": "github" }, "original": { @@ -131,7 +165,8 @@ "inputs": { "home-manager": "home-manager", "neovim-nightly-overlay": "neovim-nightly-overlay", - "nixpkgs": "nixpkgs_2" + "nifoc-overlay": "nifoc-overlay", + "nixpkgs": "nixpkgs_3" } } }, diff --git a/flake.nix b/flake.nix index 5677efd..dc0ebd0 100644 --- a/flake.nix +++ b/flake.nix @@ -8,6 +8,8 @@ }; neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay"; + + nifoc-overlay.url = "github:nifoc/nix-overlay"; }; outputs = inputs@{ self, nixpkgs, home-manager, ... }: { @@ -21,11 +23,13 @@ configuration = { config, pkgs, ... }: let overlay-neovim = inputs.neovim-nightly-overlay.overlay; + overlay-nifoc = inputs.nifoc-overlay.overlay; in { nixpkgs = { overlays = [ overlay-neovim + overlay-nifoc ]; config = { diff --git a/home.nix b/home.nix index 64429c7..34b1a3c 100644 --- a/home.nix +++ b/home.nix @@ -23,6 +23,7 @@ arp-scan atomicparsley cachix + cliclick dogdns exa fd