From 7e88934121ccf3fb355ad1c9190e2f2c265afd6e Mon Sep 17 00:00:00 2001 From: adarsh Date: Thu, 6 Mar 2025 10:16:49 +0100 Subject: [PATCH 1/4] trusted users --- configurations/extra/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configurations/extra/default.nix b/configurations/extra/default.nix index 0579d8a..7921059 100644 --- a/configurations/extra/default.nix +++ b/configurations/extra/default.nix @@ -2,7 +2,7 @@ imports = [ ../base/default.nix ]; nix.settings = { - trusted-users = [ "@wheel" ]; + trusted-users = [ "root" "nixbld" "@wheel" ]; experimental-features = [ "nix-command" "flakes" ]; }; From 9ca80a961894cbf3442bb693da4f439360447802 Mon Sep 17 00:00:00 2001 From: adarsh Date: Thu, 6 Mar 2025 10:24:10 +0100 Subject: [PATCH 2/4] Disk Size in virtualisation settings --- modules/virtualisation/qemu-vm.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix index b81290a..19c4702 100644 --- a/modules/virtualisation/qemu-vm.nix +++ b/modules/virtualisation/qemu-vm.nix @@ -223,18 +223,18 @@ let source = if config.boot.loader.espContents == null then throw "The bootloader configuration did not provide an EFI sys tem partition but the drive layout is asking for it!" else config.boot.loader.espContents; }]; - totalSize = "64m"; + totalSize = "128m"; }; freebsdRootPartition = pkgs.callPackage ../../lib/make-partition-image.nix (commonRoot // { filesystem = "ufs"; - totalSize = "10g"; + totalSize = "60g"; }); openbsdRootPartition = pkgs.callPackage ../../lib/make-partition-image.nix (commonRoot // { filesystem = "ufs"; ufsVersion = "1"; - totalSize = "10g"; + totalSize = "60g"; contents = commonRoot.contents ++ [{ target = "/dev/MAKEDEV"; source = getExe pkgs.openbsd.makedev; From af445b681a555855a2ddfdf86a46f3e9085c724a Mon Sep 17 00:00:00 2001 From: adarsh Date: Thu, 6 Mar 2025 10:47:57 +0100 Subject: [PATCH 3/4] Lix-FreeBSD url --- flake.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 6ec7ec8..95f196c 100644 --- a/flake.nix +++ b/flake.nix @@ -1,8 +1,8 @@ { inputs = { - nixpkgs.url = "github:rhelmot/nixpkgs/nixbsd-dev-old"; + nixpkgs.url = "github:rhelmot/nixpkgs/nixbsd-dev"; lix = { - url = "git+https://git.lix.systems/artemist/lix.git?ref=freebsd-build"; + url = "git+https://git.lix.systems/artemist/lix/src/branch/freebsd-build"; inputs.nixpkgs.follows = "nixpkgs"; # We don't need another nixpkgs clone, it won't evaluate anyway inputs.nixpkgs-regression.follows = "nixpkgs"; @@ -15,7 +15,7 @@ }; nixConfig = { - extra-substituters = [ "https://attic.mildlyfunctional.gay/nixbsd" ]; + extra-trusted-substituters = [ "https://attic.mildlyfunctional.gay/nixbsd" ]; extra-trusted-public-keys = [ "nixbsd:gwcQlsUONBLrrGCOdEboIAeFq9eLaDqfhfXmHZs1mgc=" ]; }; From 957b7eea3b49bc7f3236af8270114666929c9acc Mon Sep 17 00:00:00 2001 From: adarsh Date: Thu, 6 Mar 2025 12:43:40 +0100 Subject: [PATCH 4/4] updated flake lock --- flake.lock | 18 +++++++++--------- flake.nix | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index 3099ff2..b882a42 100644 --- a/flake.lock +++ b/flake.lock @@ -2,12 +2,12 @@ "nodes": { "flake-compat": { "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "revCount": 57, + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "revCount": 69, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz" }, "original": { "type": "tarball", @@ -95,16 +95,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1736295839, - "narHash": "sha256-57XSAN9RCVg5dE6rYkIwRLZDYb9ez0NcrUix3xqFBjM=", + "lastModified": 1736741821, + "narHash": "sha256-gQFQ+z48jn1LZzQ6SlnjPNqpbasgp4LYvoZ2WNCNo/8=", "owner": "rhelmot", "repo": "nixpkgs", - "rev": "5da7699e4aa8a08f3279a1381a81f701ae4ebe63", + "rev": "4ba1c805e5d8c33cd5932878ee40a1b070f14f10", "type": "github" }, "original": { "owner": "rhelmot", - "ref": "nixbsd-dev-old", + "ref": "nixbsd-dev", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 95f196c..0904de0 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ inputs = { nixpkgs.url = "github:rhelmot/nixpkgs/nixbsd-dev"; lix = { - url = "git+https://git.lix.systems/artemist/lix/src/branch/freebsd-build"; + url = "git+https://git.lix.systems/artemist/lix.git?ref=freebsd-build"; inputs.nixpkgs.follows = "nixpkgs"; # We don't need another nixpkgs clone, it won't evaluate anyway inputs.nixpkgs-regression.follows = "nixpkgs";