From d8cd889e1da2a16c21ecb69ea79a3ac566a5d9c1 Mon Sep 17 00:00:00 2001 From: Jack O'Sullivan Date: Sun, 15 Nov 2026 13:05:13 +0000 Subject: [PATCH] nixos/gui: Add bootvine --- flake.lock | 67 ++++++++++++++++++++++++++++++++--- flake.nix | 4 +++ nixos/modules/common.nix | 1 + nixos/modules/gui/default.nix | 2 ++ 4 files changed, 70 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index ecf385c..d75b423 100644 --- a/flake.lock +++ b/flake.lock @@ -47,6 +47,28 @@ "type": "github" } }, + "bootvine": { + "inputs": { + "crane": "crane", + "nixpkgs": [ + "nixpkgs-unstable" + ], + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1794730498, + "narHash": "sha256-pwzcPy/J/zeOVRfUZgcPgBWFaSnnH7GQlGoOfBfX3eQ=", + "ref": "refs/heads/main", + "rev": "91b7cd28c25d339d79f83956ba7d6ba99fdbe0d3", + "revCount": 135, + "type": "git", + "url": "https://codeberg.org/wvhulle/bootvine" + }, + "original": { + "type": "git", + "url": "https://codeberg.org/wvhulle/bootvine" + } + }, "borgthin": { "inputs": { "devshell": "devshell_2", @@ -123,6 +145,21 @@ } }, "crane": { + "locked": { + "lastModified": 1793836618, + "narHash": "sha256-TREenflwEjxOSq292FYwbc3kEm7TDRtXCZRNWEdjBmg=", + "owner": "ipetkov", + "repo": "crane", + "rev": "79fd63528501446749c09f08cad486a58c7d173e", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "crane_2": { "locked": { "lastModified": 1787326676, "narHash": "sha256-lWhBbBvC05/xwivKBBiM2YNizpmgqCgyOIzomvRuwxs=", @@ -137,7 +174,7 @@ "type": "github" } }, - "crane_2": { + "crane_3": { "locked": { "lastModified": 1760924934, "narHash": "sha256-tuuqY5aU7cUkR71sO2TraVKK2boYrdW3gCSXUkF4i44=", @@ -546,7 +583,7 @@ }, "harmonia": { "inputs": { - "crane": "crane", + "crane": "crane_2", "nix": "nix", "nixpkgs": [ "nixpkgs-unstable" @@ -1002,12 +1039,12 @@ "ragenix": { "inputs": { "agenix": "agenix", - "crane": "crane_2", + "crane": "crane_3", "flake-utils": "flake-utils_9", "nixpkgs": [ "nixpkgs-unstable" ], - "rust-overlay": "rust-overlay" + "rust-overlay": "rust-overlay_2" }, "locked": { "lastModified": 1764843533, @@ -1027,6 +1064,7 @@ "root": { "inputs": { "boardie": "boardie", + "bootvine": "bootvine", "borgthin": "borgthin", "copyparty": "copyparty", "deploy-rs": "deploy-rs", @@ -1051,6 +1089,27 @@ } }, "rust-overlay": { + "inputs": { + "nixpkgs": [ + "bootvine", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1794646145, + "narHash": "sha256-rpqDyUM/d5fACYB8W+wKxxO57ICWjjalzb2X25oFFkY=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "5b87ee0513c29127a01ad06e9cb362ea5ce91e78", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_2": { "inputs": { "nixpkgs": [ "ragenix", diff --git a/flake.nix b/flake.nix index cb30293..ef37e7e 100644 --- a/flake.nix +++ b/flake.nix @@ -87,6 +87,10 @@ # the source is already realised there. Re-enable (and revisit upstream) if we start using pi. # pi-agent.url = "github:lukasl-dev/pi.nix"; # pi-agent.inputs.nixpkgs.follows = "nixpkgs-unstable"; + bootvine = { + url = "git+https://codeberg.org/wvhulle/bootvine"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; + }; }; outputs = diff --git a/nixos/modules/common.nix b/nixos/modules/common.nix index 354617d..aa948a8 100644 --- a/nixos/modules/common.nix +++ b/nixos/modules/common.nix @@ -13,6 +13,7 @@ in inputs.ragenix.nixosModules.age inputs.copyparty.nixosModules.default inputs.harmonia.nixosModules.harmonia + inputs.bootvine.nixosModules.default ]; config = mkMerge [ diff --git a/nixos/modules/gui/default.nix b/nixos/modules/gui/default.nix index b22d02e..363803b 100644 --- a/nixos/modules/gui/default.nix +++ b/nixos/modules/gui/default.nix @@ -84,6 +84,8 @@ in SUBSYSTEM=="usb", ATTR{idVendor}=="6969", MODE="0664", GROUP="wheel" ''; }; + + bootvine.enable = true; }; programs.dconf.enable = true;