aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.lock59
-rw-r--r--flake.nix19
2 files changed, 31 insertions, 47 deletions
diff --git a/flake.lock b/flake.lock
index c405dd8..be0cf76 100644
--- a/flake.lock
+++ b/flake.lock
@@ -411,19 +411,21 @@
"nixpkgs": [
"nixpkgs"
],
- "utils": "utils"
+ "utils": [
+ "futils"
+ ]
},
"locked": {
- "lastModified": 1672244468,
- "narHash": "sha256-xaZb8AZqoXRCSqPusCk4ouf+fUNP8UJdafmMTF1Ltlw=",
+ "lastModified": 1673089714,
+ "narHash": "sha256-D58SGNOVe+s7r2iewnCA8q68gyrfQcOnD1TdJo1wFLY=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "89a8ba0b5b43b3350ff2e3ef37b66736b2ef8706",
+ "rev": "9e565f0d9d41c19a94f55af205c328ec5177fc0a",
"type": "github"
},
"original": {
"owner": "nix-community",
- "ref": "release-22.11",
+ "ref": "master",
"repo": "home-manager",
"type": "github"
}
@@ -503,22 +505,6 @@
"type": "github"
}
},
- "nixpkgs-stable_2": {
- "locked": {
- "lastModified": 1671271954,
- "narHash": "sha256-cSvu+bnvN08sOlTBWbBrKaBHQZq8mvk8bgpt0ZJ2Snc=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "d513b448cc2a6da2c8803e3c197c9fc7e67b19e3",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixos-22.05",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
"nixpkgs_2": {
"locked": {
"lastModified": 1672997035,
@@ -535,16 +521,16 @@
},
"nixpkgs_3": {
"locked": {
- "lastModified": 1673100377,
- "narHash": "sha256-mT76pTd0YFxT6CwtPhDgHJhuIgLY+ZLSMiQpBufwMG4=",
- "owner": "nixos",
+ "lastModified": 1672953546,
+ "narHash": "sha256-oz757DnJ1ITvwyTovuwG3l9cX6j9j6/DH9eH+cXFJmc=",
+ "owner": "NixOS",
"repo": "nixpkgs",
- "rev": "9f11a2df77cb945c115ae2a65f53f38121597d73",
+ "rev": "a518c77148585023ff56022f09c4b2c418a51ef5",
"type": "github"
},
"original": {
- "owner": "nixos",
- "ref": "release-22.11",
+ "owner": "NixOS",
+ "ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
@@ -627,7 +613,9 @@
"nixpkgs": [
"nixpkgs"
],
- "nixpkgs-stable": "nixpkgs-stable_2"
+ "nixpkgs-stable": [
+ "nixpkgs"
+ ]
},
"locked": {
"lastModified": 1672912243,
@@ -967,21 +955,6 @@
"url": "https://git.fcuny.net/fcuny/sendsms"
}
},
- "utils": {
- "locked": {
- "lastModified": 1667395993,
- "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "flake-utils",
- "type": "github"
- }
- },
"x509-tools": {
"inputs": {
"crane": "crane_4",
diff --git a/flake.nix b/flake.nix
index 8633bda..662e6ce 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,12 @@
description = "personal NixOS configurations";
inputs = {
- nixpkgs.url = "github:nixos/nixpkgs/release-22.11";
+ nixpkgs = {
+ type = "github";
+ owner = "NixOS";
+ repo = "nixpkgs";
+ ref = "nixos-unstable";
+ };
futils.url = "github:numtide/flake-utils";
@@ -18,9 +23,14 @@
nur.url = "github:nix-community/NUR";
home-manager = {
- url = "github:nix-community/home-manager/release-22.11";
- # We want home-manager to use the same set of nixpkgs as our system.
- inputs.nixpkgs.follows = "nixpkgs";
+ type = "github";
+ owner = "nix-community";
+ repo = "home-manager";
+ ref = "master";
+ inputs = {
+ nixpkgs.follows = "nixpkgs";
+ utils.follows = "futils";
+ };
};
rust = {
@@ -36,6 +46,7 @@
inputs = {
flake-utils.follows = "futils";
nixpkgs.follows = "nixpkgs";
+ nixpkgs-stable.follows = "nixpkgs";
};
};