makefu/nixos-config
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

flake.nix: update inventory4ce,ha-ara-emnu

Browse source
This commit is contained in:
makefu 2024-02-14 23:14:19 +01:00
parent d2e0ea29ac
commit 981db9815c
No known key found for this signature in database
GPG key ID: 36F7711F3FC0F225
2 changed files with 146 additions and 159 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

277
flake.lock
View file

@ -3,7 +3,9 @@
"clan-core": {
"inputs": {
"disko": "disko",
"flake-parts": "flake-parts",
"flake-parts": [
"flake-parts"
],
"nixos-generators": "nixos-generators",
"nixpkgs": [
"nixpkgs"
@ -79,26 +81,6 @@
"type": "github"
}
},
"disko_2": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1692199161,
"narHash": "sha256-GqKApvQ1JCf5DzH/Q+P4nwuHb6MaQGaWTu41lYzveF4=",
"owner": "nix-community",
"repo": "disko",
"rev": "4eed2457b053c4bbad7d90d2b3a1d539c2c9009c",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "disko",
"type": "github"
}
},
"flake-compat": {
"flake": false,
"locked": {
@ -116,27 +98,6 @@
}
},
"flake-parts": {
"inputs": {
"nixpkgs-lib": [
"clan-core",
"nixpkgs"
]
},
"locked": {
"lastModified": 1704982712,
"narHash": "sha256-2Ptt+9h8dczgle2Oo6z5ni5rt/uLMG47UFTR1ry/wgg=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "07f6395285469419cf9d078f59b5b49993198c00",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_2": {
"inputs": {
"nixpkgs-lib": [
"nixpkgs"
@ -156,27 +117,6 @@
"type": "github"
}
},
"flake-parts_3": {
"inputs": {
"nixpkgs-lib": [
"lanzaboote",
"nixpkgs"
]
},
"locked": {
"lastModified": 1680392223,
"narHash": "sha256-n3g7QFr85lDODKt250rkZj2IFS3i4/8HBU2yKHO3tqw=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "dcc36e45d054d7bb554c9cdab69093debd91a0b5",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": "systems"
@ -200,11 +140,11 @@
"systems": "systems_2"
},
"locked": {
"lastModified": 1685518550,
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
"lastModified": 1681202837,
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
"type": "github"
},
"original": {
@ -232,42 +172,6 @@
}
},
"flake-utils_4": {
"inputs": {
"systems": "systems_4"
},
"locked": {
"lastModified": 1687709756,
"narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_5": {
"inputs": {
"systems": "systems_5"
},
"locked": {
"lastModified": 1681202837,
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_6": {
"locked": {
"lastModified": 1676283394,
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
@ -282,7 +186,25 @@
"type": "github"
}
},
"flake-utils_7": {
"flake-utils_5": {
"inputs": {
"systems": "systems_4"
},
"locked": {
"lastModified": 1694529238,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_6": {
"inputs": {
"systems": "systems_6"
},
@ -328,14 +250,16 @@
"nixpkgs": [
"nixpkgs"
],
"poetry2nix": "poetry2nix"
"poetry2nix": [
"poetry2nix"
]
},
"locked": {
"lastModified": 1687949074,
"narHash": "sha256-YHrJaRwAb/2KV5pp/7n5CdbHKGqcHAnjOXMdQ9q1qes=",
"lastModified": 1707947095,
"narHash": "sha256-2Ctkda6D+GlhMvHDVyFWTSWBm8zaRZljFfF5q0aRPtA=",
"owner": "kalauerclub",
"repo": "ha_ara_menu",
"rev": "920cbd644f5fe275e0938552ccc143084689f0e2",
"rev": "f5eae4ac8149c18fa5f335be6fbdbdb1bd2f3827",
"type": "github"
},
"original": {
@ -366,18 +290,20 @@
},
"inventory4ce": {
"inputs": {
"flake-utils": "flake-utils_3",
"flake-utils": "flake-utils_2",
"nixpkgs": [
"nixpkgs"
],
"poetry2nix": "poetry2nix_2"
"poetry2nix": [
"poetry2nix"
]
},
"locked": {
"lastModified": 1689205771,
"narHash": "sha256-WYCgC7nLGWIhA2H882qRLWA/+ADnMu34gEWXJwQZfhk=",
"lastModified": 1707947571,
"narHash": "sha256-e+VwPE5kNt7frQocglztKP2sA07gm6ryBcLbquV2cVM=",
"owner": "kalauerclub",
"repo": "inventory4ce",
"rev": "8a82ecb8636a3d2b0f419c9f3e6d674bbd2b99fb",
"rev": "754741adf1320e0c95d53941c18f3ec124960495",
"type": "github"
},
"original": {
@ -390,8 +316,10 @@
"inputs": {
"crane": "crane",
"flake-compat": "flake-compat",
"flake-parts": "flake-parts_3",
"flake-utils": "flake-utils_5",
"flake-parts": [
"flake-parts"
],
"flake-utils": "flake-utils_3",
"nixpkgs": [
"nixpkgs"
],
@ -413,6 +341,50 @@
"type": "github"
}
},
"nether": {
"inputs": {
"clan-core": [
"clan-core"
],
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1707119821,
"narHash": "sha256-seifaHDFLMmvSsVYdjs6/BJkzPriKiXO8wEAScoZX5Q=",
"owner": "lassulus",
"repo": "nether",
"rev": "5ed4b8992a9b2424b1903ebb60f39be0045bd99f",
"type": "github"
},
"original": {
"owner": "lassulus",
"repo": "nether",
"type": "github"
}
},
"nix-github-actions": {
"inputs": {
"nixpkgs": [
"poetry2nix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1698974481,
"narHash": "sha256-yPncV9Ohdz1zPZxYHQf47S8S0VrnhV7nNhCawY46hDA=",
"owner": "nix-community",
"repo": "nix-github-actions",
"rev": "4bb5e752616262457bc7ca5882192a564c0472d2",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nix-github-actions",
"type": "github"
}
},
"nix-ld": {
"inputs": {
"nixpkgs": [
@ -436,7 +408,7 @@
},
"nix-writers": {
"inputs": {
"flake-utils": "flake-utils_6",
"flake-utils": "flake-utils_4",
"nixpkgs": [
"nixpkgs"
]
@ -509,11 +481,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1705677747,
"narHash": "sha256-eyM3okYtMgYDgmYukoUzrmuoY4xl4FUujnsv/P6I/zI=",
"lastModified": 1705856552,
"narHash": "sha256-JXfnuEf5Yd6bhMs/uvM67/joxYKoysyE3M2k6T3eWbg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "bbe7d8f876fbbe7c959c90ba2ae2852220573261",
"rev": "612f97239e2cc474c13c9dafa0df378058c5ad8d",
"type": "github"
},
"original": {
@ -541,40 +513,20 @@
},
"poetry2nix": {
"inputs": {
"flake-utils": "flake-utils_2",
"flake-utils": "flake-utils_5",
"nix-github-actions": "nix-github-actions",
"nixpkgs": [
"ha-ara-menu",
"nixpkgs"
]
],
"systems": "systems_5",
"treefmt-nix": "treefmt-nix_2"
},
"locked": {
"lastModified": 1685418143,
"narHash": "sha256-q2ORekI8au0pGMtOLQI8WMCJBxjzWgYRHpiEOVSBq3w=",
"lastModified": 1707195113,
"narHash": "sha256-xPFxTMe4rKE/ZWLlOWv22qpGwpozpR+U1zhyf1040Zk=",
"owner": "nix-community",
"repo": "poetry2nix",
"rev": "f11cc14e28078c701072f2d1fb34a6495c9376b1",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "poetry2nix",
"type": "github"
}
},
"poetry2nix_2": {
"inputs": {
"flake-utils": "flake-utils_4",
"nixpkgs": [
"inventory4ce",
"nixpkgs"
]
},
"locked": {
"lastModified": 1688992084,
"narHash": "sha256-pKOcnbTT0zAybza8Wz94ezG+5ghzXoHQxXahtsc2Yrw=",
"owner": "nix-community",
"repo": "poetry2nix",
"rev": "77a4f59685053a77644fd35fc2063751af63aca7",
"rev": "4eb2ac54029af42a001c9901194e9ce19cbd8a40",
"type": "github"
},
"original": {
@ -617,16 +569,17 @@
"root": {
"inputs": {
"clan-core": "clan-core",
"disko": "disko_2",
"flake-parts": "flake-parts_2",
"flake-parts": "flake-parts",
"ha-ara-menu": "ha-ara-menu",
"home-manager": "home-manager",
"inventory4ce": "inventory4ce",
"lanzaboote": "lanzaboote",
"nether": "nether",
"nix-ld": "nix-ld",
"nix-writers": "nix-writers",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs",
"poetry2nix": "poetry2nix",
"stockholm": "stockholm",
"vscode-server": "vscode-server"
}
@ -773,9 +726,8 @@
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
"id": "systems",
"type": "indirect"
}
},
"systems_6": {
@ -814,6 +766,27 @@
"type": "github"
}
},
"treefmt-nix_2": {
"inputs": {
"nixpkgs": [
"poetry2nix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1699786194,
"narHash": "sha256-3h3EH1FXQkIeAuzaWB+nK0XK54uSD46pp+dMD3gAcB4=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "e82f32aa7f06bbbd56d7b12186d555223dc399d1",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"utils": {
"locked": {
"lastModified": 1667395993,
@ -831,7 +804,7 @@
},
"vscode-server": {
"inputs": {
"flake-utils": "flake-utils_7",
"flake-utils": "flake-utils_6",
"nixpkgs": [
"nixpkgs"
]

28
flake.nix
View file

@ -7,6 +7,7 @@
url = "git+https://git.clan.lol/clan/clan-core";
# Don't do this if your machines are on nixpkgs stable.
inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-parts.follows = "flake-parts";
};
nixos-hardware.url = "github:NixOS/nixos-hardware";
@ -15,9 +16,6 @@
home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
disko.url = "github:nix-community/disko";
disko.inputs.nixpkgs.follows = "nixpkgs";
flake-parts.url = "github:hercules-ci/flake-parts";
flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs";
@ -31,24 +29,38 @@
nix-writers.url = "git+https://cgit.krebsco.de/nix-writers";
nix-writers.inputs.nixpkgs.follows = "nixpkgs";
poetry2nix = {
url = "github:nix-community/poetry2nix";
inputs.nixpkgs.follows = "nixpkgs";
};
# bam inputs
ha-ara-menu.url = "github:kalauerclub/ha_ara_menu";
ha-ara-menu.inputs.nixpkgs.follows = "nixpkgs";
ha-ara-menu.inputs.poetry2nix.follows = "poetry2nix";
inventory4ce.url = "github:kalauerclub/inventory4ce";
inventory4ce.inputs.nixpkgs.follows = "nixpkgs";
inventory4ce.inputs.poetry2nix.follows = "poetry2nix";
lanzaboote.url = "github:nix-community/lanzaboote/v0.3.0";
lanzaboote.inputs.nixpkgs.follows = "nixpkgs";
lanzaboote.inputs.flake-parts.follows = "flake-parts";
vscode-server.url = "github:nix-community/nixos-vscode-server";
vscode-server.inputs.nixpkgs.follows = "nixpkgs";
nether = {
url = "github:lassulus/nether";
inputs.nixpkgs.follows = "nixpkgs";
inputs.clan-core.follows = "clan-core";
};
};
description = "Flake of makefu";
outputs = { self, nixpkgs, lanzaboote, disko, nixos-hardware, nix-ld, clan-core,
outputs = { self, nixpkgs, lanzaboote, nixos-hardware, nix-ld, clan-core,
home-manager, nix-writers, vscode-server, ...}@inputs:
let
inherit (nixpkgs) lib pkgs;
@ -65,8 +77,8 @@
self.overlays.default
inputs.nix-writers.overlays.default
(import (inputs.stockholm.inputs.nix-writers + "/pkgs"))
(this: super: {
inherit (this.writers) writeDash writeDashBin;
(self: super: {
inherit (self.writers) writeDash writeDashBin;
stockholm.lib = inputs.stockholm.lib;
ha-ara-menu = inputs.ha-ara-menu.packages.${system}.default;
inventory4ce = inputs.inventory4ce.packages.${system}.default;
@ -88,7 +100,7 @@
# nixpkgs.pkgs = if host == "cake" then pkgsForSystem "aarch64-linux" else pkgsForSystem "x86_64-linux";
imports = [
./2configs/nixpkgs-config.nix
disko.nixosModules.disko
clan-core.inputs.disko.nixosModules.disko
nix-ld.nixosModules.nix-ld
home-manager.nixosModules.default
lanzaboote.nixosModules.lanzaboote
@ -109,6 +121,8 @@
inputs.stockholm.nixosModules.setuid
inputs.stockholm.nixosModules.urlwatch
inputs.nether.nixosModules.hosts
self.nixosModules.default
vscode-server.nixosModules.default
#self.nixosModules.krebs