last fixes

This commit is contained in:
Ingolf Wagner 2024-06-03 20:49:32 +02:00
parent 1a6deba59b
commit a6f69fe866
No known key found for this signature in database
GPG key ID: 76BF5F1928B9618B
7 changed files with 39 additions and 37 deletions

View file

@ -129,16 +129,17 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
"dirtyRev": "0993fe45f63e5d66dbbe9f72c7fd68c6ab6e7ea8-dirty",
"dirtyShortRev": "0993fe45-dirty",
"lastModified": 1717340201,
"narHash": "sha256-7Ic5EvSIhqwhC0kZuQXHZut1joQFXx8IpyH1JvEA0zo=",
"lastModified": 1717429357,
"narHash": "sha256-C9TuCQ0YjYLGeVP5JOXTie9slJ8PQFUfpWNLzTXmfV0=",
"ref": "refs/heads/main",
"rev": "822afe08b5e6162219a833d00b75f1b71f83dcef",
"revCount": 2976,
"type": "git",
"url": "file:///home/palo/dev/clan-core"
"url": "https://git.clan.lol/clan/clan-core"
},
"original": {
"type": "git",
"url": "file:///home/palo/dev/clan-core"
"url": "https://git.clan.lol/clan/clan-core"
}
},
"clan-fact-generators": {
@ -171,11 +172,11 @@
]
},
"locked": {
"lastModified": 1716773194,
"narHash": "sha256-rskkGmWlvYFb+CXedBiL8eWEuED0Es0XR4CkJ11RQKY=",
"lastModified": 1717177033,
"narHash": "sha256-G3CZJafCO8WDy3dyA2EhpUJEmzd5gMJ2IdItAg0Hijw=",
"owner": "nix-community",
"repo": "disko",
"rev": "10986091e47fb1180620b78438512b294b7e8f67",
"rev": "0274af4c92531ebfba4a5bd493251a143bc51f3c",
"type": "github"
},
"original": {
@ -476,11 +477,11 @@
},
"nixos-2311": {
"locked": {
"lastModified": 1716767563,
"narHash": "sha256-xaSLDTqKIU55HsCkDnzFKmPiJO2z1xAAvrhUlwlmT2M=",
"lastModified": 1717017538,
"narHash": "sha256-S5kltvDDfNQM3xx9XcvzKEOyN2qk8Sa+aSOLqZ+1Ujc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0c007b36981bdbd69ccf0c7df30a174e63660667",
"rev": "64e468fd2652105710d86cd2ae3e65a5a6d58dec",
"type": "github"
},
"original": {
@ -559,11 +560,11 @@
]
},
"locked": {
"lastModified": 1716786664,
"narHash": "sha256-iszhOLhxnv+TX/XM2gAX4LhTCoMzLuG51ObZq/eyDx8=",
"lastModified": 1717040312,
"narHash": "sha256-yI/en4IxuCEClIUpIs3QTyYCCtmSPLOhwLJclfNwdeg=",
"owner": "nix-community",
"repo": "nixos-images",
"rev": "2478833ef8cc6de3d9e331f53b6f3682e425f207",
"rev": "47bfb55316e105390dd761e0b6e8e0be09462b67",
"type": "github"
},
"original": {
@ -991,11 +992,11 @@
]
},
"locked": {
"lastModified": 1716692524,
"narHash": "sha256-sALodaA7Zkp/JD6ehgwc0UCBrSBfB4cX66uFGTsqeFU=",
"lastModified": 1717297459,
"narHash": "sha256-cZC2f68w5UrJ1f+2NWGV9Gx0dEYmxwomWN2B0lx0QRA=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "962797a8d7f15ed7033031731d0bb77244839960",
"rev": "ab2a43b0d21d1d37d4d5726a892f714eaeb4b075",
"type": "github"
},
"original": {
@ -1113,11 +1114,11 @@
]
},
"locked": {
"lastModified": 1715940852,
"narHash": "sha256-wJqHMg/K6X3JGAE9YLM0LsuKrKb4XiBeVaoeMNlReZg=",
"lastModified": 1717278143,
"narHash": "sha256-u10aDdYrpiGOLoxzY/mJ9llST9yO8Q7K/UlROoNxzDw=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "2fba33a182602b9d49f0b2440513e5ee091d838b",
"rev": "3eb96ca1ae9edf792a8e0963cc92fddfa5a87706",
"type": "github"
},
"original": {

View file

@ -311,7 +311,7 @@
sternchen = clanSetup {
name = "sternchen";
#host = "sternchen.secure";
#host = "sternchen.bear";
host = "192.168.178.25";
modules = [
nixos-hardware.nixosModules.lenovo-thinkpad-x220
@ -338,7 +338,8 @@
cream = clanSetup {
name = "cream";
host = "cream.private";
host = "cream.bear";
#host = "cream.private";
modules = [
nixos-hardware.nixosModules.framework-12th-gen-intel
retiolum.nixosModules.retiolum
@ -359,7 +360,8 @@
cherry = clanSetup {
name = "cherry";
host = "cherry.private";
host = "cherry.bear";
#host = "cherry.private";
modules = [
nixos-hardware.nixosModules.framework-13th-gen-intel
homeManagerModules
@ -378,7 +380,8 @@
chungus = clanSetup {
name = "chungus";
host = "chungus.private";
host = "chungus.bear";
#host = "chungus.private";
modules = [
homeManagerModules
stylixModules
@ -398,7 +401,8 @@
orbi = clanSetup {
name = "orbi";
host = "orbi.private";
host = "orbi.bear";
#host = "orbi.private";
# host = "95.216.66.212";
modules = [
{

View file

@ -17,10 +17,10 @@ in
config = mkIf (config.components.terminal.hoard.enable) {
# todo : sync via syncthing
backup.dirs = [
"/root/.config/hoard"
"/home/palo/.config/hoard"
];
#backup.dirs = [
# "/root/.config/hoard"
# "/home/palo/.config/hoard"
#];
environment.systemPackages = [ pkgs.legacy_2211.hoard ];

View file

@ -1,4 +1,4 @@
{ pkgs, config, ... }:
{ pkgs, config, factsGenerator, ... }:
{
networking.firewall.allowedUDPPorts = [ 51820 ];
clanCore.facts.services.wireguard = factsGenerator.wireguard { name = "wg0"; };

View file

@ -30,6 +30,4 @@
};
};
backup.dirs = [ "/var/lib/gitea" ];
}

View file

@ -1,5 +1,6 @@
{ config, lib, pkgs, ... }: {
{ config, lib, pkgs, factsGenerator, ... }: {
# todo: backup taskserver via zfs syncoid
services.taskserver = {
enable = true;
fqdn = "taskd.ingolf-wagner.de";
@ -14,6 +15,4 @@
networking.firewall.allowedTCPPorts = [ config.services.taskserver.listenPort ];
networking.firewall.allowedUDPPorts = [ config.services.taskserver.listenPort ];
backup.dirs = [ config.services.taskserver.dataDir ];
}

View file

@ -1,4 +1,4 @@
{ config, pkgs, ... }:
{ config, pkgs, factsGenerator, ... }:
let
# 1. create DNS entry `matrix.terranix.org A - 95.216.66.212`
# 2. test with : https://federationtester.matrix.org/#terranix.org