diff --git a/common/bootloader/grub.nix b/common/bootloader/grub.nix index e382c1a..bb89433 100644 --- a/common/bootloader/grub.nix +++ b/common/bootloader/grub.nix @@ -24,9 +24,8 @@ in { configurationLimit = 25; default = "saved"; - useOSProber = true; memtest86.enable = true; - } + }; } (mkIf (cfg.device == "") { diff --git a/hosts/nixserver/configuration.nix b/hosts/nixserver/configuration.nix index f32009b..35eff80 100755 --- a/hosts/nixserver/configuration.nix +++ b/hosts/nixserver/configuration.nix @@ -24,7 +24,7 @@ in { # Use the GRUB 2 boot loader with legacy boot - grub.device = "/dev/disk/by-uuid/dfdccedd-4336-4449-bdc9-5cc4533cfbdd"; + grub.device = "/dev/sda"; # USB WiFi driver kernel module @@ -68,6 +68,10 @@ in { ranger lf tmux + + # Temp + kitty + makemkv ]; environment.shells = with pkgs; [ bash zsh ]; @@ -93,7 +97,7 @@ in { # Copy the NixOS configuration file and link it from the resulting system # (/run/current-system/configuration.nix). This is useful in case you # accidentally delete configuration.nix. - system.copySystemConfiguration = true; + # system.copySystemConfiguration = true; # This option defines the first version of NixOS you have installed on this particular machine, # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions. diff --git a/hosts/nixserver/minecraft.nix b/hosts/nixserver/minecraft.nix index 9f4d22a..4c752ab 100755 --- a/hosts/nixserver/minecraft.nix +++ b/hosts/nixserver/minecraft.nix @@ -1,6 +1,8 @@ -{ pkgs, services, common_dir, ... }: +{ pkgs, services, ... }: -let forge = pkgs.callPackage (common_dir + /custom-packages/forge-installer/forge.nix) {}; +let + common_dir = ../../common; + forge = pkgs.callPackage (common_dir + /custom-packages/forge-installer/forge.nix) {}; in { services.minecraft-server = {