kylekrein/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update + remote build for some deploys

Browse source
This commit is contained in:
Aleksandr Lebedev 2025-10-22 00:41:33 +02:00
parent 9efd16c34f
commit a2878180cf
4 changed files with 45 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

54
flake.lock generated
View file

@ -451,11 +451,11 @@
"snowfall-lib": "snowfall-lib" "snowfall-lib": "snowfall-lib"
}, },
"locked": { "locked": {
"lastModified": 1760960573, "lastModified": 1761039988,
"narHash": "sha256-gfx0Nr3DinMMOmQLrmRchJpGULMrxSoK263RkeyHyv8=", "narHash": "sha256-+3D+UvjXbNJFeei8ST5oNQaNUqO56K/HmGX+KU0Zmqk=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "afe0269ecafaaf10f3662c280ecd21700048afe1", "rev": "063666c5a2f2a41b06ea3a393eb7c2998df51c95",
"revCount": 148, "revCount": 151,
"type": "git", "type": "git",
"url": "https://git.kylekrein.com/kylekrein/emacs-config" "url": "https://git.kylekrein.com/kylekrein/emacs-config"
}, },
@ -560,22 +560,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_11": {
"flake": false,
"locked": {
"lastModified": 1747046372,
"narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_2": { "flake-compat_2": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -878,6 +862,7 @@
}, },
"original": { "original": {
"owner": "gytis-ivaskevicius", "owner": "gytis-ivaskevicius",
"ref": "master",
"repo": "flake-utils-plus", "repo": "flake-utils-plus",
"type": "github" "type": "github"
} }
@ -1202,11 +1187,11 @@
}, },
"master": { "master": {
"locked": { "locked": {
"lastModified": 1760986326, "lastModified": 1761082581,
"narHash": "sha256-QBvURjr4CnOgCxCtkHT9Eslh+v5gNsPIA/AbgvsN5HM=", "narHash": "sha256-2MjpIfwSXomwup67MTRdi2LrEkoYKnl1mT+Z3lxidg4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "373ac7ddf180c86a355b37ce7503579d11e387db", "rev": "7d08a8522f8fd5feb0f694bd1da07f2e51be7d11",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1409,11 +1394,11 @@
}, },
"nixos-facter-modules": { "nixos-facter-modules": {
"locked": { "locked": {
"lastModified": 1756491981, "lastModified": 1761056547,
"narHash": "sha256-lXyDAWPw/UngVtQfgQ8/nrubs2r+waGEYIba5UX62+k=", "narHash": "sha256-j3T1QDLK/VPUFLyFHDjhCKrEUVIKOrTYKm2mkempK8M=",
"owner": "numtide", "owner": "numtide",
"repo": "nixos-facter-modules", "repo": "nixos-facter-modules",
"rev": "c1b29520945d3e148cd96618c8a0d1f850965d8c", "rev": "98434bad207101657df2491af88f625d2e82b7d7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1944,22 +1929,21 @@
}, },
"snowfall-lib_3": { "snowfall-lib_3": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_11",
"flake-utils-plus": "flake-utils-plus_3", "flake-utils-plus": "flake-utils-plus_3",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1754782494, "lastModified": 1759988077,
"narHash": "sha256-pSvIyyYP9wprEYbHvkwishLIpmLRrMdgxi5r8q9Ie44=", "narHash": "sha256-LUel3DQ6WoHwkb9R88awz9tGzGwBGrJJyQjn81qgeuM=",
"owner": "KyleKrein", "owner": "anntnzrb",
"repo": "snowfall-lib", "repo": "snowfall-lib",
"rev": "f0e35a78e9c874c6962fddc827965701c3f5ffd2", "rev": "1e41848ba9a198bd3cf9fda4603894e23d1da9a2",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "KyleKrein", "owner": "anntnzrb",
"repo": "snowfall-lib", "repo": "snowfall-lib",
"type": "github" "type": "github"
} }
@ -1969,11 +1953,11 @@
"nixpkgs": "nixpkgs_9" "nixpkgs": "nixpkgs_9"
}, },
"locked": { "locked": {
"lastModified": 1760845571, "lastModified": 1760998189,
"narHash": "sha256-PwGzU3EOU65Ef1VvuNnVLie+l+P0g/fzf/PGUG82KbM=", "narHash": "sha256-ee2e1/AeGL5X8oy/HXsZQvZnae6XfEVdstGopKucYLY=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "9c9a9798be331ed3f4b2902933d7677d0659ee61", "rev": "5a7d18b5c55642df5c432aadb757140edfeb70b3",
"type": "github" "type": "github"
}, },
"original": { "original": {

20
flake.nix
View file

@ -62,7 +62,7 @@
# The name "snowfall-lib" is required due to how Snowfall Lib processes your # The name "snowfall-lib" is required due to how Snowfall Lib processes your
# flake's inputs. # flake's inputs.
snowfall-lib = { snowfall-lib = {
url = "github:KyleKrein/snowfall-lib"; #"git+file:///home/kylekrein/Git/snowfall-lib"; url = "github:anntnzrb/snowfall-lib"; #"git+file:///home/kylekrein/Git/snowfall-lib";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
snowfall-flake = { snowfall-flake = {
@ -125,6 +125,18 @@
"olm-3.2.16" "olm-3.2.16"
]; ];
}; };
# Per-channel config
channels = {
nixpkgs-cuda = {
config = {
allowUnfree = true;
cudaSupport = true;
};
input = inputs.nixpkgs;
};
};
# Use custom channel for specific host
#systems.hosts.kylekrein-framework12.channelName = "nixpkgs-x86_64-v4";
overlays = with inputs; [ overlays = with inputs; [
emacs-kylekrein.overlays.default emacs-kylekrein.overlays.default
@ -163,7 +175,11 @@
inherit (inputs) self; inherit (inputs) self;
overrides = { overrides = {
user = "root"; user = "root";
stargate.hostname = "kylekrein.com"; stargate = {
hostname = "kylekrein.com";
remoteBuild = true;
};
kylekrein-homepc.remoteBuild = true;
}; };
exclude = ["kylekrein-wsl-wm" "kylekrein-server"]; exclude = ["kylekrein-wsl-wm" "kylekrein-server"];
}; };

4
lib/deploy/default.nix
View file

@ -31,6 +31,7 @@ in rec {
result: name: let result: name: let
host = hosts.${name}; host = hosts.${name};
user = overrides.user or null; user = overrides.user or null;
remoteBuild = overrides.remoteBuild or null;
inherit (host.pkgs) system; inherit (host.pkgs) system;
in in
result result
@ -51,6 +52,9 @@ in rec {
// lib.optionalAttrs (user != null) { // lib.optionalAttrs (user != null) {
sshUser = user; sshUser = user;
} }
// lib.optionalAttrs (remoteBuild != null) {
inherit remoteBuild;
}
// lib.optionalAttrs (host.config.system.security.doas.enable or false) { // lib.optionalAttrs (host.config.system.security.doas.enable or false) {
sudo = "doas -u"; sudo = "doas -u";
}; };

5
systems/x86_64-linux/stargate/services/nginx.nix
View file

@ -144,7 +144,10 @@ in {
locations."/" = { locations."/" = {
proxyPass = "http://${config.services.open-webui.host}:${builtins.toString config.services.open-webui.port}"; proxyPass = "http://${config.services.open-webui.host}:${builtins.toString config.services.open-webui.port}";
proxyWebsockets = true; proxyWebsockets = true;
#extraConfig = "proxy_buffering off;"; extraConfig = ''
proxy_send_timeout 7200;
proxy_read_timeout 7200;
'';
}; };
}; };
"smart-home.kylekrein.com" = { "smart-home.kylekrein.com" = {