felixalb
/
pvv-nixos-config
mirror of https://git.pvv.ntnu.no/Drift/pvv-nixos-config.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

move jokum to nixos bicep

This commit is contained in:
Daniel Olsen 2023-03-26 04:21:03 +02:00
parent dfe8b8b44c
commit 7620fb3dee
4 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flake.nix
View File

@ -22,7 +22,7 @@
nixosConfigurations = let nixosConfigurations = let
nixosConfig = name: config: nixpkgs.lib.nixosSystem (nixpkgs.lib.recursiveUpdate nixosConfig = name: config: nixpkgs.lib.nixosSystem (nixpkgs.lib.recursiveUpdate
config config
{ rec {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { specialArgs = {
inherit unstable inputs; inherit unstable inputs;

14
hosts/bicep/configuration.nix
View File

@ -6,6 +6,7 @@
../../base.nix ../../base.nix
./services/postgres.nix ./services/postgres.nix
./services/jokum.nix
]; ];
sops.defaultSopsFile = ../../secrets/bicep/bicep.yaml; sops.defaultSopsFile = ../../secrets/bicep/bicep.yaml;
@ -13,15 +14,16 @@
sops.age.keyFile = "/var/lib/sops-nix/key.txt"; sops.age.keyFile = "/var/lib/sops-nix/key.txt";
sops.age.generateKey = true; sops.age.generateKey = true;
boot.loader.systemd-boot.enable = true; boot.loader.grub.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.grub.version = 2;
boot.loader.grub.device = "/dev/disk/by-id/scsi-3600508b1001cb1a8751c137b30610682";
networking.hostName = "bicep"; networking.hostName = "bicep";
# systemd.network.networks."30-ens33" = values.defaultNetworkConfig // { systemd.network.networks."30-enp6s0f0" = values.defaultNetworkConfig // {
# matchConfig.Name = "ens33"; matchConfig.Name = "enp6s0f0";
# address = with values.hosts.bekkalokk; [ (ipv4 + "/25") (ipv6 + "/64") ]; address = with values.hosts.bicep; [ (ipv4 + "/25") (ipv6 + "/64") ];
# }; };
# Do not change, even during upgrades. # Do not change, even during upgrades.
# See https://search.nixos.org/options?show=system.stateVersion # See https://search.nixos.org/options?show=system.stateVersion

10
hosts/bicep/services/jokum.nix Normal file
View File

@ -0,0 +1,10 @@
{config, lib, pkgs, inputs, values, ...}:
{
# lfmao
containers.jokum = {
interfaces = [ "ens10f1" ];
# wtf
path = inputs.self.nixosConfigurations.jokum.config.system.build.toplevel;
};
}

5
hosts/jokum/configuration.nix
View File

@ -14,14 +14,12 @@
sops.age.keyFile = "/var/lib/sops-nix/key.txt"; sops.age.keyFile = "/var/lib/sops-nix/key.txt";
sops.age.generateKey = true; sops.age.generateKey = true;
boot.kernel.enable = false;
boot.isContainer = true; boot.isContainer = true;
networking.useHostResolvConf = false; networking.useHostResolvConf = false;
boot.loader.initScript.enable = true;
networking.hostName = "jokum"; # Define your hostname. networking.hostName = "jokum"; # Define your hostname.
systemd.network.networks."30-ens10f1" = values.defaultNetworkConfig // { systemd.network.networks."30-enp6s0f1" = values.defaultNetworkConfig // {
matchConfig.Name = "ens10f1"; matchConfig.Name = "ens10f1";
address = with values.hosts.jokum; [ (ipv4 + "/25") (ipv6 + "/64") ] address = with values.hosts.jokum; [ (ipv4 + "/25") (ipv6 + "/64") ]
++ (with values.services.turn; [ (ipv4 + "/25") (ipv6 + "/64") ]); ++ (with values.services.turn; [ (ipv4 + "/25") (ipv6 + "/64") ]);
@ -40,5 +38,4 @@
# Before changing this value read the documentation for this option # Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "21.05"; # Did you read the comment? system.stateVersion = "21.05"; # Did you read the comment?
} }