This commit is contained in:
ari committed 2026-06-01 23:00:29 -04:00
1 parent acafdbbdd2
commit 47929714fb
7 files changed
+36 -24

No files matched your search

+19 -18
View File
@@ -17,24 +17,6 @@ export def "skyg profiles" [only_remote: bool = false] {
}
}
# Build configuration
export def "skyg build" [] {
cd $REPO_ROOT
nh os build | print
}
# Switch configuration
export def "skyg switch" [] {
cd $REPO_ROOT
nh os switch --ask | print
}
# test configuration
export def "skyg test" [] {
cd $REPO_ROOT
nh os test | print
}
export def "skyg check" [] {
nix flake check --no-build
}
@@ -57,10 +39,26 @@ export def "skyg update" [input_name: string = ""] {
git diff flake.lock | print
}
# Build local os
export def "skyg os" [
cmd: string@remote-cmds,
--build-host: string@remote_targets = ""
] {
cd $REPO_ROOT
mut runcmd = $"nh os ($cmd)"
if $build_host != "" {
$runcmd = $"($runcmd) --build-host ($build_host).lab.internal"
}
$runcmd | print
bash -c $runcmd
}
# Deploy to remote machine
export def "skyg remote" [
cmd: string@remote-cmds,
target: string@remote_targets = "",
--build-host: string@remote_targets = "", # Optional remote builder host (e.g. builder.lab.internal)
] {
cd $REPO_ROOT
mut target_host = $"root@($target).lab.internal"
@@ -72,6 +70,9 @@ export def "skyg remote" [
$"Using [(ansi green_bold)($profile)(ansi reset)]" | print
$"($cmd) on ($target_host) with ($profile)" | print
mut runcmd = $"nh os ($cmd) --target-host ($target_host) --ask .#($profile)"
if $build_host != "" {
$runcmd = $"($runcmd) --build-host ($build_host).lab.internal"
}
$runcmd | print
bash -c $runcmd
}
-1
View File
@@ -183,7 +183,6 @@ in
darling-dmg
# password
bitwarden-desktop
bitwarden-cli
# documents
+2 -2
View File
@@ -55,7 +55,7 @@
};
services.displayManager.defaultSession = "gnome";
services.displayManager.gdm.enable = false;
services.displayManager.gdm.wayland = false;
services.autosuspend.enable = false;
services.displayManager.autoLogin = {
enable = true;
@@ -96,7 +96,7 @@
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
boot.tmp.useTmpfs = true;
boot.kernelPackages = pkgs.linuxPackages_hardened;
boot.kernelPackages = pkgs.linuxPackages_latest; # linuxPackages_hardened was removed in 26.05
# Wake on Lan
networking.interfaces.enp4s0.wakeOnLan.enable = true;
networking.interfaces.lo.wakeOnLan.enable = true;
+13
View File
@@ -6,6 +6,19 @@
./nix-substituters.nix
];
config = {
# Workaround: pipx 1.8.0 test suite fails in nixpkgs 26.05 due to a whitespace
# normalization regression in PEP 508 URL specifiers (space before @ in URLs).
# Must use pythonPackagesExtensions to patch the python3Packages.pipx that
# the build system actually uses, not just the top-level pkgs.pipx wrapper.
nixpkgs.overlays = [
(final: prev: {
pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
(pyFinal: pyPrev: {
pipx = pyPrev.pipx.overrideAttrs (_: { doInstallCheck = false; });
})
];
})
];
# Remote Builder
nix.buildMachines = [
{
+1 -1
View File
@@ -88,7 +88,7 @@
plugins = with pkgs.nushellPlugins; [
polars
# net
highlight
# highlight # broken: compiled for nushell 0.110.0, nixpkgs 26.05 ships 0.112.2
];
};
carapace = {
-1
View File
@@ -9,6 +9,5 @@
./services
./timers.nix
./dns
./certbot.nix
];
}
+1 -1
View File
@@ -62,7 +62,7 @@ in
config = mkIf cfg.enable {
age.secrets = mkIf (cfg.addressesSecretName != null) {
${cfg.addressesSecretName} = {
file = ../../../../secrets + "/${cfg.addressesSecretName}.age";
file = ../../../../../secrets + "/${cfg.addressesSecretName}.age";
};
};