pub-solar/infra
6
1
Fork 3
Code Issues 24 Pull requests 10 Actions Packages Projects 1 Releases Wiki Activity

flake: refactor, bye srid
Some checks failed
Flake checks / Check (pull_request) Failing after 1m37s
Details

Browse source 
Refactor flake to work without nixos-flake and use native NixOS module
system. This is because of recent changes to nixos-flake, like renaming it
to nixos-unified and changing the API without a changelog or guide how
to update.
This commit is contained in:
teutat3s 2024-10-05 13:54:05 +02:00
parent 8c8a757f8f
commit d09b4e2624
Signed by: teutat3s
GPG key ID: 4FA1D3FA524F22C1
3 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
flake.lock
View file

@ -318,21 +318,6 @@
"type": "github"
}
},
"nixos-flake": {
"locked": {
"lastModified": 1728073820,
"narHash": "sha256-H6DC2OCW8BKzja+1oHGTjw9EN5w+4Op9PnVjKL8EJbI=",
"owner": "srid",
"repo": "nixos-flake",
"rev": "47a26bc9118d17500bbe0c4adb5ebc26f776cc36",
"type": "github"
},
"original": {
"owner": "srid",
"repo": "nixos-flake",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1728067476,
@ -373,7 +358,6 @@
"keycloak-theme-pub-solar": "keycloak-theme-pub-solar",
"maunium-stickerpicker": "maunium-stickerpicker",
"nix-darwin": "nix-darwin",
"nixos-flake": "nixos-flake",
"nixpkgs": "nixpkgs",
"simple-nixos-mailserver": "simple-nixos-mailserver",
"unstable": "unstable"

2
flake.nix
View file

@ -11,7 +11,6 @@
home-manager.inputs.nixpkgs.follows = "nixpkgs";
flake-parts.url = "github:hercules-ci/flake-parts";
nixos-flake.url = "github:srid/nixos-flake";
deploy-rs.url = "github:serokell/deploy-rs";
deploy-rs.inputs.nixpkgs.follows = "nixpkgs";
@ -51,7 +50,6 @@
];
imports = [
inputs.nixos-flake.flakeModule
./logins
./lib
./overlays

44
hosts/default.nix
View file

@ -1,9 +1,22 @@
{ self, ... }:
{ self, inputs, config, ... }:
{
flake = {
nixosConfigurations = {
nachtigall = self.nixos-flake.lib.mkLinuxSystem {
nixosModules = {
home-manager = {
imports = [
inputs.home-manager.nixosModules.home-manager
({
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = { flake = { inherit self inputs config; };};
})
];
};
};
nixosConfigurations = {
nachtigall = self.inputs.nixpkgs.lib.nixosSystem {
specialArgs = { flake = { inherit self inputs config; };};
modules = [
self.inputs.agenix.nixosModules.default
self.nixosModules.home-manager
./nachtigall
@ -43,8 +56,9 @@
];
};
metronom = self.nixos-flake.lib.mkLinuxSystem {
imports = [
metronom = self.inputs.nixpkgs.lib.nixosSystem {
specialArgs = { flake = { inherit self inputs config; };};
modules = [
self.inputs.agenix.nixosModules.default
self.nixosModules.home-manager
./metronom
@ -60,8 +74,9 @@
];
};
tankstelle = self.nixos-flake.lib.mkLinuxSystem {
imports = [
tankstelle = self.inputs.nixpkgs.lib.nixosSystem {
specialArgs = { flake = { inherit self inputs config; };};
modules = [
self.inputs.agenix.nixosModules.default
self.nixosModules.home-manager
./tankstelle
@ -73,8 +88,9 @@
];
};
trinkgenossin = self.nixos-flake.lib.mkLinuxSystem {
imports = [
trinkgenossin = self.inputs.nixpkgs.lib.nixosSystem {
specialArgs = { flake = { inherit self inputs config; };};
modules = [
self.inputs.agenix.nixosModules.default
self.nixosModules.home-manager
./trinkgenossin
@ -94,8 +110,9 @@
];
};
delite = self.nixos-flake.lib.mkLinuxSystem {
imports = [
delite = self.inputs.nixpkgs.lib.nixosSystem {
specialArgs = { flake = { inherit self inputs config; };};
modules = [
self.inputs.agenix.nixosModules.default
self.inputs.disko.nixosModules.disko
self.nixosModules.home-manager
@ -111,8 +128,9 @@
];
};
blue-shell = self.nixos-flake.lib.mkLinuxSystem {
imports = [
blue-shell = self.inputs.nixpkgs.lib.nixosSystem {
specialArgs = { flake = { inherit self inputs config; };};
modules = [
self.inputs.agenix.nixosModules.default
self.inputs.disko.nixosModules.disko
self.nixosModules.home-manager