hacc/haccfiles
8
0
Fork 1
Code Issues 1 Pull requests Projects Releases Wiki Activity

Revert "security: remove hexchen"

Browse source 
This reverts commit bab826b1c7.
Also fixes hexchen nix due new logic
This commit is contained in:
schweby 2021-03-26 21:54:16 +01:00
parent 5579a60b4e
commit 1064836092
No known key found for this signature in database
GPG key ID: 3A489DBB732B9614
4 changed files with 39 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/hexchen.nix
View file

@ -4,6 +4,6 @@ let
sources = import ../nix/sources.nix;
in {
imports = [
(import sources.nix-hexchen).users.hexchen.base
(import sources.nix-hexchen {}).users.hexchen.base
];
}

16
common/users.nix
View file

@ -1,9 +1,9 @@
{ config, pkgs, lib, ... }:
{
# imports = [
# ./hexchen.nix
# ];
imports = [
./hexchen.nix
];
home-manager.useGlobalPkgs = true;
@ -13,11 +13,11 @@
};
# all the actual config is imported from hexchen's nixfiles
# hexchen = {
# uid = lib.mkForce 1000;
# isNormalUser = true;
# extraGroups = [ "wheel" ];
# };
hexchen = {
uid = lib.mkForce 1000;
isNormalUser = true;
extraGroups = [ "wheel" ];
};
stuebinm = {
uid = 1005;

42
hosts/hainich/configuration.nix
View file

@ -100,27 +100,27 @@
boot.kernelPackages = pkgs.linuxPackages;
# services.restic.backups.tardis = {
# passwordFile = "/etc/restic/system";
# s3CredentialsFile = "/etc/restic/system.s3creds";
# paths = [
# "/data"
# "/home"
# "/run/florinori"
# "/var/lib/containers/codimd/var/lib/codimd"
# "/var/lib/containers/codimd/var/backup/postgresql"
# "/var/lib/containers/lantifa/var/lib/mediawiki"
# "/var/lib/containers/lantifa/var/backup/mysql"
# "/var/lib/murmur"
# "/var/lib/syncthing"
# ];
# pruneOpts = [
# "--keep-daily 7"
# "--keep-weekly 5"
# "--keep-monthly 12"
# ];
# repository = "b2:tardis-hainich:system";
# };
services.restic.backups.tardis = {
passwordFile = "/etc/restic/system";
s3CredentialsFile = "/etc/restic/system.s3creds";
paths = [
"/data"
"/home"
"/run/florinori"
"/var/lib/containers/codimd/var/lib/codimd"
"/var/lib/containers/codimd/var/backup/postgresql"
"/var/lib/containers/lantifa/var/lib/mediawiki"
"/var/lib/containers/lantifa/var/backup/mysql"
"/var/lib/murmur"
"/var/lib/syncthing"
];
pruneOpts = [
"--keep-daily 7"
"--keep-weekly 5"
"--keep-monthly 12"
];
repository = "b2:tardis-hainich:system";
};
# This value determines the NixOS release from which the default

18
hosts/hainich/services/syncthing.nix
View file

@ -24,21 +24,21 @@
id = "72B3T74-NOMJV3X-EVJXTJF-5GGAEZB-ZDKBHXQ-VQNRYEU-YCPA2JP-L6NGAAG";
};
# zauberberg
# conway = {
# addresses = []; # empty = dynamic
# id = "HV7IU2N-Q4W3A7F-BSASR43-OB575SM-47FY2UW-7N5GMFM-PX3LWRN-HXBXMQF";
# };
conway = {
addresses = []; # empty = dynamic
id = "HV7IU2N-Q4W3A7F-BSASR43-OB575SM-47FY2UW-7N5GMFM-PX3LWRN-HXBXMQF";
};
# hexchen
# storah = {
# addresses = [ "tcp://46.4.62.95:22000" "quic://46.4.62.95:22000" ];
# id = "SGHQ2JA-7FJ6CKM-N3I54R4-UOJC5KO-7W22O62-YLTF26F-S7DLZG4-ZLP7HAM";
# };
storah = {
addresses = [ "tcp://46.4.62.95:22000" "quic://46.4.62.95:22000" ];
id = "SGHQ2JA-7FJ6CKM-N3I54R4-UOJC5KO-7W22O62-YLTF26F-S7DLZG4-ZLP7HAM";
};
};
folders = {
"/var/lib/syncthing/hacc" = {
id = "qt2ly-xvvvs";
devices = [ "txsbcct" "octycs" "stuebinm-desktop" "raphael-laptop" ];
devices = [ "txsbcct" "octycs" "stuebinm-desktop" "conway" "raphael-laptop" "storah" ];
type = "receiveonly";
versioning = {
type = "simple";