fix: ildkule grub duplicated devices, format nix files

flake.nix

@@ -49,8 +49,14 @@
     qotd.inputs.nixpkgs.follows = "nixpkgs";
   };
 
-  outputs = { self, nixpkgs, nixpkgs-unstable, sops-nix, disko, ... }@inputs:
-  let
+  outputs = {
+    self,
+    nixpkgs,
+    nixpkgs-unstable,
+    sops-nix,
+    disko,
+    ...
+  } @ inputs: let
     inherit (nixpkgs) lib;
     systems = [
       "x86_64-linux"
@@ -71,182 +77,196 @@
   in {
     inputs = lib.mapAttrs (_: src: src.outPath) inputs;
 
-    pkgs = forAllSystems (system: import nixpkgs {
-      inherit system;
-      config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg)
-        [
-          "nvidia-x11"
-          "nvidia-settings"
-        ];
-    });
+    pkgs = forAllSystems (system:
+      import nixpkgs {
+        inherit system;
+        config.allowUnfreePredicate = pkg:
+          builtins.elem (lib.getName pkg)
+          [
+            "nvidia-x11"
+            "nvidia-settings"
+          ];
+      });
 
     nixosConfigurations = let
-      nixosConfig =
-        nixpkgs:
-        name:
-        configurationPath:
-        extraArgs@{
-          localSystem ? "x86_64-linux", # buildPlatform
-          crossSystem ? "x86_64-linux", # hostPlatform
-          specialArgs ? { },
-          modules ? [ ],
-          overlays ? [ ],
-          enableDefaults ? true,
-          ...
-        }:
-        let
-          commonPkgsConfig = {
-            config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg)
+      nixosConfig = nixpkgs: name: configurationPath: extraArgs @ {
+        localSystem ? "x86_64-linux", # buildPlatform
+        crossSystem ? "x86_64-linux", # hostPlatform
+        specialArgs ? {},
+        modules ? [],
+        overlays ? [],
+        enableDefaults ? true,
+        ...
+      }: let
+        commonPkgsConfig =
+          {
+            config.allowUnfreePredicate = pkg:
+              builtins.elem (lib.getName pkg)
               [
                 "nvidia-x11"
                 "nvidia-settings"
               ];
-            overlays = (lib.optionals enableDefaults [
-              # Global overlays go here
-              inputs.roowho2.overlays.default
-            ]) ++ overlays;
-          } // (if localSystem != crossSystem then {
-            inherit localSystem crossSystem;
-          } else {
-            system = crossSystem;
-          });
-          pkgs = import nixpkgs commonPkgsConfig;
-          unstablePkgs = import nixpkgs-unstable commonPkgsConfig;
-        in
-        lib.nixosSystem (lib.recursiveUpdate
-        {
-          system = crossSystem;
-
-          inherit pkgs;
-
-          specialArgs = {
-            inherit inputs unstablePkgs;
-            values = import ./values.nix;
-            fp = path: ./${path};
-          } // specialArgs;
-
-          modules = [
-            {
-              networking.hostName = lib.mkDefault name;
+            overlays =
+              (lib.optionals enableDefaults [
+                # Global overlays go here
+                inputs.roowho2.overlays.default
+              ])
+              ++ overlays;
+          }
+          // (
+            if localSystem != crossSystem
+            then {
+              inherit localSystem crossSystem;
             }
-            configurationPath
-          ] ++ (lib.optionals enableDefaults [
-            sops-nix.nixosModules.sops
-            inputs.roowho2.nixosModules.default
-            self.nixosModules.rsync-pull-targets
-          ]) ++ modules;
-        }
-        (builtins.removeAttrs extraArgs [
-          "localSystem"
-          "crossSystem"
-          "modules"
-          "overlays"
-          "specialArgs"
-          "enableDefaults"
-        ])
-      );
+            else {
+              system = crossSystem;
+            }
+          );
+        pkgs = import nixpkgs commonPkgsConfig;
+        unstablePkgs = import nixpkgs-unstable commonPkgsConfig;
+      in
+        lib.nixosSystem (
+          lib.recursiveUpdate
+          {
+            system = crossSystem;
+
+            inherit pkgs;
+
+            specialArgs =
+              {
+                inherit inputs unstablePkgs;
+                values = import ./values.nix;
+                fp = path: ./${path};
+              }
+              // specialArgs;
+
+            modules =
+              [
+                {
+                  networking.hostName = lib.mkDefault name;
+                }
+                configurationPath
+              ]
+              ++ (lib.optionals enableDefaults [
+                sops-nix.nixosModules.sops
+                inputs.roowho2.nixosModules.default
+                self.nixosModules.rsync-pull-targets
+              ])
+              ++ modules;
+          }
+          (builtins.removeAttrs extraArgs [
+            "localSystem"
+            "crossSystem"
+            "modules"
+            "overlays"
+            "specialArgs"
+            "enableDefaults"
+          ])
+        );
 
       stableNixosConfig = name: extraArgs:
