diff --git a/flake.lock b/flake.lock index 4a2ec46..68aa9aa 100644 --- a/flake.lock +++ b/flake.lock @@ -75,11 +75,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -135,11 +135,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { @@ -205,11 +205,11 @@ ] }, "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", + "lastModified": 1703887061, + "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=", "owner": "hercules-ci", "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", + "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5", "type": "github" }, "original": { @@ -325,11 +325,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1705677747, - "narHash": "sha256-eyM3okYtMgYDgmYukoUzrmuoY4xl4FUujnsv/P6I/zI=", + "lastModified": 1705856552, + "narHash": "sha256-JXfnuEf5Yd6bhMs/uvM67/joxYKoysyE3M2k6T3eWbg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bbe7d8f876fbbe7c959c90ba2ae2852220573261", + "rev": "612f97239e2cc474c13c9dafa0df378058c5ad8d", "type": "github" }, "original": { @@ -368,11 +368,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1705778871, - "narHash": "sha256-WWZzdIHqryR4fCmQehatmQ+S9hYQRH7nIxbvo4LiV6c=", + "lastModified": 1705961248, + "narHash": "sha256-sqK417zKqVoxallioKRtHMSssOJT6gEpQ9FIuBKIoG0=", "owner": "nix-community", "repo": "nixvim", - "rev": "06d97a1b4435ca2bc3d3bdb6a7646363034ce5a2", + "rev": "01c21406c6f4f6c137f861f9503572c5d0c9d98b", "type": "github" }, "original": { @@ -396,11 +396,11 @@ ] }, "locked": { - "lastModified": 1705072518, - "narHash": "sha256-90dERRuG781f0EWjn2AOtScZqsTcpIFLpY8TN2VbkL8=", + "lastModified": 1705757126, + "narHash": "sha256-Eksr+n4Q8EYZKAN0Scef5JK4H6FcHc+TKNHb95CWm+c=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "274ae3979a0eacae422e1bbcf63b8b7a335e1114", + "rev": "f56597d53fd174f796b5a7d3ee0b494f9e2285cc", "type": "github" }, "original": { diff --git a/system/mistmane/boot-config.nix b/system/mistmane/boot-config.nix index 6831cdb..7972b3a 100644 --- a/system/mistmane/boot-config.nix +++ b/system/mistmane/boot-config.nix @@ -4,8 +4,15 @@ boot = { kernelParams = [ "console=tty1" ]; tmp.cleanOnBoot = true; - loader.grub.enable = false; - loader.generic-extlinux-compatible.enable = true; + + loader.efi.canTouchEfiVariables = false; + loader.grub = { + enable = true; + efiSupport = true; + efiInstallAsRemovable = true; + device = "nodev"; + }; + initrd.luks.devices."${config.networking.hostName}" = { name = config.networking.hostName; device = "/dev/disk/by-uuid/74b7cded-e9f8-432f-b694-5bea09635168"; diff --git a/system/mistmane/hardware-configuration.nix b/system/mistmane/hardware-configuration.nix index 99a8868..aa5709f 100644 --- a/system/mistmane/hardware-configuration.nix +++ b/system/mistmane/hardware-configuration.nix @@ -17,8 +17,8 @@ }; fileSystems."/boot" = { - device = "/dev/disk/by-uuid/375e4660-be08-40ba-8961-0a9cc3a96187"; - fsType = "ext4"; + device = "/dev/disk/by-uuid/8B78-CA04"; + fsType = "vfat"; }; swapDevices =