Merge pull request #491 from nix-community/fix-disko-compat

{hetzner-cloud, vultr}: don't conflict with disko
nix-community · Aug 25, 2024 · 0c81763 · 0c81763
2 parents 0af64f2 + 30eef76
commit 0c81763
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/nixos/hardware/hetzner-cloud/default.nix b/nixos/hardware/hetzner-cloud/default.nix
@@ -13,7 +13,7 @@
 
   config = {
     boot.growPartition = true;
-    boot.loader.grub.device = "/dev/sda";
+    boot.loader.grub.devices = lib.mkDefault [ "/dev/sda" ];
 
     fileSystems."/" = lib.mkDefault {
       device = "/dev/sda1";

diff --git a/nixos/hardware/vultr/vm.nix b/nixos/hardware/vultr/vm.nix
@@ -1,4 +1,4 @@
-{ modulesPath, ... }:
+{ modulesPath, lib, ... }:
 {
   imports = [
     ./.
@@ -7,5 +7,5 @@
   ];
 
   boot.loader.grub.enable = true;
-  boot.loader.grub.devices = [ "/dev/vda" ];
+  boot.loader.grub.devices = lib.mkDefault [ "/dev/vda" ];
 }
diff --git a/nixos/server/default.nix b/nixos/server/default.nix
@@ -1,6 +1,11 @@
 # A default configuration that applies to all servers.
 # Common configuration across *all* the machines
-{ pkgs, lib, ... }:
+{
+  pkgs,
+  lib,
+  options,
+  ...
+}:
 {
 
   imports = [ ../common ];
@@ -35,7 +40,7 @@
     {
       defaultEditor = lib.mkDefault true;
     }
-    // lib.optionalAttrs (lib.versionAtLeast (lib.versions.majorMinor lib.version) "24.11") {
+    // lib.optionalAttrs (options.programs.vim ? enable) {
       enable = lib.mkDefault true;
     };