-          nixosConfig nixpkgs name ./hosts/${name}/configuration.nix extraArgs;
-    in {
-      bicep = stableNixosConfig "bicep" {
-        modules = [
-          inputs.matrix-next.nixosModules.default
-          inputs.pvv-calendar-bot.nixosModules.default
-          inputs.minecraft-heatmap.nixosModules.default
-          self.nixosModules.gickup
-          self.nixosModules.matrix-ooye
-        ];
-        overlays = [
-          inputs.pvv-calendar-bot.overlays.default
-          inputs.minecraft-heatmap.overlays.default
-          (final: prev: {
-            inherit (self.packages.${prev.stdenv.hostPlatform.system}) out-of-your-element;
-          })
-        ];
-      };
-      bekkalokk = stableNixosConfig "bekkalokk" {
-        overlays = [
-          (final: prev: {
-            mediawiki-extensions = final.callPackage ./packages/mediawiki-extensions { };
-            simplesamlphp = final.callPackage ./packages/simplesamlphp { };
-            bluemap = final.callPackage ./packages/bluemap.nix { };
-          })
-          inputs.pvv-nettsiden.overlays.default
-          inputs.qotd.overlays.default
-        ];
-        modules = [
-          inputs.pvv-nettsiden.nixosModules.default
-          self.nixosModules.bluemap
-          inputs.qotd.nixosModules.default
-        ];
-      };
-      ildkule = stableNixosConfig "ildkule" {
-        modules = [
-          inputs.disko.nixosModules.disko
-        ];
-      };
-      #ildkule-unstable = unstableNixosConfig "ildkule" { };
-      skrot = stableNixosConfig "skrot" {
-        modules = [
-          inputs.disko.nixosModules.disko
-          inputs.dibbler.nixosModules.default
-        ];
-        overlays = [inputs.dibbler.overlays.default];
-      };
-      shark = stableNixosConfig "shark" { };
-      wenche = stableNixosConfig "wenche" { };
-      temmie = stableNixosConfig "temmie" { };
-      gluttony = stableNixosConfig "gluttony" { };
+        nixosConfig nixpkgs name ./hosts/${name}/configuration.nix extraArgs;
+    in
+      {
+        bicep = stableNixosConfig "bicep" {
+          modules = [
+            inputs.matrix-next.nixosModules.default
+            inputs.pvv-calendar-bot.nixosModules.default
+            inputs.minecraft-heatmap.nixosModules.default
+            self.nixosModules.gickup
+            self.nixosModules.matrix-ooye
+          ];
+          overlays = [
+            inputs.pvv-calendar-bot.overlays.default
+            inputs.minecraft-heatmap.overlays.default
+            (final: prev: {
+              inherit (self.packages.${prev.stdenv.hostPlatform.system}) out-of-your-element;
+            })
+          ];
+        };
+        bekkalokk = stableNixosConfig "bekkalokk" {
+          overlays = [
+            (final: prev: {
+              mediawiki-extensions = final.callPackage ./packages/mediawiki-extensions {};
+              simplesamlphp = final.callPackage ./packages/simplesamlphp {};
+              bluemap = final.callPackage ./packages/bluemap.nix {};
+            })
+            inputs.pvv-nettsiden.overlays.default
+            inputs.qotd.overlays.default
+          ];
+          modules = [
+            inputs.pvv-nettsiden.nixosModules.default
+            self.nixosModules.bluemap
+            inputs.qotd.nixosModules.default
+          ];
+        };
+        ildkule = stableNixosConfig "ildkule" {
+          modules = [
+            inputs.disko.nixosModules.disko
+          ];
+        };
+        #ildkule-unstable = unstableNixosConfig "ildkule" { };
+        skrot = stableNixosConfig "skrot" {
+          modules = [
+            inputs.disko.nixosModules.disko
+            inputs.dibbler.nixosModules.default
+          ];
+          overlays = [inputs.dibbler.overlays.default];
+        };
+        shark = stableNixosConfig "shark" {};
+        wenche = stableNixosConfig "wenche" {};
+        temmie = stableNixosConfig "temmie" {};
+        gluttony = stableNixosConfig "gluttony" {};
 
-      kommode = stableNixosConfig "kommode" {
-        overlays = [
-          inputs.nix-gitea-themes.overlays.default
-        ];
-        modules = [
-          inputs.nix-gitea-themes.nixosModules.default
-          inputs.disko.nixosModules.disko
-        ];
-      };
+        kommode = stableNixosConfig "kommode" {
+          overlays = [
+            inputs.nix-gitea-themes.overlays.default
+          ];
+          modules = [
+            inputs.nix-gitea-themes.nixosModules.default
+            inputs.disko.nixosModules.disko
+          ];
+        };
 
-      ustetind = stableNixosConfig "ustetind" {
-        modules = [
-         "${nixpkgs}/nixos/modules/virtualisation/lxc-container.nix"
-        ];
-      };
+        ustetind = stableNixosConfig "ustetind" {
+          modules = [
+            "${nixpkgs}/nixos/modules/virtualisation/lxc-container.nix"
+          ];
+        };
 
-      brzeczyszczykiewicz = stableNixosConfig "brzeczyszczykiewicz" {
-        modules = [
-          inputs.grzegorz-clients.nixosModules.grzegorz-webui
-          inputs.gergle.nixosModules.default
-          inputs.greg-ng.nixosModules.default
-        ];
-        overlays = [
-          inputs.greg-ng.overlays.default
-          inputs.gergle.overlays.default
-        ];
-      };
-      georg = stableNixosConfig "georg" {
-        modules = [
-          inputs.grzegorz-clients.nixosModules.grzegorz-webui
-          inputs.gergle.nixosModules.default
-          inputs.greg-ng.nixosModules.default
-        ];
-        overlays = [
-          inputs.greg-ng.overlays.default
-          inputs.gergle.overlays.default
-        ];
-      };
-    }
-    //
-    (let
-      machineNames = map (i: "lupine-${toString i}") (lib.range 1 5);
-      stableLupineNixosConfig = name: extraArgs:
+        brzeczyszczykiewicz = stableNixosConfig "brzeczyszczykiewicz" {
+          modules = [
+            inputs.grzegorz-clients.nixosModules.grzegorz-webui
+            inputs.gergle.nixosModules.default
+            inputs.greg-ng.nixosModules.default
+          ];
+          overlays = [
+            inputs.greg-ng.overlays.default
+            inputs.gergle.overlays.default
+          ];
+        };
+        georg = stableNixosConfig "georg" {
+          modules = [
+            inputs.grzegorz-clients.nixosModules.grzegorz-webui
+            inputs.gergle.nixosModules.default
+            inputs.greg-ng.nixosModules.default
+          ];
+          overlays = [
+            inputs.greg-ng.overlays.default
+            inputs.gergle.overlays.default
+          ];
+        };
+      }
+      // (let
+        machineNames = map (i: "lupine-${toString i}") (lib.range 1 5);
+        stableLupineNixosConfig = name: extraArgs:
           nixosConfig nixpkgs name ./hosts/lupine/configuration.nix extraArgs;
-    in lib.genAttrs machineNames (name: stableLupineNixosConfig name {
-      modules = [{ networking.hostName = name; }];
-      specialArgs.lupineName = name;
-    }));
+      in
+        lib.genAttrs machineNames (name:
+          stableLupineNixosConfig name {
+            modules = [{networking.hostName = name;}];
+            specialArgs.lupineName = name;
+          }));
 
     nixosModules = {
       bluemap = ./modules/bluemap.nix;
@@ -268,7 +288,8 @@
             })
           ];
         };
