c3d2/nix-config
c3d2/nix-config
23
7
Fork 3
Code Issues 12 Pull Requests 2 Releases Wiki Activity

Set nixos-23.05 as default

Browse Source
This commit is contained in:
Sandro - 2023-06-05 21:10:44 +02:00
parent 4242423a05
commit 1111111b12
Signed by: sandro
GPG Key ID: 3AF5A43A3EECC2E5
1 changed files with 15 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
flake.nix
View File

@ -8,8 +8,8 @@
inputs = { inputs = {
# use sandro's fork full with cherry-picked fixes # use sandro's fork full with cherry-picked fixes
nixos.url = "github:SuperSandro2000/nixpkgs/nixos-22.11"; nixos-21-11.url = "github:SuperSandro2000/nixpkgs/nixos-22.11";
nixos-23-05.url = "github:SuperSandro2000/nixpkgs/nixos-23.05"; nixos.url = "github:SuperSandro2000/nixpkgs/nixos-23.05";
nixos-hardware.url = "github:nixos/nixos-hardware"; nixos-hardware.url = "github:nixos/nixos-hardware";
affection-src = { affection-src = {
@ -269,7 +269,6 @@
self.nixosModules.microvm self.nixosModules.microvm
./hosts/auth ./hosts/auth
]; ];
nixos = inputs.nixos-23-05;
}; };
bind = nixosSystem' { bind = nixosSystem' {
@ -277,7 +276,6 @@
self.nixosModules.microvm self.nixosModules.microvm
./hosts/bind ./hosts/bind
]; ];
nixos = inputs.nixos-23-05;
}; };
blogs = nixosSystem' { blogs = nixosSystem' {
@ -298,7 +296,6 @@
self.nixosModules.microvm self.nixosModules.microvm
./hosts/broker ./hosts/broker
]; ];
nixos = inputs.nixos-23-05;
}; };
buzzrelay = nixosSystem' { buzzrelay = nixosSystem' {
@ -307,7 +304,6 @@
buzzrelay.nixosModules.default buzzrelay.nixosModules.default
./hosts/buzzrelay ./hosts/buzzrelay
]; ];
nixos = inputs.nixos-23-05;
}; };
c3d2-web = nixosSystem' { c3d2-web = nixosSystem' {
@ -315,7 +311,6 @@
self.nixosModules.microvm self.nixosModules.microvm
./hosts/c3d2-web ./hosts/c3d2-web
]; ];
nixos = inputs.nixos-23-05;
}; };
caveman = nixosSystem' { caveman = nixosSystem' {
@ -324,7 +319,6 @@
caveman.nixosModule caveman.nixosModule
./hosts/caveman ./hosts/caveman
]; ];
nixos = inputs.nixos-23-05;
}; };
dacbert = nixosSystem' { dacbert = nixosSystem' {
@ -352,7 +346,6 @@
self.nixosModules.microvm self.nixosModules.microvm
./hosts/drone ./hosts/drone
]; ];
nixos = inputs.nixos-23-05;
}; };
freifunk = nixosSystem' { freifunk = nixosSystem' {
@ -373,7 +366,6 @@
self.nixosModules.microvm self.nixosModules.microvm
./hosts/ftp ./hosts/ftp
]; ];
nixos = inputs.nixos-23-05;
}; };
gitea = nixosSystem' { gitea = nixosSystem' {
@ -381,7 +373,6 @@
self.nixosModules.microvm self.nixosModules.microvm
./hosts/gitea ./hosts/gitea
]; ];
nixos = inputs.nixos-23-05;
}; };
glotzbert = nixosSystem' { glotzbert = nixosSystem' {
@ -396,7 +387,6 @@
self.nixosModules.cluster-options self.nixosModules.cluster-options
./hosts/gnunet ./hosts/gnunet
]; ];
nixos = inputs.nixos-23-05;
}; };
grafana = nixosSystem' { grafana = nixosSystem' {
@ -404,7 +394,6 @@
self.nixosModules.microvm self.nixosModules.microvm
./hosts/grafana ./hosts/grafana
]; ];
nixos = inputs.nixos-23-05;
}; };
hedgedoc = nixosSystem' { hedgedoc = nixosSystem' {
@ -412,7 +401,6 @@
self.nixosModules.microvm self.nixosModules.microvm
./hosts/hedgedoc ./hosts/hedgedoc
]; ];
nixos = inputs.nixos-23-05;
}; };
home-assistant = nixosSystem' { home-assistant = nixosSystem' {
@ -420,7 +408,6 @@
self.nixosModules.microvm self.nixosModules.microvm
./hosts/home-assistant ./hosts/home-assistant
]; ];
nixos = inputs.nixos-23-05;
}; };
hydra = nixosSystem' { hydra = nixosSystem' {
@ -429,7 +416,6 @@
skyflake.nixosModules.default skyflake.nixosModules.default
./hosts/hydra ./hosts/hydra
]; ];
nixos = inputs.nixos-23-05;
}; };
iso = nixosSystem' { iso = nixosSystem' {
@ -438,7 +424,6 @@
imports = lib.singleton "${modulesPath}/installer/cd-dvd/installation-cd-graphical-calamares-plasma5.nix"; imports = lib.singleton "${modulesPath}/installer/cd-dvd/installation-cd-graphical-calamares-plasma5.nix";
}) })
]; ];
nixos = inputs.nixos-23-05;
}; };
iso-minimal = nixosSystem' { iso-minimal = nixosSystem' {
@ -447,7 +432,6 @@
imports = lib.singleton "${modulesPath}/installer/cd-dvd/installation-cd-minimal.nix"; imports = lib.singleton "${modulesPath}/installer/cd-dvd/installation-cd-minimal.nix";
}) })
]; ];
nixos = inputs.nixos-23-05;
}; };
jabber = nixosSystem' { jabber = nixosSystem' {
@ -459,7 +443,6 @@
self.nixosModules.microvm self.nixosModules.microvm
./hosts/jabber ./hosts/jabber
]; ];
nixos = inputs.nixos-23-05;
}; };
leon = nixosSystem' { leon = nixosSystem' {
@ -481,7 +464,6 @@
self.nixosModules.microvm self.nixosModules.microvm
./hosts/mailtngbert ./hosts/mailtngbert
]; ];
nixos = inputs.nixos-23-05;
}; };
matrix = nixosSystem' { matrix = nixosSystem' {
@ -489,7 +471,6 @@
self.nixosModules.microvm self.nixosModules.microvm
./hosts/matrix ./hosts/matrix
]; ];
nixos = inputs.nixos-23-05;
}; };
mastodon = nixosSystem' { mastodon = nixosSystem' {
@ -505,7 +486,6 @@
./hosts/matemat ./hosts/matemat
yammat.nixosModule yammat.nixosModule
]; ];
nixos = inputs.nixos-23-05;
}; };
mediawiki = nixosSystem' { mediawiki = nixosSystem' {
@ -523,7 +503,6 @@
self.nixosModules.microvm self.nixosModules.microvm
./hosts/mobilizon ./hosts/mobilizon
]; ];
nixos = inputs.nixos-23-05;
}; };
mucbot = nixosSystem' { mucbot = nixosSystem' {
@ -538,7 +517,6 @@
./hosts/mucbot ./hosts/mucbot
self.nixosModules.cluster-options self.nixosModules.cluster-options
]; ];
nixos = inputs.nixos-23-05;
}; };
network-homepage = nixosSystem' { network-homepage = nixosSystem' {
@ -546,7 +524,6 @@
self.nixosModules.microvm self.nixosModules.microvm
./hosts/network-homepage ./hosts/network-homepage
]; ];
nixos = inputs.nixos-23-05;
}; };
nfsroot = nixosSystem' { nfsroot = nixosSystem' {
@ -567,7 +544,6 @@
self.nixosModules.nncp self.nixosModules.nncp
./hosts/nncp ./hosts/nncp
]; ];
nixos = inputs.nixos-23-05;
}; };
oparl = nixosSystem' { oparl = nixosSystem' {
@ -585,7 +561,6 @@
self.nixosModules.cluster-options self.nixosModules.cluster-options
./hosts/owncast ./hosts/owncast
]; ];
nixos = inputs.nixos-23-05;
}; };
oxigraph = nixosSystem' { oxigraph = nixosSystem' {
@ -593,14 +568,12 @@
self.nixosModules.cluster-options self.nixosModules.cluster-options
./hosts/oxigraph ./hosts/oxigraph
]; ];
nixos = inputs.nixos-23-05;
}; };
pipebert = nixosSystem' { pipebert = nixosSystem' {
modules = [ modules = [
./hosts/pipebert ./hosts/pipebert
]; ];
nixos = inputs.nixos-23-05;
}; };
prometheus = nixosSystem' { prometheus = nixosSystem' {
@ -609,7 +582,6 @@
alert2muc.nixosModules.default alert2muc.nixosModules.default
./hosts/prometheus ./hosts/prometheus
]; ];
nixos = inputs.nixos-23-05;
}; };
pulsebert = nixosSystem' { pulsebert = nixosSystem' {
@ -686,7 +658,6 @@
nixpkgs.overlays = [ secrets.overlays.scrape ]; nixpkgs.overlays = [ secrets.overlays.scrape ];
} }
]; ];
nixos = inputs.nixos-23-05;
}; };
sdrweb = nixosSystem' { sdrweb = nixosSystem' {
@ -699,7 +670,6 @@
heliwatch.nixosModules.heliwatch heliwatch.nixosModules.heliwatch
./hosts/sdrweb ./hosts/sdrweb
]; ];
nixos = inputs.nixos-23-05;
}; };
server6 = nixosSystem' { server6 = nixosSystem' {
@ -760,7 +730,6 @@
"${spacemsg}/spaceapi/module.nix" "${spacemsg}/spaceapi/module.nix"
./hosts/spaceapi ./hosts/spaceapi
]; ];
nixos = inputs.nixos-23-05;
}; };
sshlog = nixosSystem' { sshlog = nixosSystem' {
@ -769,7 +738,6 @@
sshlogd.nixosModule sshlogd.nixosModule
./hosts/sshlog ./hosts/sshlog
]; ];
nixos = inputs.nixos-23-05;
}; };
stream = nixosSystem' { stream = nixosSystem' {
@ -777,7 +745,6 @@
self.nixosModules.cluster-options self.nixosModules.cluster-options
./hosts/stream ./hosts/stream
]; ];
nixos = inputs.nixos-23-05;
}; };
ticker = nixosSystem' { ticker = nixosSystem' {
@ -786,7 +753,6 @@
ticker.nixosModules.ticker ticker.nixosModules.ticker
./hosts/ticker ./hosts/ticker
]; ];
nixos = inputs.nixos-23-05;
}; };
}; };
@ -860,19 +826,19 @@
in in
lib.mapAttrs getBuildEntryPoint self.nixosConfigurations lib.mapAttrs getBuildEntryPoint self.nixosConfigurations
# NOTE: left here to have the code as reference if we need something like in the future, eg. on a stable update # NOTE: left here to have the code as reference if we need something like in the future, eg. on a stable update
// lib.mapAttrs' (hostname: nixosSystem: let # // lib.mapAttrs' (hostname: nixosSystem: let
hostname' = hostname + "-23-05"; # hostname' = hostname + "-23-05";
in lib.nameValuePair # in lib.nameValuePair
hostname' # job display name # hostname' # job display name
(getBuildEntryPoint hostname' (nixosSystem' (nixosSystem.args // (with nixosSystem.args; { # (getBuildEntryPoint hostname' (nixosSystem' (nixosSystem.args // (with nixosSystem.args; {
modules = modules ++ [ # modules = modules ++ [
# { # # {
# simd.enable = lib.mkForce true; # # simd.enable = lib.mkForce true;
# } # # }
]; # ];
nixos = inputs.nixos-23-05; # nixos = inputs.nixos-23-05;
})))) # }))))
) self.nixosConfigurations # ) self.nixosConfigurations
// nixos.lib.filterAttrs (name: attr: // nixos.lib.filterAttrs (name: attr:
(builtins.match ".+-tftproot" name != null && lib.isDerivation attr) (builtins.match ".+-tftproot" name != null && lib.isDerivation attr)
) self.packages.aarch64-linux ) self.packages.aarch64-linux