asonix/sbc-deploys
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update nixpkgs, linux. remove pinetab wireguard

Browse source
This commit is contained in:
asonix 2024-03-22 18:14:34 -05:00
parent d2a950fa36
commit 1c87315463
2 changed files with 24 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
flake.lock
View file

@ -43,11 +43,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1709126324, "lastModified": 1710146030,
"narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "d465f4819400de7c8d874d50b982301f28a84605", "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -58,11 +58,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1710806803, "lastModified": 1711001935,
"narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=", "narHash": "sha256-URtGpHue7HHZK0mrHnSf8wJ6OmMKYSsoLmJybrOLFSQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b06025f1533a1e07b6db3e75151caa155d1c7eb3", "rev": "20f77aa09916374aa3141cbc605c955626762c9a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -90,11 +90,11 @@
}, },
"nixpkgsUnstable": { "nixpkgsUnstable": {
"locked": { "locked": {
"lastModified": 1708807242, "lastModified": 1711001935,
"narHash": "sha256-sRTRkhMD4delO/hPxxi+XwLqPn8BuUq6nnj4JqLwOu0=", "narHash": "sha256-URtGpHue7HHZK0mrHnSf8wJ6OmMKYSsoLmJybrOLFSQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "73de017ef2d18a04ac4bfd0c02650007ccb31c2a", "rev": "20f77aa09916374aa3141cbc605c955626762c9a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -106,11 +106,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1709218635, "lastModified": 1710951922,
"narHash": "sha256-nytX/MkfqeTD4z7bMq4QRXcHxO9B3vRo9tM6fMtPFA8=", "narHash": "sha256-FOOBJ3DQenLpTNdxMHR2CpGZmYuctb92gF0lpiirZ30=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "068d4db604958d05d0b46c47f79b507d84dbc069", "rev": "f091af045dff8347d66d186a62d42aceff159456",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -133,15 +133,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1708971085, "lastModified": 1711144098,
"narHash": "sha256-ED3ERAoIncKRtQLiRR4lv1YP5OpV0h7pHnlPy68XKqQ=", "narHash": "sha256-ggCK/1WWZSl0GGBCdKlobcTiRlbltI2DsV+kN4yJGpk=",
"owner": "nabam", "owner": "asonix",
"repo": "nixos-rockchip", "repo": "nixos-rockchip",
"rev": "91d470ebe0f1affc27d1fb9d8c1114622cf9279c", "rev": "1eda5d7ac2f7cb3133abfa908df982fe1a19dcd4",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nabam", "owner": "asonix",
"ref": "asonix/linux-6-8-0",
"repo": "nixos-rockchip", "repo": "nixos-rockchip",
"type": "github" "type": "github"
} }
@ -164,11 +165,11 @@
"rockchip": "rockchip" "rockchip": "rockchip"
}, },
"locked": { "locked": {
"lastModified": 1709338157, "lastModified": 1711145370,
"narHash": "sha256-6Cvd0NKeFoyly5/vnueH95Xm+RLV9p87q0Pz48/31S4=", "narHash": "sha256-1mxoNq1RA6wneVoWDhlzvzTbXRGwQG+6HG+TSSxia3Q=",
"ref": "asonix/nabam-sd-image", "ref": "asonix/nabam-sd-image",
"rev": "300be3ab306cd6284bc25e785bfe6b323d031afe", "rev": "71be48374a6aac8893b49e35a159010086922629",
"revCount": 67, "revCount": 68,
"type": "git", "type": "git",
"url": "https://git.asonix.dog/asonix/sd-images" "url": "https://git.asonix.dog/asonix/sd-images"
}, },

15
flake.nix
View file

@ -961,18 +961,7 @@
pinetab2 = makeDesktopConfig { pinetab2 = makeDesktopConfig {
hostname = "pinetab2"; hostname = "pinetab2";
extraModules = [ extraModules = sd-images.packages.${system}.PineTab2.modules;
({ pkgs, ... }: {
sops.secrets.pinetabWireguardKey = {
format = "binary";
sopsFile = ./secrets/pinetabWireguardKey.bin;
};
})
({ config, ... }: wireguardModule {
address = "192.168.5.13/24";
privateKeyFile = config.sops.secrets.pinetabWireguardKey.path;
})
] ++ sd-images.packages.${system}.PineTab2.modules;
}; };
backup1 = backup1 =
@ -1348,7 +1337,7 @@
} }
{ {
name = "pinetab2"; name = "pinetab2";
ip = "192.168.5.13"; ip = "192.168.20.74";
} }
{ {
name = "jellyfin"; name = "jellyfin";