-      in pkgs.callPackage ./shell.nix { };
+      in
+        pkgs.callPackage ./shell.nix {};
       cuda = let
         cuda-pkgs = import nixpkgs-unstable {
           inherit system;
@@ -277,81 +298,88 @@
             cudaSupport = true;
           };
         };
-      in cuda-pkgs.callPackage ./shells/cuda.nix { };
+      in
+        cuda-pkgs.callPackage ./shells/cuda.nix {};
     });
 
     packages = {
       "x86_64-linux" = let
         system = "x86_64-linux";
         pkgs = nixpkgs.legacyPackages.${system};
-      in rec {
-        default = important-machines;
-        important-machines = pkgs.linkFarm "important-machines"
-          (lib.getAttrs importantMachines self.packages.${system});
-        all-machines = pkgs.linkFarm "all-machines"
-          (lib.getAttrs allMachines self.packages.${system});
+      in
+        rec {
+          default = important-machines;
+          important-machines =
+            pkgs.linkFarm "important-machines"
+            (lib.getAttrs importantMachines self.packages.${system});
+          all-machines =
+            pkgs.linkFarm "all-machines"
+            (lib.getAttrs allMachines self.packages.${system});
 
-        simplesamlphp = pkgs.callPackage ./packages/simplesamlphp { };
+          simplesamlphp = pkgs.callPackage ./packages/simplesamlphp {};
 
-        bluemap = pkgs.callPackage ./packages/bluemap.nix { };
+          bluemap = pkgs.callPackage ./packages/bluemap.nix {};
 
-        out-of-your-element = pkgs.callPackage ./packages/ooye/package.nix { };
-      }
-      //
-      # Mediawiki extensions
-      (lib.pipe null [
-        (_: pkgs.callPackage ./packages/mediawiki-extensions { })
-        (lib.flip builtins.removeAttrs ["override" "overrideDerivation"])
-        (lib.mapAttrs' (name: lib.nameValuePair "mediawiki-${name}"))
-      ])
-      //
-      # Machines
-      lib.genAttrs allMachines
+          out-of-your-element = pkgs.callPackage ./packages/ooye/package.nix {};
+        }
+        //
+        # Mediawiki extensions
+        (lib.pipe null [
+          (_: pkgs.callPackage ./packages/mediawiki-extensions {})
+          (lib.flip builtins.removeAttrs ["override" "overrideDerivation"])
+          (lib.mapAttrs' (name: lib.nameValuePair "mediawiki-${name}"))
+        ])
+        //
+        # Machines
+        lib.genAttrs allMachines
         (machine: self.nixosConfigurations.${machine}.config.system.build.toplevel)
-      //
-      # Nix-topology
-      (let
-        topology' = import inputs.nix-topology {
-          pkgs = import nixpkgs {
-            inherit system;
-            overlays = [
-              inputs.nix-topology.overlays.default
-              (final: prev: {
-                inherit (nixpkgs-unstable.legacyPackages.${system}) super-tiny-icons;
-              })
+        //
+        # Nix-topology
+        (let
+          topology' = import inputs.nix-topology {
+            pkgs = import nixpkgs {
+              inherit system;
+              overlays = [
+                inputs.nix-topology.overlays.default
+                (final: prev: {
+                  inherit (nixpkgs-unstable.legacyPackages.${system}) super-tiny-icons;
+                })
+              ];
+            };
+
+            specialArgs = {
+              values = import ./values.nix;
+            };
+
+            modules = [
+              ./topology
+              {
+                nixosConfigurations = lib.mapAttrs (_name: nixosCfg:
+                  nixosCfg.extendModules {
+                    modules = [
+                      inputs.nix-topology.nixosModules.default
+                      ./topology/service-extractors/greg-ng.nix
+                      ./topology/service-extractors/postgresql.nix
+                      ./topology/service-extractors/mysql.nix
+                      ./topology/service-extractors/gitea-runners.nix
+                    ];
+                  })
+                self.nixosConfigurations;
+              }
             ];
           };
-
-          specialArgs = {
-            values = import ./values.nix;
-          };
-
-          modules = [
-            ./topology
-            {
-              nixosConfigurations = lib.mapAttrs (_name: nixosCfg: nixosCfg.extendModules {
-                modules = [
-                  inputs.nix-topology.nixosModules.default
-                  ./topology/service-extractors/greg-ng.nix
-                  ./topology/service-extractors/postgresql.nix
-                  ./topology/service-extractors/mysql.nix
-                  ./topology/service-extractors/gitea-runners.nix
-                ];
-              }) self.nixosConfigurations;
-            }
-          ];
-        };
-      in {
-        topology = topology'.config.output;
-        topology-png = pkgs.runCommand "pvv-config-topology-png" {
-          nativeBuildInputs = [ pkgs.writableTmpDirAsHomeHook ];
-        } ''
-          mkdir -p "$out"
-          for file in '${topology'.config.output}'/*.svg; do
-            ${lib.getExe pkgs.imagemagick} -density 300 -background none "$file" "$out"/"$(basename "''${file%.svg}.png")"
-          done
-        '';
-      });
+        in {
+          topology = topology'.config.output;
+          topology-png =
+            pkgs.runCommand "pvv-config-topology-png" {
+              nativeBuildInputs = [pkgs.writableTmpDirAsHomeHook];
+            } ''
+              mkdir -p "$out"
+              for file in '${topology'.config.output}'/*.svg; do
+                ${lib.getExe pkgs.imagemagick} -density 300 -background none "$file" "$out"/"$(basename "''${file%.svg}.png")"
+              done
+            '';
+        });
     };
   };
 }

