From 2828cef769b0f0c65f573cbe6153696b98759b09 Mon Sep 17 00:00:00 2001 From: Lukas Wurzinger Date: Wed, 26 Mar 2025 16:12:29 +0000 Subject: [PATCH] repair --- classes/headful/gtk.nix | 5 ---- modules/secure-boot.nix | 26 ++++++++-------- packages/puter/puter.bash | 62 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 75 insertions(+), 18 deletions(-) delete mode 100644 classes/headful/gtk.nix diff --git a/classes/headful/gtk.nix b/classes/headful/gtk.nix deleted file mode 100644 index 34ada01..0000000 --- a/classes/headful/gtk.nix +++ /dev/null @@ -1,5 +0,0 @@ -{pkgs, ...}: { - xdg.portal.extraPortals = [pkgs.xdg-desktop-portal-gtk]; - - programs.dconf.enable = true; -} diff --git a/modules/secure-boot.nix b/modules/secure-boot.nix index 7a37fce..91955c3 100644 --- a/modules/secure-boot.nix +++ b/modules/secure-boot.nix @@ -1,28 +1,28 @@ { config, lib, - inputs, - pkgs, + # inputs, + # pkgs, ... }: let cfg = config.setups.secureBoot; in { - imports = [ - inputs.lanzaboote.nixosModules.lanzaboote - ]; + # imports = [ + # inputs.lanzaboote.nixosModules.lanzaboote + # ]; options.setups.secureBoot.enable = lib.mkEnableOption "Secure Boot"; config = lib.mkIf cfg.enable { - environment.systemPackages = [ - pkgs.sbctl - ]; + # environment.systemPackages = [ + # pkgs.sbctl + # ]; - boot.loader.systemd-boot.enable = lib.mkForce false; + # boot.loader.systemd-boot.enable = lib.mkForce false; - boot.lanzaboote = { - enable = lib.mkForce true; - pkiBundle = lib.mkDefault "/var/lib/sbctl"; - }; + # boot.lanzaboote = { + # enable = lib.mkForce true; + # pkiBundle = lib.mkDefault "/var/lib/sbctl"; + # }; }; } diff --git a/packages/puter/puter.bash b/packages/puter/puter.bash index 75c982e..3f242ff 100644 --- a/packages/puter/puter.bash +++ b/packages/puter/puter.bash @@ -124,6 +124,68 @@ b | boot) run boot ;; +t | test) + shift + + if (($# > 0)); then + error 'too many arguments' + fi + + run test + ;; +bld | build) + shift + + if (($# > 0)); then + error 'too many arguments' + fi + + run build + ;; +dbld | dry-build) + shift + + if (($# > 0)); then + error 'too many arguments' + fi + + run dry-build + ;; +da | dry-activate) + shift + + if (($# > 0)); then + error 'too many arguments' + fi + + run dry-activate + ;; +vm | build-vm) + shift + + if (($# > 0)); then + error 'too many arguments' + fi + + run build-vm + ;; +i | img | build-image) + shift + + if (($# < 1)); then + error 'image variant is required' + fi + + if (($# > 1)); then + error 'too many arguments' + fi + + variant=$1 + + flags+=("$variant") + + run build-image + ;; *) error 'invalid subcommand' ;;