1 files changed, 6 insertions, 10 deletions
diff --git a/nixos/modules/generic.nix b/nixos/modules/generic.nix
index 02afd17..e029058 100644
--- a/nixos/modules/generic.nix
+++ b/nixos/modules/generic.nix
@@ -6,10 +6,8 @@
   inherit (lib) mkOverride mkDefault;
 in {
   config = {
-    system.stateVersion = "24.05";
-
     nix = {
-      extraOptions = "experimental-features = nix-command flakes repl-flake";
+      extraOptions = "experimental-features = nix-command flakes";
       settings = {
         auto-optimise-store = true;
         substituters = [
@@ -31,8 +29,11 @@ in {
     };
 
     boot = {
-      loader.systemd-boot.enable = mkOverride 1100 true;
-      loader.efi.canTouchEfiVariables = mkDefault true;
+      loader = {
+        systemd-boot.enable = mkOverride 1100 true;
+        efi.canTouchEfiVariables = mkDefault true;
+        grub.enable = mkOverride 1100 false;
+      };
       kernelPackages = mkOverride 1100 pkgs.linuxPackages_latest;
       kernelParams = ["boot.shell_on_fail"];
     };
@@ -59,11 +60,6 @@ in {
       })
     ];
 
-    system.extraSystemBuilderCmds = ''
-      substituteAll ${./nixos-system.sh} $out/bin/nixos-system
-      chmod +x $out/bin/nixos-system
-    '';
-
     documentation = {
       enable = mkDefault false;
       doc.enable = mkDefault false;