diff --git a/flake.lock b/flake.lock index 30e87f0..c265f91 100644 --- a/flake.lock +++ b/flake.lock @@ -30,8 +30,8 @@ ] }, "locked": { - "lastModified": 1774376168, - "narHash": "sha256-gYZMD6l/b6pTGB58gbYqjy8GeXuEm1+GsQmYFvI1yZM=", + "lastModified": 1774430805, + "narHash": "sha256-fDescJvj4v7FteRhPIZEE1CRyAjRpfER/0kvntNNckM=", "path": "/home/love/dotfiles", "type": "path" }, diff --git a/modules/base.nix b/modules/base.nix index 41a6be2..455a6a7 100644 --- a/modules/base.nix +++ b/modules/base.nix @@ -26,17 +26,13 @@ }; }; - boot.loader.systemd-boot.enable = false; - boot.loader.efi.canTouchEfiVariables = true; - boot.loader.grub = { + boot.loader.systemd-boot = { enable = true; configurationLimit = 10; - device = "nodev"; - efiSupport = true; - enableCryptodisk = true; - useOSProber = true; - zfsSupport = true; + edk2-uefi-shell.enable = true; }; + boot.loader.efi.canTouchEfiVariables = true; + boot.loader.grub.enable = false; i18n = rec { defaultLocale = "en_US.UTF-8"; @@ -62,6 +58,7 @@ time.timeZone = "Europe/Stockholm"; console = { + earlySetup = true; font = "ter-v16n"; keyMap = "sv-latin1"; packages = [ pkgs.terminus_font ]; @@ -102,6 +99,7 @@ }; environment.systemPackages = with pkgs; [ + file cowsay fortune lolcat @@ -122,6 +120,8 @@ wget killall + efibootmgr + nil gcc