From a144480acd31890a51129b29f62912ba220bf4ea Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Fri, 12 Nov 2021 09:52:52 +0100 Subject: [PATCH] Update dependencies --- flake.lock | 22 +++++++++++----------- flake.nix | 4 ++-- modules/base/nix/default.nix | 5 ----- 3 files changed, 13 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index d6b1bb05..77e90d71 100644 --- a/flake.lock +++ b/flake.lock @@ -42,11 +42,11 @@ }, "emacs-overlay": { "locked": { - "lastModified": 1636478422, - "narHash": "sha256-HvuQabo0MjPudk6Un73Fr49s42JIYaoptzsJ4pTmRBA=", + "lastModified": 1636681505, + "narHash": "sha256-yzNMND5Gf1jZHGTbI8xYC8l0FXAQIlafg9dYrrE6bGc=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "5dbb662e9ba260eb9c0d83b8dce11a2b6d8a4831", + "rev": "209234286d219ca9990707a1f2377e731048bbd2", "type": "github" }, "original": { @@ -92,16 +92,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1636267212, - "narHash": "sha256-KDS173KqmqrYUPY9N4vf750GxIo+S6E0djyq2BsQm8s=", + "lastModified": 1636678824, + "narHash": "sha256-NDB9CenPn5z2xbmG/X+Mg6Jd8iUEf7dfprQfXxSD6X8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c935f5e0add2cf0ae650d072c8357533e21b0c35", + "rev": "bf346b557b76ffce74167f37752656dede5957f3", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixos-unstable-small", "repo": "nixpkgs", "type": "github" } @@ -121,16 +121,16 @@ "flake-utils": "flake-utils" }, "locked": { - "lastModified": 1630860081, - "narHash": "sha256-hGkbmh9eCGpj/6kMSnaU02U6HDfUkDgZqB5nm26OPX4=", + "lastModified": 1630860118, + "narHash": "sha256-JwLcC/zRR6ypk4/Ks7plWBvThYoLhURaH2zvjuWVmyA=", "owner": "gytis-ivaskevicius", "repo": "flake-utils-plus", - "rev": "231acaa2cb0fc83d294f8f04352f87f9caa2b14a", + "rev": "813281281363ec45af155c8d2ceb7c5132d4de45", "type": "github" }, "original": { "owner": "gytis-ivaskevicius", - "ref": "1.2.0", + "ref": "1.3.0", "repo": "flake-utils-plus", "type": "github" } diff --git a/flake.nix b/flake.nix index 10e8b296..61aef686 100644 --- a/flake.nix +++ b/flake.nix @@ -15,8 +15,8 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - utils.url = "github:gytis-ivaskevicius/flake-utils-plus/1.2.0"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable-small"; + utils.url = "github:gytis-ivaskevicius/flake-utils-plus/1.3.0"; }; outputs = inputs@{ self, nixpkgs, accentor, agenix, emacs-overlay, home-manager, utils }: diff --git a/modules/base/nix/default.nix b/modules/base/nix/default.nix index dbf69589..fec8e17e 100644 --- a/modules/base/nix/default.nix +++ b/modules/base/nix/default.nix @@ -99,11 +99,6 @@ in }; nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) config.chvp.base.nix.unfreePackages; - nixpkgs.overlays = [ - (self: super: { - nix = super.nix_2_4; - }) - ]; home-manager.users.charlotte = { ... }: lib.recursiveUpdate