qo.is/infrastructure
4
0
Fork 0
Code Issues 13 Pull requests 1 Projects 1 Activity Actions

Replace nixpkgs with stable and update inputs
Some checks failed
CI / build (push) Failing after 1m25s
Details
CI / deploy (docs-ops.qo.is) (push) Has been skipped
Details
CI / deploy (system-physical) (push) Has been skipped
Details
CI / deploy (system-vm) (push) Has been skipped
Details

Browse source
This commit is contained in:
Fabian Hauser 2025-06-25 23:53:10 +03:00
parent 3295f6f128
commit e76a4f04cc
3 changed files with 17 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

40
flake.lock generated
View file

@ -23,15 +23,15 @@
"disko": {
"inputs": {
"nixpkgs": [
"nixpkgs-nixos-stable"
"nixpkgs"
]
},
"locked": {
"lastModified": 1750040002,
"narHash": "sha256-KrC9iOVYIn6ukpVlHbqSA4hYCZ6oDyJKrcLqv4c5v84=",
"lastModified": 1750680230,
"narHash": "sha256-kD88T/NqmcgfOBFAwphN30ccaUdj6K6+LG0XdM2w2LA=",
"owner": "nix-community",
"repo": "disko",
"rev": "7f1857b31522062a6a00f88cbccf86b43acceed1",
"rev": "8fd2d6c75009ac75f9a6fb18c33a239806778d01",
"type": "github"
},
"original": {
@ -81,11 +81,11 @@
]
},
"locked": {
"lastModified": 1749636823,
"narHash": "sha256-WUaIlOlPLyPgz9be7fqWJA5iG6rHcGRtLERSCfUDne4=",
"lastModified": 1750779888,
"narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "623c56286de5a3193aa38891a6991b28f9bab056",
"rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d",
"type": "github"
},
"original": {
@ -131,13 +131,13 @@
"type": "github"
}
},
"nixpkgs-nixos-stable": {
"nixpkgs_2": {
"locked": {
"lastModified": 1750330365,
"narHash": "sha256-hJ7XMNVsTnnbV2NPmStCC07gvv5l2x7+Skb7hyUzazg=",
"lastModified": 1750646418,
"narHash": "sha256-4UAN+W0Lp4xnUiHYXUXAPX18t+bn6c4Btry2RqM9JHY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d883b6213afa179b58ba8bace834f1419707d0ad",
"rev": "1f426f65ac4e6bf808923eb6f8b8c2bfba3d18c5",
"type": "github"
},
"original": {
@ -147,22 +147,6 @@
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1750365781,
"narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"private": {
"inputs": {
"nixpkgs": [
@ -172,6 +156,7 @@
"locked": {
"lastModified": 1749920008,
"narHash": "sha256-wn3U2q/+OQYErVyoY9kwZP/fXcDG4ewhJkHX7qHzq8g=",
"ref": "refs/heads/main",
"rev": "5f8ba2025848dd30539c42ef1f7e6c6f917e70d9",
"revCount": 19,
"type": "git",
@ -188,7 +173,6 @@
"disko": "disko",
"git-hooks-nix": "git-hooks-nix",
"nixpkgs": "nixpkgs_2",
"nixpkgs-nixos-stable": "nixpkgs-nixos-stable",
"private": "private",
"sops-nix": "sops-nix",
"treefmt-nix": "treefmt-nix"

7
flake.nix
View file

@ -5,8 +5,7 @@
extra-trusted-public-keys = "qois-infrastructure:lh35ymN7Aoxm5Hz0S6JusxE+cYzMU+x9OMKjDVIpfuE=";
};
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs-nixos-stable.url = "github:NixOS/nixpkgs/nixos-24.11";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
treefmt-nix = {
url = "github:numtide/treefmt-nix";
@ -24,7 +23,7 @@
deploy-rs.url = "github:serokell/deploy-rs";
disko = {
url = "github:nix-community/disko";
inputs.nixpkgs.follows = "nixpkgs-nixos-stable";
inputs.nixpkgs.follows = "nixpkgs";
};
private.url = "git+file:./private";
private.inputs.nixpkgs.follows = "nixpkgs";
@ -59,7 +58,7 @@
inherit (inputs)
deploy-rs
disko
nixpkgs-nixos-stable
nixpkgs
sops-nix
private
git-hooks-nix

4
nixos-configurations/default.nix
View file

@ -1,12 +1,12 @@
{
self,
pkgs,
nixpkgs-nixos-stable,
nixpkgs,
...
}@inputs:
let
inherit (pkgs.lib) genAttrs;
inherit (nixpkgs-nixos-stable.lib) nixosSystem;
inherit (nixpkgs.lib) nixosSystem;
configs = self.lib.foldersWithNix ./.;
in
genAttrs configs (