From 388cadf0bd26516279c64a13cf6c0a19b0843d02 Mon Sep 17 00:00:00 2001 From: Daryl Ronningen Date: Wed, 19 Apr 2023 21:55:49 -0700 Subject: [PATCH] update flake lock & update inputs --- flake.lock | 54 +++++++++++++++++------------------------------------- flake.nix | 9 +++------ 2 files changed, 20 insertions(+), 43 deletions(-) diff --git a/flake.lock b/flake.lock index d5c2171..013c6c8 100644 --- a/flake.lock +++ b/flake.lock @@ -78,17 +78,14 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ], - "utils": [ - "utils" ] }, "locked": { - "lastModified": 1681250798, - "narHash": "sha256-fQMROyKzPFBPqJy9J4ffywm02ZuqAI0GW1O1QibVpdQ=", + "lastModified": 1681971090, + "narHash": "sha256-3j0M63GkG6GGny9e+C//GyuDCx1IwrurD27S0YI+GQY=", "owner": "nix-community", "repo": "home-manager", - "rev": "28698126bd825aff21cae9ffd15cf83e169051b0", + "rev": "5160039edca28a7e66bad0cfc72a07c91d6768ad", "type": "github" }, "original": { @@ -103,16 +100,16 @@ "utils" ], "nixpkgs": [ - "nixpkgs-stable" + "nixpkgs" ] }, "locked": { "dir": "contrib", - "lastModified": 1681335536, - "narHash": "sha256-Sis0j5szDjNfciFYBfjs97X9o8KMPLsSl+aNAeVE/oE=", + "lastModified": 1681953453, + "narHash": "sha256-l2Nh6qN3u77m4cwSQvcEELiNos36YOvCTym2MHehnQE=", "owner": "neovim", "repo": "neovim", - "rev": "5ccec143d808239bff1b6ea9da79d61cedbb094a", + "rev": "dbcd1985d13b02ab7a547d0b97d4ede28fa49b96", "type": "github" }, "original": { @@ -197,11 +194,11 @@ ] }, "locked": { - "lastModified": 1681203783, - "narHash": "sha256-/eIhuviU+vpZJTHpu4G29fBpMaVQthC/Ov2M6eGwvQM=", + "lastModified": 1681581389, + "narHash": "sha256-+ygySqlQy0ejwE1aOF6i6Tiu63V0jxXik0aLlvmqioo=", "owner": "nix-community", "repo": "nixos-wsl", - "rev": "3957b46e3177ef62c7fbfd809782e2a321b6ca64", + "rev": "f3b6f6b04728416c64fc5ef52199fd9b9843c47d", "type": "github" }, "original": { @@ -212,16 +209,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1681344129, - "narHash": "sha256-yWcG5CQtURlr+Za+yp8jh7Ny42NFlJQJBt05IHoz/4c=", + "lastModified": 1681753173, + "narHash": "sha256-MrGmzZWLUqh2VstoikKLFFIELXm/lsf/G9U9zR96VD4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1b2977bfcdc89f99a84ffab1457936191ca509cc", + "rev": "0a4206a51b386e5cda731e8ac78d76ad924c7125", "type": "github" }, "original": { "owner": "nixos", - "ref": "staging-next", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -242,22 +239,6 @@ "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1681154110, - "narHash": "sha256-OQwWzlzAY1dCqgSsgZzsPIOGmX4pBGaoXOy0rSl4b5Y=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "115a96e2ac1e92937cd47c30e073e16dcaaf6247", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-22.11", - "repo": "nixpkgs", - "type": "github" - } - }, "nmd": { "flake": false, "locked": { @@ -308,11 +289,11 @@ }, "nur": { "locked": { - "lastModified": 1681359126, - "narHash": "sha256-aL0iTn1R32h0Xq46xHfHT3WfChi74A1evXQegRnGycg=", + "lastModified": 1681971746, + "narHash": "sha256-afyqFjo0xCzwhkf7P7/NPwBjJ1VXK8dVhXxDGytDxoI=", "owner": "nix-community", "repo": "NUR", - "rev": "35b1aab59c4e79fd2cd02ffd3c67689bfa5a24d2", + "rev": "1fd420e869c3458c36115618786e8979b90c6254", "type": "github" }, "original": { @@ -330,7 +311,6 @@ "nixos-hardware": "nixos-hardware", "nixos-wsl": "nixos-wsl", "nixpkgs": "nixpkgs", - "nixpkgs-stable": "nixpkgs-stable", "nur": "nur", "utils": "utils" } diff --git a/flake.nix b/flake.nix index 6326d88..c27a9ac 100644 --- a/flake.nix +++ b/flake.nix @@ -1,17 +1,14 @@ { description = "The nix flake for all my systems"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/staging-next"; - - nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-22.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; neovim.url = "github:neovim/neovim?dir=contrib"; - neovim.inputs.nixpkgs.follows = "nixpkgs-stable"; + neovim.inputs.nixpkgs.follows = "nixpkgs"; neovim.inputs.flake-utils.follows = "utils"; home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; - home-manager.inputs.utils.follows = "utils"; nur.url = "github:nix-community/NUR"; @@ -55,7 +52,7 @@ ]; gui = [ ./users/relms/gui.nix - ./users/relms/wine.nix + ./users/relms/wine.nix ]; }; nixos = {