diff --git a/base/default.nix b/base/default.nix index dbdd616..1dbf3f3 100644 --- a/base/default.nix +++ b/base/default.nix @@ -41,6 +41,9 @@ boot.tmp.cleanOnBoot = lib.mkDefault true; boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_latest; + boot.loader.systemd-boot.enable = lib.mkDefault true; + boot.loader.efi.canTouchEfiVariables = lib.mkDefault true; + time.timeZone = "Europe/Oslo"; i18n.defaultLocale = "en_US.UTF-8"; diff --git a/hosts/bakke/configuration.nix b/hosts/bakke/configuration.nix index 1ecda1d..e4a9969 100644 --- a/hosts/bakke/configuration.nix +++ b/hosts/bakke/configuration.nix @@ -11,9 +11,6 @@ sops.age.keyFile = "/var/lib/sops-nix/key.txt"; sops.age.generateKey = true; - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - networking.hostName = "bakke"; networking.hostId = "99609ffc"; systemd.network.networks."30-enp2s0" = values.defaultNetworkConfig // { diff --git a/hosts/bekkalokk/configuration.nix b/hosts/bekkalokk/configuration.nix index 8a3af66..a6838f9 100644 --- a/hosts/bekkalokk/configuration.nix +++ b/hosts/bekkalokk/configuration.nix @@ -24,9 +24,6 @@ sops.age.keyFile = "/var/lib/sops-nix/key.txt"; sops.age.generateKey = true; - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - networking.hostName = "bekkalokk"; systemd.network.networks."30-enp2s0" = values.defaultNetworkConfig // { diff --git a/hosts/bicep/configuration.nix b/hosts/bicep/configuration.nix index 1132022..69d7681 100644 --- a/hosts/bicep/configuration.nix +++ b/hosts/bicep/configuration.nix @@ -20,9 +20,6 @@ sops.age.keyFile = "/var/lib/sops-nix/key.txt"; sops.age.generateKey = true; - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - networking.hostName = "bicep"; #systemd.network.networks."30-enp6s0f0" = values.defaultNetworkConfig // { diff --git a/hosts/brzeczyszczykiewicz/configuration.nix b/hosts/brzeczyszczykiewicz/configuration.nix index 22473cf..14105ed 100644 --- a/hosts/brzeczyszczykiewicz/configuration.nix +++ b/hosts/brzeczyszczykiewicz/configuration.nix @@ -8,9 +8,6 @@ ./services/grzegorz.nix ]; - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - networking.hostName = "brzeczyszczykiewicz"; systemd.network.networks."30-eno1" = values.defaultNetworkConfig // { diff --git a/hosts/georg/configuration.nix b/hosts/georg/configuration.nix index b8a2727..1d17eaa 100644 --- a/hosts/georg/configuration.nix +++ b/hosts/georg/configuration.nix @@ -8,9 +8,6 @@ (fp /modules/grzegorz.nix) ]; - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - networking.hostName = "georg"; systemd.network.networks."30-eno1" = values.defaultNetworkConfig // { diff --git a/hosts/gluttony/configuration.nix b/hosts/gluttony/configuration.nix index ddf9afa..eec08e4 100644 --- a/hosts/gluttony/configuration.nix +++ b/hosts/gluttony/configuration.nix @@ -10,8 +10,7 @@ (fp /base) ]; - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; + boot.loader.systemd-boot.enable = false; systemd.network.enable = lib.mkForce false; networking = diff --git a/hosts/ildkule/configuration.nix b/hosts/ildkule/configuration.nix index 298af44..62f0429 100644 --- a/hosts/ildkule/configuration.nix +++ b/hosts/ildkule/configuration.nix @@ -15,6 +15,7 @@ sops.age.keyFile = "/var/lib/sops-nix/key.txt"; sops.age.generateKey = true; + boot.loader.systemd-boot.enable = false; boot.loader.grub.device = "/dev/vda"; boot.tmp.cleanOnBoot = true; zramSwap.enable = true; diff --git a/hosts/kommode/configuration.nix b/hosts/kommode/configuration.nix index eee4bc9..a29764b 100644 --- a/hosts/kommode/configuration.nix +++ b/hosts/kommode/configuration.nix @@ -14,9 +14,6 @@ sops.age.keyFile = "/var/lib/sops-nix/key.txt"; sops.age.generateKey = true; - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - networking.hostName = "kommode"; # Define your hostname. systemd.network.networks."30-ens18" = values.defaultNetworkConfig // { diff --git a/hosts/lupine/configuration.nix b/hosts/lupine/configuration.nix index 834bbdf..49d5e24 100644 --- a/hosts/lupine/configuration.nix +++ b/hosts/lupine/configuration.nix @@ -13,9 +13,6 @@ sops.age.keyFile = "/var/lib/sops-nix/key.txt"; sops.age.generateKey = true; - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - systemd.network.networks."30-enp0s31f6" = values.defaultNetworkConfig // { matchConfig.Name = "enp0s31f6"; address = with values.hosts.${lupineName}; [ (ipv4 + "/25") (ipv6 + "/64") ]; diff --git a/hosts/shark/configuration.nix b/hosts/shark/configuration.nix index 31b2ae2..6c6a235 100644 --- a/hosts/shark/configuration.nix +++ b/hosts/shark/configuration.nix @@ -11,9 +11,6 @@ sops.age.keyFile = "/var/lib/sops-nix/key.txt"; sops.age.generateKey = true; - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - networking.hostName = "shark"; # Define your hostname. systemd.network.networks."30-ens18" = values.defaultNetworkConfig // { diff --git a/hosts/skrott/configuration.nix b/hosts/skrott/configuration.nix index 400837b..236ef32 100644 --- a/hosts/skrott/configuration.nix +++ b/hosts/skrott/configuration.nix @@ -9,6 +9,7 @@ consoleLogLevel = 0; enableContainers = false; loader.grub.enable = false; + loader.systemd-boot.enable = false; kernelPackages = pkgs.linuxPackages; }; diff --git a/hosts/temmie/configuration.nix b/hosts/temmie/configuration.nix index af5b199..8a3f0a5 100644 --- a/hosts/temmie/configuration.nix +++ b/hosts/temmie/configuration.nix @@ -13,8 +13,6 @@ # sops.age.keyFile = "/var/lib/sops-nix/key.txt"; # sops.age.generateKey = true; - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; networking.hostName = "temmie"; # Define your hostname. diff --git a/hosts/ustetind/configuration.nix b/hosts/ustetind/configuration.nix index dadcf93..5f50f34 100644 --- a/hosts/ustetind/configuration.nix +++ b/hosts/ustetind/configuration.nix @@ -14,6 +14,8 @@ networking.hostName = "ustetind"; + boot.loader.systemd-boot.enable = false; + networking.useHostResolvConf = lib.mkForce false; systemd.network.networks = { diff --git a/hosts/wenche/configuration.nix b/hosts/wenche/configuration.nix index 4c0e0d7..3aa150d 100644 --- a/hosts/wenche/configuration.nix +++ b/hosts/wenche/configuration.nix @@ -19,6 +19,7 @@ sops.age.keyFile = "/var/lib/sops-nix/key.txt"; sops.age.generateKey = true; + boot.loader.systemd-boot.enable = false; boot.loader.grub.device = "/dev/sda"; networking.hostName = "wenche"; # Define your hostname.