last fixes
This commit is contained in:
parent
1a6deba59b
commit
a6f69fe866
7 changed files with 39 additions and 37 deletions
43
flake.lock
43
flake.lock
|
@ -129,16 +129,17 @@
|
||||||
"treefmt-nix": "treefmt-nix"
|
"treefmt-nix": "treefmt-nix"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"dirtyRev": "0993fe45f63e5d66dbbe9f72c7fd68c6ab6e7ea8-dirty",
|
"lastModified": 1717429357,
|
||||||
"dirtyShortRev": "0993fe45-dirty",
|
"narHash": "sha256-C9TuCQ0YjYLGeVP5JOXTie9slJ8PQFUfpWNLzTXmfV0=",
|
||||||
"lastModified": 1717340201,
|
"ref": "refs/heads/main",
|
||||||
"narHash": "sha256-7Ic5EvSIhqwhC0kZuQXHZut1joQFXx8IpyH1JvEA0zo=",
|
"rev": "822afe08b5e6162219a833d00b75f1b71f83dcef",
|
||||||
|
"revCount": 2976,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "file:///home/palo/dev/clan-core"
|
"url": "https://git.clan.lol/clan/clan-core"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "file:///home/palo/dev/clan-core"
|
"url": "https://git.clan.lol/clan/clan-core"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"clan-fact-generators": {
|
"clan-fact-generators": {
|
||||||
|
@ -171,11 +172,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1716773194,
|
"lastModified": 1717177033,
|
||||||
"narHash": "sha256-rskkGmWlvYFb+CXedBiL8eWEuED0Es0XR4CkJ11RQKY=",
|
"narHash": "sha256-G3CZJafCO8WDy3dyA2EhpUJEmzd5gMJ2IdItAg0Hijw=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "disko",
|
"repo": "disko",
|
||||||
"rev": "10986091e47fb1180620b78438512b294b7e8f67",
|
"rev": "0274af4c92531ebfba4a5bd493251a143bc51f3c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -476,11 +477,11 @@
|
||||||
},
|
},
|
||||||
"nixos-2311": {
|
"nixos-2311": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1716767563,
|
"lastModified": 1717017538,
|
||||||
"narHash": "sha256-xaSLDTqKIU55HsCkDnzFKmPiJO2z1xAAvrhUlwlmT2M=",
|
"narHash": "sha256-S5kltvDDfNQM3xx9XcvzKEOyN2qk8Sa+aSOLqZ+1Ujc=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "0c007b36981bdbd69ccf0c7df30a174e63660667",
|
"rev": "64e468fd2652105710d86cd2ae3e65a5a6d58dec",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -559,11 +560,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1716786664,
|
"lastModified": 1717040312,
|
||||||
"narHash": "sha256-iszhOLhxnv+TX/XM2gAX4LhTCoMzLuG51ObZq/eyDx8=",
|
"narHash": "sha256-yI/en4IxuCEClIUpIs3QTyYCCtmSPLOhwLJclfNwdeg=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixos-images",
|
"repo": "nixos-images",
|
||||||
"rev": "2478833ef8cc6de3d9e331f53b6f3682e425f207",
|
"rev": "47bfb55316e105390dd761e0b6e8e0be09462b67",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -991,11 +992,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1716692524,
|
"lastModified": 1717297459,
|
||||||
"narHash": "sha256-sALodaA7Zkp/JD6ehgwc0UCBrSBfB4cX66uFGTsqeFU=",
|
"narHash": "sha256-cZC2f68w5UrJ1f+2NWGV9Gx0dEYmxwomWN2B0lx0QRA=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "962797a8d7f15ed7033031731d0bb77244839960",
|
"rev": "ab2a43b0d21d1d37d4d5726a892f714eaeb4b075",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1113,11 +1114,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1715940852,
|
"lastModified": 1717278143,
|
||||||
"narHash": "sha256-wJqHMg/K6X3JGAE9YLM0LsuKrKb4XiBeVaoeMNlReZg=",
|
"narHash": "sha256-u10aDdYrpiGOLoxzY/mJ9llST9yO8Q7K/UlROoNxzDw=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "treefmt-nix",
|
"repo": "treefmt-nix",
|
||||||
"rev": "2fba33a182602b9d49f0b2440513e5ee091d838b",
|
"rev": "3eb96ca1ae9edf792a8e0963cc92fddfa5a87706",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
14
flake.nix
14
flake.nix
|
@ -311,7 +311,7 @@
|
||||||
|
|
||||||
sternchen = clanSetup {
|
sternchen = clanSetup {
|
||||||
name = "sternchen";
|
name = "sternchen";
|
||||||
#host = "sternchen.secure";
|
#host = "sternchen.bear";
|
||||||
host = "192.168.178.25";
|
host = "192.168.178.25";
|
||||||
modules = [
|
modules = [
|
||||||
nixos-hardware.nixosModules.lenovo-thinkpad-x220
|
nixos-hardware.nixosModules.lenovo-thinkpad-x220
|
||||||
|
@ -338,7 +338,8 @@
|
||||||
|
|
||||||
cream = clanSetup {
|
cream = clanSetup {
|
||||||
name = "cream";
|
name = "cream";
|
||||||
host = "cream.private";
|
host = "cream.bear";
|
||||||
|
#host = "cream.private";
|
||||||
modules = [
|
modules = [
|
||||||
nixos-hardware.nixosModules.framework-12th-gen-intel
|
nixos-hardware.nixosModules.framework-12th-gen-intel
|
||||||
retiolum.nixosModules.retiolum
|
retiolum.nixosModules.retiolum
|
||||||
|
@ -359,7 +360,8 @@
|
||||||
|
|
||||||
cherry = clanSetup {
|
cherry = clanSetup {
|
||||||
name = "cherry";
|
name = "cherry";
|
||||||
host = "cherry.private";
|
host = "cherry.bear";
|
||||||
|
#host = "cherry.private";
|
||||||
modules = [
|
modules = [
|
||||||
nixos-hardware.nixosModules.framework-13th-gen-intel
|
nixos-hardware.nixosModules.framework-13th-gen-intel
|
||||||
homeManagerModules
|
homeManagerModules
|
||||||
|
@ -378,7 +380,8 @@
|
||||||
|
|
||||||
chungus = clanSetup {
|
chungus = clanSetup {
|
||||||
name = "chungus";
|
name = "chungus";
|
||||||
host = "chungus.private";
|
host = "chungus.bear";
|
||||||
|
#host = "chungus.private";
|
||||||
modules = [
|
modules = [
|
||||||
homeManagerModules
|
homeManagerModules
|
||||||
stylixModules
|
stylixModules
|
||||||
|
@ -398,7 +401,8 @@
|
||||||
|
|
||||||
orbi = clanSetup {
|
orbi = clanSetup {
|
||||||
name = "orbi";
|
name = "orbi";
|
||||||
host = "orbi.private";
|
host = "orbi.bear";
|
||||||
|
#host = "orbi.private";
|
||||||
# host = "95.216.66.212";
|
# host = "95.216.66.212";
|
||||||
modules = [
|
modules = [
|
||||||
{
|
{
|
||||||
|
|
|
@ -17,10 +17,10 @@ in
|
||||||
config = mkIf (config.components.terminal.hoard.enable) {
|
config = mkIf (config.components.terminal.hoard.enable) {
|
||||||
|
|
||||||
# todo : sync via syncthing
|
# todo : sync via syncthing
|
||||||
backup.dirs = [
|
#backup.dirs = [
|
||||||
"/root/.config/hoard"
|
# "/root/.config/hoard"
|
||||||
"/home/palo/.config/hoard"
|
# "/home/palo/.config/hoard"
|
||||||
];
|
#];
|
||||||
|
|
||||||
environment.systemPackages = [ pkgs.legacy_2211.hoard ];
|
environment.systemPackages = [ pkgs.legacy_2211.hoard ];
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ pkgs, config, ... }:
|
{ pkgs, config, factsGenerator, ... }:
|
||||||
{
|
{
|
||||||
networking.firewall.allowedUDPPorts = [ 51820 ];
|
networking.firewall.allowedUDPPorts = [ 51820 ];
|
||||||
clanCore.facts.services.wireguard = factsGenerator.wireguard { name = "wg0"; };
|
clanCore.facts.services.wireguard = factsGenerator.wireguard { name = "wg0"; };
|
||||||
|
|
|
@ -30,6 +30,4 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
backup.dirs = [ "/var/lib/gitea" ];
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
{ config, lib, pkgs, ... }: {
|
{ config, lib, pkgs, factsGenerator, ... }: {
|
||||||
|
|
||||||
|
# todo: backup taskserver via zfs syncoid
|
||||||
services.taskserver = {
|
services.taskserver = {
|
||||||
enable = true;
|
enable = true;
|
||||||
fqdn = "taskd.ingolf-wagner.de";
|
fqdn = "taskd.ingolf-wagner.de";
|
||||||
|
@ -14,6 +15,4 @@
|
||||||
networking.firewall.allowedTCPPorts = [ config.services.taskserver.listenPort ];
|
networking.firewall.allowedTCPPorts = [ config.services.taskserver.listenPort ];
|
||||||
networking.firewall.allowedUDPPorts = [ config.services.taskserver.listenPort ];
|
networking.firewall.allowedUDPPorts = [ config.services.taskserver.listenPort ];
|
||||||
|
|
||||||
backup.dirs = [ config.services.taskserver.dataDir ];
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ config, pkgs, ... }:
|
{ config, pkgs, factsGenerator, ... }:
|
||||||
let
|
let
|
||||||
# 1. create DNS entry `matrix.terranix.org A - 95.216.66.212`
|
# 1. create DNS entry `matrix.terranix.org A - 95.216.66.212`
|
||||||
# 2. test with : https://federationtester.matrix.org/#terranix.org
|
# 2. test with : https://federationtester.matrix.org/#terranix.org
|
||||||
|
|
Loading…
Reference in a new issue