hosts/ildkule/configuration.nix

@@ -1,17 +1,23 @@
-{ config, fp, pkgs, lib, values, ... }:
 {
+  config,
+  fp,
+  pkgs,
+  lib,
+  values,
+  ...
+}: {
   imports = [
-      ./hardware-configuration.nix
-      ./disks.nix
-      (fp /base)
+    ./hardware-configuration.nix
+    ./disks.nix
+    (fp /base)
 
-      ./services/monitoring
-      ./services/nginx
-      ./services/journald-remote.nix
-    ];
+    ./services/monitoring
+    ./services/nginx
+    ./services/journald-remote.nix
+  ];
 
-  boot.loader.systemd-boot.enable = false;
-  boot.loader.grub.device = "/dev/sda";
+  boot.loader.grub.enable = true;
+  boot.loader.systemd-boot.enable = lib.mkForce false;
   boot.tmp.cleanOnBoot = true;
   zramSwap.enable = true;
 
@@ -29,11 +35,20 @@
 
     interfaces."ens3" = {
       ipv4.addresses = [
-        { address = hostConf.ipv4;          prefixLength = 32; }
-        { address = hostConf.ipv4_internal; prefixLength = 24; }
+        {
+          address = hostConf.ipv4;
+          prefixLength = 32;
+        }
+        {
+          address = hostConf.ipv4_internal;
+          prefixLength = 24;
+        }
       ];
       ipv6.addresses = [
-        { address = hostConf.ipv6;          prefixLength = 64; }
+        {
+          address = hostConf.ipv6;
+          prefixLength = 64;
+        }
       ];
     };
   };

values.nix

@@ -118,9 +118,9 @@ in rec {
   };
 
   defaultNetworkConfig = {
-    dns = [ "129.241.0.200" "129.241.0.201" "2001:700:300:1900::200" "2001:700:300:1900::201" ];
-    domains = [ "pvv.ntnu.no" "pvv.org" ];
-    gateway = [ hosts.gateway hosts.gateway6 ];
+    dns = ["129.241.0.200" "129.241.0.201" "2001:700:300:1900::200" "2001:700:300:1900::201"];
+    domains = ["pvv.ntnu.no" "pvv.org"];
+    gateway = [hosts.gateway hosts.gateway6];
 
     networkConfig.IPv6AcceptRA = "no";
     DHCP = "no";