Merge branch 'main' of ssh://git.0x76.dev:42/v/infrastructure
This commit is contained in:
commit
0e9ba39e82
18
flake.lock
18
flake.lock
|
@ -482,11 +482,11 @@
|
||||||
"utils": "utils_2"
|
"utils": "utils_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1679734653,
|
"lastModified": 1679746195,
|
||||||
"narHash": "sha256-cvSEiGtt0FLCkQqOE4REonQGLdGCVrIQJ859vMSHg4U=",
|
"narHash": "sha256-L4RT64g2QqsK/gwLkuZwlYPLOR63G8+oX34xCcgHrKM=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "a34aaad2ae159b66306ced0cbfa1eefac8c4343e",
|
"rev": "885a504f80227b98d137a84a888bf7faa36d00dc",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -903,11 +903,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_5": {
|
"nixpkgs_5": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1679616449,
|
"lastModified": 1679705136,
|
||||||
"narHash": "sha256-E6Fvb13mDFa1ZY4lDbTpKbjvUOA4gbh23GWRf3ZzOOw=",
|
"narHash": "sha256-MDlZUR7wJ3PlPtqwwoGQr3euNOe0vdSSteVVOef7tBY=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "a64e169e396460d6b5763a1de1dd197df8421688",
|
"rev": "8f40f2f90b9c9032d1b824442cfbbe0dbabd0dbd",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1002,11 +1002,11 @@
|
||||||
},
|
},
|
||||||
"nur": {
|
"nur": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1679730298,
|
"lastModified": 1679753190,
|
||||||
"narHash": "sha256-dMYnJqkn4aNy7xoRGSBN3wuX8+zk+9n9OnhzEgnQj1w=",
|
"narHash": "sha256-U2mE/kNA7iA2/wHrLj4Rei/69CrQhLdvlXSiaBtqaq0=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NUR",
|
"repo": "NUR",
|
||||||
"rev": "cada49f2b3fee8b5e050da8f339406cd378b7282",
|
"rev": "51ec8e4d4115486974c612c4e63bcb98c6ff06c0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -4,7 +4,7 @@ metadata:
|
||||||
name: renovate
|
name: renovate
|
||||||
namespace: services
|
namespace: services
|
||||||
spec:
|
spec:
|
||||||
schedule: "@hourly"
|
schedule: "@daily"
|
||||||
concurrencyPolicy: Forbid
|
concurrencyPolicy: Forbid
|
||||||
jobTemplate:
|
jobTemplate:
|
||||||
spec:
|
spec:
|
||||||
|
@ -18,7 +18,7 @@ spec:
|
||||||
emptyDir: {}
|
emptyDir: {}
|
||||||
containers:
|
containers:
|
||||||
- name: renovate
|
- name: renovate
|
||||||
image: renovate/renovate:35.20.1
|
image: renovate/renovate:35.21.0
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: config-volume
|
- name: config-volume
|
||||||
mountPath: /opt/renovate/
|
mountPath: /opt/renovate/
|
||||||
|
|
|
@ -30,14 +30,14 @@ in {
|
||||||
in {
|
in {
|
||||||
wg0 = {
|
wg0 = {
|
||||||
address = [ "10.66.153.191/32" "fc00:bbbb:bbbb:bb01::3:99be/128" ];
|
address = [ "10.66.153.191/32" "fc00:bbbb:bbbb:bb01::3:99be/128" ];
|
||||||
dns = [ "193.138.218.74" ];
|
dns = [ "10.64.0.1" ];
|
||||||
privateKeyFile = "${vs.rtorrent}/wireguardKey";
|
privateKeyFile = "${vs.rtorrent}/wireguardKey";
|
||||||
postUp = "${postUpScript}/bin/post_up || true";
|
postUp = "${postUpScript}/bin/post_up || true";
|
||||||
|
|
||||||
peers = [{
|
peers = [{
|
||||||
publicKey = "hnRorSW0YHlHAzGb4Uc/sjOqQIrqDnpJnTQi/n7Rp1c=";
|
publicKey = "DVui+5aifNFRIVDjH3v2y+dQ+uwI+HFZOd21ajbEpBo=";
|
||||||
allowedIPs = [ "0.0.0.0/0" "::/0" ];
|
allowedIPs = [ "0.0.0.0/0" "::/0" ];
|
||||||
endpoint = "185.65.134.223:51820";
|
endpoint = "185.65.134.82:51820";
|
||||||
persistentKeepalive = 25;
|
persistentKeepalive = 25;
|
||||||
}];
|
}];
|
||||||
};
|
};
|
||||||
|
|
|
@ -5,11 +5,18 @@ This is the NixOS config for my laptop `aoife`.
|
||||||
This is a Thinkpad Z16 Gen 1.
|
This is a Thinkpad Z16 Gen 1.
|
||||||
|
|
||||||
**CPU**: AMD Ryzen 9 PRO 6950H (16 cores) @ 4.935GHz
|
**CPU**: AMD Ryzen 9 PRO 6950H (16 cores) @ 4.935GHz
|
||||||
|
|
||||||
**RAM**: 32GB LPDDR5 6400MHz
|
**RAM**: 32GB LPDDR5 6400MHz
|
||||||
|
|
||||||
**SCREEN**: 16" 3840 x 2400 OLED
|
**SCREEN**: 16" 3840 x 2400 OLED
|
||||||
|
|
||||||
**GPU**: AMD Radeon™ RX 6500M, 4 GB, GDDR6
|
**GPU**: AMD Radeon™ RX 6500M, 4 GB, GDDR6
|
||||||
|
|
||||||
|
|
||||||
## Software
|
## Software
|
||||||
**OS**: NixOS
|
**OS**: NixOS
|
||||||
|
|
||||||
**DE**: Gnome
|
**DE**: Gnome
|
||||||
|
|
||||||
**Shell**: ZSH (grml)
|
**Shell**: ZSH (grml)
|
||||||
|
|
||||||
|
|
|
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
|
||||||
yarnOfflineCache = fetchYarnDeps {
|
yarnOfflineCache = fetchYarnDeps {
|
||||||
yarnLock = "${src}/yarn.lock";
|
yarnLock = "${src}/yarn.lock";
|
||||||
# sha256 = lib.fakeSha256;
|
# sha256 = lib.fakeSha256;
|
||||||
sha256 = "sha256-ObCGLw7R6wvq8GQj5MHa/0KV2TYABdNC4sQQ3x1YoQE=";
|
sha256 = "sha256-LfpNEZAV4xCiPDQrSOezgRqOLQgDqMplIbu48dOlk3k=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ fixup_yarn_lock nodejs-slim yarn mastodon-gems mastodon-gems.wrappedRuby ];
|
nativeBuildInputs = [ fixup_yarn_lock nodejs-slim yarn mastodon-gems mastodon-gems.wrappedRuby ];
|
||||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -2,8 +2,8 @@
|
||||||
{ fetchgit, applyPatches }: let
|
{ fetchgit, applyPatches }: let
|
||||||
src = fetchgit {
|
src = fetchgit {
|
||||||
url = "https://github.com/glitch-soc/mastodon.git";
|
url = "https://github.com/glitch-soc/mastodon.git";
|
||||||
rev = "ee4250545236e4330c46b43f4abfe94ad323d4d4";
|
rev = "00fe0f6cb4a736bbb5e633c567ddf7ac9a09ce69";
|
||||||
sha256 = "12rwz4dy107p711d1pj33lsd32fwns0b2nif755mwrz0vzp29gr6";
|
sha256 = "1shpwdxf2cjm0bqlsnarm6x3h7db784r7qda80bqy3ki5w65lwaf";
|
||||||
};
|
};
|
||||||
in applyPatches {
|
in applyPatches {
|
||||||
inherit src;
|
inherit src;
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
"4.1.0"
|
"4.1.1"
|
||||||
|
|
Loading…
Reference in a new issue