Lots of jude updates
This commit is contained in:
Generated
+3
-3
@@ -406,11 +406,11 @@
|
|||||||
},
|
},
|
||||||
"nixunstable": {
|
"nixunstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1701436327,
|
"lastModified": 1703255338,
|
||||||
"narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=",
|
"narHash": "sha256-Z6wfYJQKmDN9xciTwU3cOiOk+NElxdZwy/FiHctCzjU=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "91050ea1e57e50388fa87a3302ba12d188ef723a",
|
"rev": "6df37dc6a77654682fe9f071c62b4242b5342e04",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ in
|
|||||||
gnucash
|
gnucash
|
||||||
jellyfin-media-player
|
jellyfin-media-player
|
||||||
libreoffice
|
libreoffice
|
||||||
logseq
|
#logseq
|
||||||
nextcloud-client
|
nextcloud-client
|
||||||
]) ++
|
]) ++
|
||||||
|
|
||||||
|
|||||||
@@ -51,7 +51,6 @@
|
|||||||
openssl
|
openssl
|
||||||
setup-ssh
|
setup-ssh
|
||||||
tmux
|
tmux
|
||||||
transcrypt
|
|
||||||
tree
|
tree
|
||||||
unzip
|
unzip
|
||||||
wget
|
wget
|
||||||
|
|||||||
+1
-1
@@ -28,7 +28,7 @@
|
|||||||
GOPATH = "${config.home.homeDirectory}/src/go";
|
GOPATH = "${config.home.homeDirectory}/src/go";
|
||||||
GOBIN = "${config.home.homeDirectory}/src/bin";
|
GOBIN = "${config.home.homeDirectory}/src/bin";
|
||||||
|
|
||||||
EFI_DIR = "${pkgs.OVMF}/FV/";
|
EFI_DIR = "${pkgs.OVMF.fd}/FV/";
|
||||||
};
|
};
|
||||||
|
|
||||||
aliases = {
|
aliases = {
|
||||||
|
|||||||
+4
-11
@@ -5,6 +5,7 @@
|
|||||||
dmidecode
|
dmidecode
|
||||||
guestfs-tools
|
guestfs-tools
|
||||||
libguestfs
|
libguestfs
|
||||||
|
OVMFFull
|
||||||
ovftool
|
ovftool
|
||||||
packer
|
packer
|
||||||
virt-manager
|
virt-manager
|
||||||
@@ -19,6 +20,7 @@
|
|||||||
libvirtd = {
|
libvirtd = {
|
||||||
enable = true;
|
enable = true;
|
||||||
onBoot = "ignore"; # Do not auto-restart VMs on boot, unless they are marked autostart
|
onBoot = "ignore"; # Do not auto-restart VMs on boot, unless they are marked autostart
|
||||||
|
qemu.ovmf.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
virtualbox.host = {
|
virtualbox.host = {
|
||||||
@@ -26,6 +28,8 @@
|
|||||||
enableExtensionPack = true;
|
enableExtensionPack = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
vmware.host.enable = true;
|
||||||
|
|
||||||
waydroid.enable = false;
|
waydroid.enable = false;
|
||||||
lxd.enable = false;
|
lxd.enable = false;
|
||||||
};
|
};
|
||||||
@@ -33,15 +37,4 @@
|
|||||||
users.extraGroups.vboxusers.members = [ "greg" ];
|
users.extraGroups.vboxusers.members = [ "greg" ];
|
||||||
|
|
||||||
boot.extraModprobeConfig = "options kvm_amd nested=1";
|
boot.extraModprobeConfig = "options kvm_amd nested=1";
|
||||||
|
|
||||||
greg.ci-runner = {
|
|
||||||
qemu = {
|
|
||||||
labels = [
|
|
||||||
"qemu:host"
|
|
||||||
];
|
|
||||||
packages = with pkgs; [
|
|
||||||
qemu
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|||||||
+20
-2
@@ -7,15 +7,32 @@ let
|
|||||||
enable = true;
|
enable = true;
|
||||||
hostPackages = with pkgs; [
|
hostPackages = with pkgs; [
|
||||||
bashInteractive
|
bashInteractive
|
||||||
podman
|
coreutils
|
||||||
|
curl
|
||||||
|
gawk
|
||||||
git
|
git
|
||||||
|
gnused
|
||||||
nodejs
|
nodejs
|
||||||
|
nodejs_20
|
||||||
|
podman
|
||||||
|
pup
|
||||||
|
gregpy
|
||||||
|
shellcheck
|
||||||
|
wget
|
||||||
] ++ value.packages;
|
] ++ value.packages;
|
||||||
labels = lib.mkIf ( builtins.hasAttr "labels" value) value.labels;
|
labels = lib.mkIf ( builtins.hasAttr "labels" value) value.labels;
|
||||||
name = config.networking.hostName;
|
name = config.networking.hostName;
|
||||||
tokenFile = config.age.secrets.forgejo-runner.path;
|
tokenFile = config.age.secrets.forgejo-runner.path;
|
||||||
url = "https://src.thehellings.com";
|
url = "https://src.thehellings.com";
|
||||||
settings.runner.capacity = value.parallel;
|
settings = {
|
||||||
|
runner.capacity = value.parallel;
|
||||||
|
container.network = "host";
|
||||||
|
cache.enabled = true;
|
||||||
|
host = {
|
||||||
|
workdir_parent = "/var/lib/private/gitea-runner/${name}";
|
||||||
|
};
|
||||||
|
lxc.enabled = false;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
userName = "gitea-runner";
|
userName = "gitea-runner";
|
||||||
@@ -65,6 +82,7 @@ in with lib; {
|
|||||||
|
|
||||||
config = mkIf ( runnerNames != [] ) {
|
config = mkIf ( runnerNames != [] ) {
|
||||||
services.gitea-actions-runner.instances = ( mapAttrs makeRunner cfg);
|
services.gitea-actions-runner.instances = ( mapAttrs makeRunner cfg);
|
||||||
|
#services.gitea-actions-runner.package = pkgs.forgejo-actions-runner;
|
||||||
|
|
||||||
age.secrets.forgejo-runner = let
|
age.secrets.forgejo-runner = let
|
||||||
aName = builtins.elemAt runnerNames 0;
|
aName = builtins.elemAt runnerNames 0;
|
||||||
|
|||||||
Binary file not shown.
Reference in New Issue
Block a user