diff --git a/flake.lock b/flake.lock index e580de0..5d9a036 100644 --- a/flake.lock +++ b/flake.lock @@ -14,11 +14,11 @@ "sf-pro": "sf-pro" }, "locked": { - "lastModified": 1780240721, - "narHash": "sha256-O5dSz9h4zRnYyGYTS0hfMamYEDutsEC1PzxQELdsttU=", + "lastModified": 1781881853, + "narHash": "sha256-JawESccafFrnpr1YPYc2Xd7WaBJvbE+4FLZzWY3AfJU=", "owner": "Lyndeno", "repo": "apple-fonts.nix", - "rev": "a11f7174137d4a0267bd8d7abd85da05bd9a41cc", + "rev": "bb4d5244052c1f6cae543baea793bf44f3f8bfb4", "type": "github" }, "original": { @@ -57,17 +57,14 @@ "inputs": { "flake-schemas": "flake-schemas", "home-manager": "home-manager", - "jovian": "jovian", - "niks3": "niks3", - "nixpkgs": "nixpkgs_2", - "rust-overlay": "rust-overlay" + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1781537616, - "narHash": "sha256-xIymhdrUEJ1HXhprACY/st+m0uT9Y48uw7o68dMfJ+U=", + "lastModified": 1781973186, + "narHash": "sha256-xxTBi1xTp/6Eqk7xocj/fftWmyHnc3fDIwmifl4FRaA=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "b3e97bde839af37572c2dc5781a3e9006c70031a", + "rev": "0a8f0b8ff103f2eeb8f03a8c6af1a45657359927", "type": "github" }, "original": { @@ -99,49 +96,18 @@ "type": "github" } }, - "crane": { - "locked": { - "lastModified": 1765145449, - "narHash": "sha256-aBVHGWWRzSpfL++LubA0CwOOQ64WNLegrYHwsVuVN7A=", - "owner": "ipetkov", - "repo": "crane", - "rev": "69f538cdce5955fcd47abfed4395dc6d5194c1c5", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1761588595, - "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-schemas": { "locked": { - "lastModified": 1721999734, - "narHash": "sha256-G5CxYeJVm4lcEtaO87LKzOsVnWeTcHGKbKxNamNWgOw=", - "rev": "0a5c42297d870156d9c57d8f99e476b738dcd982", - "revCount": 75, + "lastModified": 1780327564, + "narHash": "sha256-HiRPtA0spK+Dkgbhz/1zW9glXxNVB+L4Rj2VYmdawb8=", + "rev": "6cc9bd98891b1fc6bb2b8cb3277df8bc72799ca6", + "revCount": 149, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.5/0190ef2f-61e0-794b-ba14-e82f225e55e6/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.5.0/019e83cf-9af3-78b1-ac5b-70e68ad1efe1/source.tar.gz" }, "original": { "type": "tarball", - "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.5.tar.gz" + "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.5.0.tar.gz" } }, "flake-utils": { @@ -162,28 +128,6 @@ "type": "github" } }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "lanzaboote", - "pre-commit", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -192,11 +136,11 @@ ] }, "locked": { - "lastModified": 1781497404, - "narHash": "sha256-9GAF8sSsnkyCVCWkomXR0T+zdSxyUlfPt6neQidimdg=", + "lastModified": 1781751568, + "narHash": "sha256-hZAbXoNA4nCSaIJJLGl/EdErFtlnAS06jEp4oO7Qp6s=", "owner": "nix-community", "repo": "home-manager", - "rev": "1285cd3d6882a9847f2d56ed5541b3350c8a6162", + "rev": "5bcff43156c0eebe68759338b7879c8e1b2e2bd0", "type": "github" }, "original": { @@ -212,11 +156,11 @@ ] }, "locked": { - "lastModified": 1781706760, - "narHash": "sha256-jkSzXcasiZZ72q5f92FLHdIGAlGhX+124xQrbbczbF0=", + "lastModified": 1781989573, + "narHash": "sha256-npfH7Zv7t1akX/ArqCNro4zU4ViPlghLaPnbEfHbCxk=", "owner": "nix-community", "repo": "home-manager", - "rev": "a2e23ee8f8699f8971b4fde86efc1b7ec1e19681", + "rev": "78e7d8b13ecd7f5256a5c11ce216876164099d9f", "type": "github" }, "original": { @@ -225,79 +169,6 @@ "type": "github" } }, - "jovian": { - "inputs": { - "nix-github-actions": [ - "chaotic" - ], - "nixpkgs": [ - "chaotic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1781344759, - "narHash": "sha256-S6UBeQM7NLaQX6RZYS65fMypWfRQL/F4iRu0y8sTLPc=", - "owner": "Jovian-Experiments", - "repo": "Jovian-NixOS", - "rev": "ffac737e4117f7e9f070d38078801a5433f19d5b", - "type": "github" - }, - "original": { - "owner": "Jovian-Experiments", - "repo": "Jovian-NixOS", - "type": "github" - } - }, - "lanzaboote": { - "inputs": { - "crane": "crane", - "nixpkgs": [ - "nixpkgs" - ], - "pre-commit": "pre-commit", - "rust-overlay": "rust-overlay_2" - }, - "locked": { - "lastModified": 1765382359, - "narHash": "sha256-RJmgVDzjRI18BWVogG6wpsl1UCuV6ui8qr4DJ1LfWZ8=", - "owner": "nix-community", - "repo": "lanzaboote", - "rev": "e8c096ade12ec9130ff931b0f0e25d2f1bc63607", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "v1.0.0", - "repo": "lanzaboote", - "type": "github" - } - }, - "niks3": { - "inputs": { - "nixpkgs": [ - "chaotic", - "nixpkgs" - ], - "treefmt-nix": [ - "chaotic" - ] - }, - "locked": { - "lastModified": 1781027181, - "narHash": "sha256-IHIUd1/lYTaS4ilHZNV6+x0fchxDpvUdMjwnnEBASu4=", - "owner": "Mic92", - "repo": "niks3", - "rev": "c74d275536d9a38ff279b498612fae0fd68cfe85", - "type": "github" - }, - "original": { - "owner": "Mic92", - "repo": "niks3", - "rev": "c74d275536d9a38ff279b498612fae0fd68cfe85", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1771848320, @@ -316,11 +187,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1781074563, - "narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=", + "lastModified": 1781577229, + "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca", + "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", "type": "github" }, "original": { @@ -332,11 +203,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1781074563, - "narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=", + "lastModified": 1781577229, + "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca", + "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", "type": "github" }, "original": { @@ -372,82 +243,16 @@ "url": "https://devimages-cdn.apple.com/design/resources/download/NY.dmg" } }, - "pre-commit": { - "inputs": { - "flake-compat": "flake-compat", - "gitignore": "gitignore", - "nixpkgs": [ - "lanzaboote", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1765016596, - "narHash": "sha256-rhSqPNxDVow7OQKi4qS5H8Au0P4S3AYbawBSmJNUtBQ=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "548fc44fca28a5e81c5d6b846e555e6b9c2a5a3c", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, "root": { "inputs": { "apple-fonts": "apple-fonts", "chaotic": "chaotic", "home-manager": "home-manager_2", - "lanzaboote": "lanzaboote", "nixpkgs": "nixpkgs_3", "sidra": "sidra", "vscode-server": "vscode-server" } }, - "rust-overlay": { - "inputs": { - "nixpkgs": [ - "chaotic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1781493707, - "narHash": "sha256-lzf7qdQWuiY0T9VEbfH2CmP1LZQAYooU/sZuSgEJEBk=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "06f25b8e40805beb2121a4dae4cc37d6f981800f", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_2": { - "inputs": { - "nixpkgs": [ - "lanzaboote", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1765075567, - "narHash": "sha256-KFDCdQcHJ0hE3Nt5Gm5enRIhmtEifAjpxgUQ3mzSJpA=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "769156779b41e8787a46ca3d7d76443aaf68be6f", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "sf-arabic": { "flake": false, "locked": { @@ -475,7 +280,7 @@ "sf-compact": { "flake": false, "locked": { - "narHash": "sha256-oLhkN4HYkU1Xjxk+xdmyxJmROSzo1qd/tafdxw7icxs=", + "narHash": "sha256-C2TR3mVBorgBfdP7+L0YDq1ctefH62+iEBi19zlEpLU=", "type": "file", "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Compact.dmg" }, @@ -523,7 +328,7 @@ "sf-pro": { "flake": false, "locked": { - "narHash": "sha256-s42hsaUe0Vkaw5yw8G7G3W3AYJb2TPqSlMqPyY0e5WU=", + "narHash": "sha256-56SORX7J5qTO9xrd4Zvgfwr8GBUrIzLc6pzg5C0c+zU=", "type": "file", "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg" }, @@ -539,11 +344,11 @@ ] }, "locked": { - "lastModified": 1781412000, - "narHash": "sha256-XxKL+f+2+mQ6zbw1Aszx8WuH12rLdUQvEL1YppbKap4=", + "lastModified": 1781979797, + "narHash": "sha256-Xzxfh3rYe4fdBpYDWCdgFjpv3iT/NveUlvk+CLcfZ40=", "owner": "wimpysworld", "repo": "sidra", - "rev": "91665a8313d5ecf7c2e65e22bf7b029cc0d627bc", + "rev": "2e3c80ea31b48bf9d09363eff57c4327624b6b8e", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b4b40e0..0932be8 100644 --- a/flake.nix +++ b/flake.nix @@ -9,10 +9,6 @@ url = "github:wimpysworld/sidra"; inputs.nixpkgs.follows = "nixpkgs"; }; - lanzaboote = { - url = "github:nix-community/lanzaboote/v1.0.0"; - inputs.nixpkgs.follows = "nixpkgs"; - }; home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; @@ -20,7 +16,7 @@ vscode-server.url = "github:nix-community/nixos-vscode-server"; }; - outputs = { self, nixpkgs, chaotic, apple-fonts, lanzaboote, home-manager, sidra, vscode-server, ... }@inputs: { + outputs = { self, nixpkgs, chaotic, apple-fonts, home-manager, sidra, vscode-server, ... }@inputs: { nixosConfigurations = { miku-homelab = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; @@ -28,7 +24,6 @@ specialArgs = { inherit apple-fonts inputs; }; modules = [ ./hosts/miku-homelab - lanzaboote.nixosModules.lanzaboote home-manager.nixosModules.home-manager vscode-server.nixosModules.default chaotic.nixosModules.default diff --git a/hosts/miku-homelab/default.nix b/hosts/miku-homelab/default.nix index cdcd062..e85fa53 100644 --- a/hosts/miku-homelab/default.nix +++ b/hosts/miku-homelab/default.nix @@ -21,8 +21,12 @@ boot = { loader = { - systemd-boot.enable = true; efi.canTouchEfiVariables = true; + systemd-boot.enable = false; + limine = { + enable = true; + maxGenerations = 5; + }; }; plymouth.enable = true; initrd.kernelModules = [ "amdgpu" ]; diff --git a/modules/security/secureboot.nix b/modules/security/secureboot.nix index 19528e6..334f80e 100644 --- a/modules/security/secureboot.nix +++ b/modules/security/secureboot.nix @@ -1,11 +1,13 @@ -{ lib, ... }: +{ pkgs, lib, ... }: { - # Lanzaboote reemplaza al systemd-boot estándar - boot.loader.systemd-boot.enable = lib.mkForce false; + environment.systemPackages = with pkgs; [ + sbctl + ]; - boot.lanzaboote = { - enable = true; - pkiBundle = "/var/lib/sbctl"; + boot.loader.limine = { + secureBoot = { + enable = true; + }; }; }