Update versions (post RFC-0125!)
diff --git a/flake.lock b/flake.lock
index 77b6f82..41beaec 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,21 +2,25 @@
"nodes": {
"crane": {
"inputs": {
- "flake-compat": "flake-compat",
+ "flake-compat": [
+ "flake-compat"
+ ],
"flake-utils": [
"flake-utils"
],
"nixpkgs": [
"nixpkgs"
],
- "rust-overlay": "rust-overlay"
+ "rust-overlay": [
+ "rust-overlay"
+ ]
},
"locked": {
- "lastModified": 1680584903,
- "narHash": "sha256-uraq+D3jcLzw/UVk0xMHcnfILfIMa0DLrtAEq2nNlxU=",
+ "lastModified": 1682796879,
+ "narHash": "sha256-X0oDZylzDXBt7RBtYXBvFexARRFvousej15feeemAx0=",
"owner": "ipetkov",
"repo": "crane",
- "rev": "65d3f6a3970cd46bef5eedfd458300f72c56b3c5",
+ "rev": "db21a44eb056ef65a33d9d2648ecc964b4acaddc",
"type": "github"
},
"original": {
@@ -33,11 +37,11 @@
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
- "lastModified": 1680762089,
- "narHash": "sha256-62lgi+xb+nn9H4O+ZIYNkHeQ8ryzstALKMJuoXiot0I=",
+ "lastModified": 1682835640,
+ "narHash": "sha256-rAYEOd4nZFLjDlrF9KNlcopPKNVtr1svSXcEValVRMY=",
"owner": "nix-community",
"repo": "fenix",
- "rev": "5794e58068fb6a8eccad9e4ff77ffe1c08ded13c",
+ "rev": "006b429d3c493f4c5b1743a94f71ad961c7693ab",
"type": "github"
},
"original": {
@@ -62,48 +66,19 @@
"type": "github"
}
},
- "flake-compat_2": {
- "flake": false,
- "locked": {
- "lastModified": 1673956053,
- "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
- "owner": "edolstra",
- "repo": "flake-compat",
- "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
- "type": "github"
- },
- "original": {
- "owner": "edolstra",
- "repo": "flake-compat",
- "type": "github"
- }
- },
- "flake-compat_3": {
- "flake": false,
- "locked": {
- "lastModified": 1673956053,
- "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
- "owner": "edolstra",
- "repo": "flake-compat",
- "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
- "type": "github"
- },
- "original": {
- "owner": "edolstra",
- "repo": "flake-compat",
- "type": "github"
- }
- },
"flake-parts": {
"inputs": {
- "nixpkgs-lib": "nixpkgs-lib"
+ "nixpkgs-lib": [
+ "lanzaboote",
+ "nixpkgs"
+ ]
},
"locked": {
- "lastModified": 1678379998,
- "narHash": "sha256-TZdfNqftHhDuIFwBcN9MUThx5sQXCTeZk9je5byPKRw=",
+ "lastModified": 1680392223,
+ "narHash": "sha256-n3g7QFr85lDODKt250rkZj2IFS3i4/8HBU2yKHO3tqw=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "c13d60b89adea3dc20704c045ec4d50dd964d447",
+ "rev": "dcc36e45d054d7bb554c9cdab69093debd91a0b5",
"type": "github"
},
"original": {
@@ -113,12 +88,15 @@
}
},
"flake-utils": {
+ "inputs": {
+ "systems": "systems"
+ },
"locked": {
- "lastModified": 1678901627,
- "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
+ "lastModified": 1681202837,
+ "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
+ "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
"type": "github"
},
"original": {
@@ -147,21 +125,6 @@
"type": "github"
}
},
- "flake-utils_2": {
- "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"
- }
- },
"fzf-tab": {
"flake": false,
"locked": {
@@ -181,7 +144,6 @@
"gitignore": {
"inputs": {
"nixpkgs": [
- "lanzaboote",
"pre-commit-hooks-nix",
"nixpkgs"
]
@@ -220,15 +182,14 @@
"inputs": {
"nixpkgs": [
"nixpkgs"
- ],
- "utils": "utils"
+ ]
},
"locked": {
- "lastModified": 1680597706,
- "narHash": "sha256-ZqJ3T+BxzjPH9TnmeUwS4Uu9ZQPeBXAFC9sUWlharT4=",
+ "lastModified": 1682779989,
+ "narHash": "sha256-H8AjcIBYFYrlRobYJ+n1B+ZJ6TsaaeZpuLn4iRqVvr4=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "ec06f419af79207b33d797064dfb3fc9dbe1df4a",
+ "rev": "3144311f31194b537808ae6848f86f3dbf977d59",
"type": "github"
},
"original": {
@@ -239,11 +200,11 @@
},
"impermanence": {
"locked": {
- "lastModified": 1675359654,
- "narHash": "sha256-FPxzuvJkcO49g4zkWLSeuZkln54bLoTtrggZDJBH90I=",
+ "lastModified": 1682268411,
+ "narHash": "sha256-ICDKQ7tournRVtfM8C2II0qHiOZOH1b3dXVOCsgr11o=",
"owner": "nix-community",
"repo": "impermanence",
- "rev": "6138eb8e737bffabd4c8fc78ae015d4fd6a7e2fd",
+ "rev": "df1692e2d9f1efc4300b1ea9201831730e0b817d",
"type": "github"
},
"original": {
@@ -260,11 +221,11 @@
},
"locked": {
"dir": "nix",
- "lastModified": 1679982002,
- "narHash": "sha256-st3xFK6kgoeTwVQw/zKGc4HLaWSU4yrRyY82d7bfgYk=",
+ "lastModified": 1682527311,
+ "narHash": "sha256-gFiQ62jbBfumg0IR4oXR/DRVunOxMd4lJ5+g+qjz7wA=",
"owner": "kmonad",
"repo": "kmonad",
- "rev": "a22e0bad9e76b01c7b9e56f193e07c615e82effa",
+ "rev": "3aa2f52536de853efbcb0f6e790c97a3734687ec",
"type": "github"
},
"original": {
@@ -279,7 +240,9 @@
"crane": [
"crane"
],
- "flake-compat": "flake-compat_2",
+ "flake-compat": [
+ "flake-compat"
+ ],
"flake-parts": "flake-parts",
"flake-utils": [
"flake-utils"
@@ -287,16 +250,19 @@
"nixpkgs": [
"nixpkgs"
],
- "nixpkgs-test": "nixpkgs-test",
- "pre-commit-hooks-nix": "pre-commit-hooks-nix",
- "rust-overlay": "rust-overlay_2"
+ "pre-commit-hooks-nix": [
+ "pre-commit-hooks-nix"
+ ],
+ "rust-overlay": [
+ "rust-overlay"
+ ]
},
"locked": {
- "lastModified": 1679410195,
- "narHash": "sha256-O0QKWaIeX/QRQcOaf1RJofuRu+WnT+zHHHnqeAjAI0E=",
+ "lastModified": 1682802423,
+ "narHash": "sha256-Fb5TeRTdvUlo/5Yi2d+FC8a6KoRLk2h1VE0/peMhWPs=",
"owner": "nix-community",
"repo": "lanzaboote",
- "rev": "7c55847aaf804398c0cd1c75f20591075eafcdee",
+ "rev": "64b903ca87d18cef2752c19c098af275c6e51d63",
"type": "github"
},
"original": {
@@ -329,11 +295,11 @@
]
},
"locked": {
- "lastModified": 1679224439,
- "narHash": "sha256-QkvcuC4b67FUkkxlMsLTMPbwoD7yZr0UvJpu6jkFuLo=",
+ "lastModified": 1682417654,
+ "narHash": "sha256-XtUhq1GTRzV7QebHkxjd7Z58E6lVEk6Iv1/pF/GnBB4=",
"owner": "Mic92",
"repo": "nix-index-database",
- "rev": "2f5e6e915d70c04d673a8930f94591595c73eb84",
+ "rev": "e3e320b19c192f40a5b98e8776e3870df62dee8a",
"type": "github"
},
"original": {
@@ -344,11 +310,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1681028957,
- "narHash": "sha256-gKWkKT/nFg2d9HZyK7VAjRzkyPfKLx+uIGyWXDw0NB0=",
+ "lastModified": 1682900373,
+ "narHash": "sha256-+ckiCxbGFSs1/wHKCXAZnvb37Htf6k5nmQE3T0Y7hK8=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "11c129c16f4051ad215ea7b0d297a6c7cf5d24d7",
+ "rev": "8b3bc690e201c8d3cbd14633dbf3462a820e73f2",
"type": "github"
},
"original": {
@@ -358,24 +324,6 @@
"type": "github"
}
},
- "nixpkgs-lib": {
- "locked": {
- "dir": "lib",
- "lastModified": 1678375444,
- "narHash": "sha256-XIgHfGvjFvZQ8hrkfocanCDxMefc/77rXeHvYdzBMc8=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "130fa0baaa2b93ec45523fdcde942f6844ee9f6e",
- "type": "github"
- },
- "original": {
- "dir": "lib",
- "owner": "NixOS",
- "ref": "nixos-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
"nixpkgs-minion": {
"locked": {
"lastModified": 1666777518,
@@ -393,48 +341,16 @@
},
"nixpkgs-stable": {
"locked": {
- "lastModified": 1678872516,
- "narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=",
+ "lastModified": 1682600000,
+ "narHash": "sha256-ha4BehR1dh8EnXSoE1m/wyyYVvHI9txjW4w5/oxsW5Y=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "9b8e5abb18324c7fe9f07cb100c3cd4a29cda8b8",
+ "rev": "50fc86b75d2744e1ab3837ef74b53f103a9b55a0",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "nixos-22.11",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs-stable_2": {
- "locked": {
- "lastModified": 1680390120,
- "narHash": "sha256-RyDJcG/7mfimadlo8vO0QjW22mvYH1+cCqMuigUntr8=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "c1e2efaca8d8a3db6a36f652765d6c6ba7bb8fae",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "release-22.11",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs-test": {
- "locked": {
- "lastModified": 1679009563,
- "narHash": "sha256-jizICiQOqUcYFNHRNNOo69bfyNo36iyuRAHem5z68LQ=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "371d3778c4f9cee7d5cf014e6ce400d57366570f",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "qemu-boot-disk-using-make-disk-image",
+ "ref": "nixos-22.05",
"repo": "nixpkgs",
"type": "github"
}
@@ -459,22 +375,6 @@
"type": "github"
}
},
- "nixpkgs_2": {
- "locked": {
- "lastModified": 1671213428,
- "narHash": "sha256-0deLDx1KjTiB3AKV2/OizGfEWcp6ZPjsDXk99uPJ8FM=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "dbc68fa4bb132d990945d39801b0d7f2ba15b08f",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "dbc68fa4bb132d990945d39801b0d7f2ba15b08f",
- "type": "github"
- }
- },
"nps": {
"inputs": {
"flake-utils": [
@@ -516,24 +416,26 @@
},
"pre-commit-hooks-nix": {
"inputs": {
- "flake-compat": "flake-compat_3",
+ "flake-compat": [
+ "flake-compat"
+ ],
"flake-utils": [
- "lanzaboote",
"flake-utils"
],
"gitignore": "gitignore",
"nixpkgs": [
- "lanzaboote",
"nixpkgs"
],
- "nixpkgs-stable": "nixpkgs-stable"
+ "nixpkgs-stable": [
+ "nixpkgs-stable"
+ ]
},
"locked": {
- "lastModified": 1678976941,
- "narHash": "sha256-skNr08frCwN9NO+7I77MjOHHAw+L410/37JknNld+W4=",
+ "lastModified": 1682596858,
+ "narHash": "sha256-Hf9XVpqaGqe/4oDGr30W8HlsWvJXtMsEPHDqHZA6dDg=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
- "rev": "32b1dbedfd77892a6e375737ef04d8efba634e9e",
+ "rev": "fb58866e20af98779017134319b5663b8215d912",
"type": "github"
},
"original": {
@@ -545,11 +447,11 @@
"registry": {
"flake": false,
"locked": {
- "lastModified": 1674218164,
- "narHash": "sha256-oLNWhwrV252kiy2tGQwwJNKFR+iG0fjsw0GSE/XVTR8=",
+ "lastModified": 1682423975,
+ "narHash": "sha256-zvOBrH3hwCedgpaWiOSHYSt+fgF/RhaJs8R5qOX6AYc=",
"owner": "nixos",
"repo": "flake-registry",
- "rev": "507c028d8d189b6647592dfd10ee677578de45a1",
+ "rev": "8054bfa00d60437297d670ab3296a117e7059a10",
"type": "github"
},
"original": {
@@ -562,6 +464,7 @@
"inputs": {
"crane": "crane",
"fenix": "fenix",
+ "flake-compat": "flake-compat",
"flake-utils": "flake-utils",
"flake-utils-plus": "flake-utils-plus",
"fzf-tab": "fzf-tab",
@@ -574,10 +477,13 @@
"nix-index-database": "nix-index-database",
"nixpkgs": "nixpkgs",
"nixpkgs-minion": "nixpkgs-minion",
+ "nixpkgs-stable": "nixpkgs-stable",
"nixpkgs-unfree": "nixpkgs-unfree",
"nps": "nps",
"omnisharp-language-server": "omnisharp-language-server",
+ "pre-commit-hooks-nix": "pre-commit-hooks-nix",
"registry": "registry",
+ "rust-overlay": "rust-overlay",
"sops-nix": "sops-nix",
"vscode-extensions": "vscode-extensions"
}
@@ -585,11 +491,11 @@
"rust-analyzer-src": {
"flake": false,
"locked": {
- "lastModified": 1680727375,
- "narHash": "sha256-hb8AosuONAg0D9yoZ4VrBsjf5hINMYVLPEGekXF4qVE=",
+ "lastModified": 1682792082,
+ "narHash": "sha256-1nuP2rqipsdB8IJ3N5ws3FQm4dX3mKIueIrCUSu1bWw=",
"owner": "rust-lang",
"repo": "rust-analyzer",
- "rev": "ea22d245b671f97b820cf761108251c6292c3152",
+ "rev": "7bcb4c2ef23e151a639ff918fbb8ab9d521eabb9",
"type": "github"
},
"original": {
@@ -602,45 +508,18 @@
"rust-overlay": {
"inputs": {
"flake-utils": [
- "crane",
"flake-utils"
],
"nixpkgs": [
- "crane",
"nixpkgs"
]
},
"locked": {
- "lastModified": 1680488274,
- "narHash": "sha256-0vYMrZDdokVmPQQXtFpnqA2wEgCCUXf5a3dDuDVshn0=",
+ "lastModified": 1682907601,
+ "narHash": "sha256-FfUAYvRJ+6s9WWjXNPdRzuuvAeu2VHIXIbUkPJr4t14=",
"owner": "oxalica",
"repo": "rust-overlay",
- "rev": "7ec2ff598a172c6e8584457167575b3a1a5d80d8",
- "type": "github"
- },
- "original": {
- "owner": "oxalica",
- "repo": "rust-overlay",
- "type": "github"
- }
- },
- "rust-overlay_2": {
- "inputs": {
- "flake-utils": [
- "lanzaboote",
- "flake-utils"
- ],
- "nixpkgs": [
- "lanzaboote",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1679279218,
- "narHash": "sha256-vWUbkLgNaUo0TYi5BaboPTaB6IjoZPm+0y0SqLS54Jc=",
- "owner": "oxalica",
- "repo": "rust-overlay",
- "rev": "c680a0a4144bb0931f6cebd601a3978bbafc4f64",
+ "rev": "5eaff055dd57128c53ae373dc96af944f5849daa",
"type": "github"
},
"original": {
@@ -654,14 +533,16 @@
"nixpkgs": [
"nixpkgs"
],
- "nixpkgs-stable": "nixpkgs-stable_2"
+ "nixpkgs-stable": [
+ "nixpkgs-stable"
+ ]
},
"locked": {
- "lastModified": 1680404136,
- "narHash": "sha256-06D8HJmRv4DdpEQGblMhx2Vm81SBWM61XBBIx7QQfo0=",
+ "lastModified": 1682823324,
+ "narHash": "sha256-KNu3OAqVyoKwnDP+gqptjQYCnZXxEwXccR89c0r1/8k=",
"owner": "Mic92",
"repo": "sops-nix",
- "rev": "b93eb910f768f9788737bfed596a598557e5625d",
+ "rev": "4f308f76633f81253a12b80e7b05b80d325005b2",
"type": "github"
},
"original": {
@@ -670,25 +551,29 @@
"type": "github"
}
},
- "utils": {
+ "systems": {
"locked": {
- "lastModified": 1678901627,
- "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
+ "lastModified": 1681028828,
+ "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+ "owner": "nix-systems",
+ "repo": "default",
+ "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
- "owner": "numtide",
- "repo": "flake-utils",
+ "owner": "nix-systems",
+ "repo": "default",
"type": "github"
}
},
"vscode-extensions": {
"inputs": {
- "flake-utils": "flake-utils_2",
- "nixpkgs": "nixpkgs_2"
+ "flake-utils": [
+ "flake-utils"
+ ],
+ "nixpkgs": [
+ "nixpkgs"
+ ]
},
"locked": {
"lastModified": 1673775196,
diff --git a/flake.nix b/flake.nix
index 009d530..bf2c78d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,6 +2,7 @@
description = "Minion's NixOS configuration (since 2022-08-19)";
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+ nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-22.05";
nix-index-database.url = "github:Mic92/nix-index-database";
nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
@@ -45,6 +46,25 @@
nps.url = "github:OleMussmann/Nix-Package-Search";
lanzaboote.url = "github:nix-community/lanzaboote";
+ flake-compat = {
+ url = "github:edolstra/flake-compat";
+ flake = false;
+ };
+ rust-overlay = {
+ url = "github:oxalica/rust-overlay";
+ inputs = {
+ flake-utils.follows = "flake-utils";
+ nixpkgs.follows = "nixpkgs";
+ };
+ };
+
+ pre-commit-hooks-nix = {
+ url = "github:cachix/pre-commit-hooks.nix";
+ inputs.nixpkgs.follows = "nixpkgs";
+ inputs.flake-utils.follows = "flake-utils";
+ inputs.flake-compat.follows = "flake-compat";
+ };
+
fenix.inputs.nixpkgs.follows = "nixpkgs";
flake-utils-plus.inputs.flake-utils.follows = "flake-utils";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
@@ -56,6 +76,16 @@
lanzaboote.inputs.nixpkgs.follows = "nixpkgs";
lanzaboote.inputs.flake-utils.follows = "flake-utils";
lanzaboote.inputs.crane.follows = "crane";
+ vscode-extensions.inputs.nixpkgs.follows = "nixpkgs";
+ vscode-extensions.inputs.flake-utils.follows = "flake-utils";
+ crane.inputs.flake-compat.follows = "flake-compat";
+ crane.inputs.rust-overlay.follows = "rust-overlay";
+ lanzaboote.inputs.flake-compat.follows = "flake-compat";
+ lanzaboote.inputs.rust-overlay.follows = "rust-overlay";
+ lanzaboote.inputs.pre-commit-hooks-nix.follows = "pre-commit-hooks-nix";
+
+ sops-nix.inputs.nixpkgs-stable.follows = "nixpkgs-stable";
+ pre-commit-hooks-nix.inputs.nixpkgs-stable.follows = "nixpkgs-stable";
};
outputs = inputs: