From 1f45209acb2757e1ca2868b6772838da8a8a420d Mon Sep 17 00:00:00 2001 From: Xe Date: Sun, 3 Jul 2022 12:39:45 +0000 Subject: [PATCH] use vim 9 Signed-off-by: Xe --- flake.lock | 16 ++++++++++++++++ flake.nix | 9 +++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/flake.lock b/flake.lock index 29b0e36..04a009f 100644 --- a/flake.lock +++ b/flake.lock @@ -267,6 +267,21 @@ "type": "github" } }, + "nixpkgs-master": { + "locked": { + "lastModified": 1656851669, + "narHash": "sha256-PA3tWTz372vExgjxvbHV2xdCFOJx3XHcR77/kPF8jbA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9cd6911860e620e45da58b098703876d950f4e38", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "master", + "type": "indirect" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1648219316, @@ -482,6 +497,7 @@ "home-manager": "home-manager", "mara": "mara", "nixpkgs": "nixpkgs_5", + "nixpkgs-master": "nixpkgs-master", "printerfacts": "printerfacts", "rhea": "rhea", "utils": "utils_4", diff --git a/flake.nix b/flake.nix index a3675d1..a0b0d6a 100644 --- a/flake.nix +++ b/flake.nix @@ -8,6 +8,7 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; utils.url = "github:numtide/flake-utils"; emacs-overlay.url = "github:nix-community/emacs-overlay"; + nixpkgs-master.url = "nixpkgs/master"; wsl = { url = "github:nix-community/NixOS-WSL"; @@ -43,9 +44,10 @@ }; outputs = { self, nixpkgs, deploy-rs, home-manager, agenix, printerfacts, mara - , rhea, waifud, emacs-overlay, wsl, x, ... }: + , rhea, waifud, emacs-overlay, wsl, x, nixpkgs-master, ... }: let pkgs = nixpkgs.legacyPackages."x86_64-linux"; + pkgsMaster = nixpkgs-master.legacyPackages."x86_64-linux"; mkSystem = extraModules: nixpkgs.lib.nixosSystem rec { @@ -61,7 +63,9 @@ home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - nixpkgs.overlays = [ emacs-overlay.overlay ]; + nixpkgs.overlays = [ + emacs-overlay.overlay + ]; }) ./common @@ -77,6 +81,7 @@ buildInputs = [ deploy-rs.packages.x86_64-linux.deploy-rs agenix.packages.x86_64-linux.agenix + pkgsMaster.vim ]; };