gensokyo-zone/infrastructure
1
0
Fork 0
mirror of https://github.com/gensokyo-zone/infrastructure.git synced 2026-02-09 04:19:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

goliath: restore function, weechat: address fix, roundcube: smtp

Browse source
This commit is contained in:
kat witch 2021-09-12 02:32:46 +01:00
parent 2f95cf9b5c
commit 43f828b99a
No known key found for this signature in database
GPG key ID: 1B477797DCA5EC72
8 changed files with 68 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

32
config/hosts/goliath.nix
View file

@ -90,10 +90,10 @@
];
};
secrets.persistentRoot = mkForce "/persist/root/var/lib/kat/secrets";
home-manager.users.kat = {
secrets = {
persistentRoot = mkForce "/persist/home/.cache/kat/secrets";
};
secrets.persistentRoot = mkForce "/persist/home/.cache/kat/secrets";
home.persistence."/persist/home" = {
allowOther = true;
@ -102,16 +102,16 @@
".cache/rbw"
".cache/nix"
".local/share/z"
".local/share/task"
".local/share/nvim"
".local/share/dino"
".local/share/vim"
".local/share/nvim"
".local/share/task"
".local/share/dino"
".local/share/weechat"
".local/share/Mumble"
".local/share/direnv"
".config/Mumble"
".config/Element"
".password-store"
".config/hedgedoc"
".gnupg"
".mozilla"
"docs"
@ -122,6 +122,7 @@
];
files = [
".ssh/known_hosts"
".zsh_history"
];
};
};
@ -184,11 +185,18 @@
networking = {
hostId = "617050fc";
useDHCP = false;
useNetworkd = true;
/*useNetworkd = true;*/
interfaces = {
enp34s0.ipv4.addresses = singleton {
inherit (config.network.addresses.private.nixos.ipv4) address;
prefixLength = 24;
};
};
defaultGateway = config.network.privateGateway;
firewall.allowPing = true;
};
systemd.network = {
/*systemd.network = {
networks.enp34s0 = {
matchConfig.Name = "enp34s0";
bridge = singleton "br";
@ -205,7 +213,7 @@
MACAddress = "00:d8:61:c7:f4:9d";
};
};
};
};*/
services.avahi.enable = true;
@ -225,13 +233,13 @@
listen.endpoints = [ "tcp://0.0.0.0:0" ];
};
firewall = {
public.interfaces = singleton "br";
public.interfaces = [ "br" "enp34s0" ];
private = {
interfaces = singleton "yggdrasil";
};
};
};
system.stateVersion = "20.09";
system.stateVersion = "21.11";
}

2
config/profiles/base/nix.nix
View file

@ -25,7 +25,7 @@
[ "arc.cachix.org-1:DZmhclLkB6UO0rc0rBzNpwFbbaeLfyn+fYccuAy7YVY=" "kittywitch.cachix.org-1:KIzX/G5cuPw5WgrXad6UnrRZ8UDr7jhXzRTK/lmqyK0=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" ];
autoOptimiseStore = true;
gc = {
automatic = lib.mkDefault true;
automatic = lib.mkDefault false;
dates = lib.mkDefault "weekly";
options = lib.mkDefault "--delete-older-than 1w";
};

6
config/services/roundcube/default.nix
View file

@ -2,6 +2,12 @@
services.roundcube = {
enable = true;
hostName = "mail.${config.network.dns.domain}";
extraConfig = ''
$config['default_host'] = "ssl://${config.network.addresses.public.domain}";
$config['smtp_server'] = "ssl://${config.network.addresses.public.domain}";
$config['smtp_port'] = "465";
$config['product_name'] = "kittywitch mail";
'';
};
services.nginx.virtualHosts."mail.${config.network.dns.domain}" = {

10
config/users/kat/gui/hedgedoc.nix Normal file
View file

@ -0,0 +1,10 @@
{ config, lib, pkgs, tf, ... }: {
home.sessionVariables = {
HEDGEDOC_SERVER = "https://md.kittywit.ch";
HEDGEDOC_CONFIG_DIR = "${config.home.homeDirectory}/.config/hedgedoc";
};
home.packages = with pkgs; [
hedgedoc-cli
];
}

6
config/users/kat/personal/weechat.nix
View file

@ -37,21 +37,21 @@
irc = {
server = {
softnet = {
address = "kyouko.kittywit.ch/5001";
addresses = "kyouko.kittywit.ch/5001";
password = "kat@${nixos.networking.hostName}/softnet:\${sec.data.znc}";
ssl = true;
ssl_verify = false;
autoconnect = true;
};
liberachat = {
address = "kyouko.kittywit.ch/5001";
addresses = "kyouko.kittywit.ch/5001";
password = "kat@${nixos.networking.hostName}/liberachat:\${sec.data.znc}";
ssl = true;
ssl_verify = false;
autoconnect = true;
};
espernet = {
address = "kyouko.kittywit.ch/5001";
addresses = "kyouko.kittywit.ch/5001";
password = "kat@${nixos.networking.hostName}/espernet:\${sec.data.znc}";
ssl = true;
ssl_verify = false;

6
config/users/kat/services/weechat.nix
View file

@ -54,21 +54,21 @@
irc = {
server = {
softnet = {
address = "kyouko.kittywit.ch/5001";
addresses = "kyouko.kittywit.ch/5001";
password = "kat@${nixos.networking.hostName}/softnet:\${sec.data.znc}";
ssl = true;
ssl_verify = false;
autoconnect = true;
};
liberachat = {
address = "kyouko.kittywit.ch/5001";
addresses = "kyouko.kittywit.ch/5001";
password = "kat@${nixos.networking.hostName}/liberachat:\${sec.data.znc}";
ssl = true;
ssl_verify = false;
autoconnect = true;
};
espernet = {
address = "kyouko.kittywit.ch/5001";
addresses = "kyouko.kittywit.ch/5001";
password = "kat@${nixos.networking.hostName}/espernet:\${sec.data.znc}";
ssl = true;
ssl_verify = false;

48
nix/sources.json
View file

@ -17,10 +17,10 @@
"homepage": null,
"owner": "arcnmx",
"repo": "nixexprs",
"rev": "178e93b9ea9e69e68e594cdb5f2aab43b0e4e698",
"sha256": "1by57c8rg9chgcqgddpawszvpk0s2vfaxksx4cvqw0krzkb9bfsy",
"rev": "80c51b106255451c72236742e35980423f526b79",
"sha256": "1km5r09x9i4liqxj6p2m22a4sybjgfgz9ai8vfv75c39x4as7kb4",
"type": "tarball",
"url": "https://github.com/arcnmx/nixexprs/archive/178e93b9ea9e69e68e594cdb5f2aab43b0e4e698.tar.gz",
"url": "https://github.com/arcnmx/nixexprs/archive/80c51b106255451c72236742e35980423f526b79.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"ci": {
@ -29,10 +29,10 @@
"homepage": "https://arcnmx.github.io/ci",
"owner": "arcnmx",
"repo": "ci",
"rev": "67fcb4a7d74b2f722b35155cc0cf3725f1e231ff",
"sha256": "19cq1q38x54filqzxra2l825dl4z1v40f3qvzi1xhmv69bqfr1cs",
"rev": "931dc1fd77ebf09dd8d5ee2a6b92762a823e129f",
"sha256": "1w59hdsyv1zi49dgi853bn90qwailzywmrrj54k3wm8lcn22prxk",
"type": "tarball",
"url": "https://github.com/arcnmx/ci/archive/67fcb4a7d74b2f722b35155cc0cf3725f1e231ff.tar.gz",
"url": "https://github.com/arcnmx/ci/archive/931dc1fd77ebf09dd8d5ee2a6b92762a823e129f.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"emacs-overlay": {
@ -41,10 +41,10 @@
"homepage": "",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "3475b81d1c14509c9ebfae1e53366b28acaa2b6b",
"sha256": "0amksnxwk86pbb8w2zab7sycijyn0d3636877dfhdbdqkzck233g",
"rev": "d0d0e2069806f4abf999d033aa3baadd24870230",
"sha256": "11kznbxflqvmvck9njvl3kxm572y1cz6hsc3wzr5nvby17wkq78k",
"type": "tarball",
"url": "https://github.com/nix-community/emacs-overlay/archive/3475b81d1c14509c9ebfae1e53366b28acaa2b6b.tar.gz",
"url": "https://github.com/nix-community/emacs-overlay/archive/d0d0e2069806f4abf999d033aa3baadd24870230.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"hexchen": {
@ -65,10 +65,10 @@
"homepage": "https://nix-community.github.io/home-manager/",
"owner": "nix-community",
"repo": "home-manager",
"rev": "21a2ff449620a9cb91802f9d1a9157b2ae8c6b39",
"sha256": "0q6q1i06cvksvk76ij5570nasa0wasp8qx7hxqwgi3h534kk5pnz",
"rev": "039f786e609fdb3cfd9c5520ff3791750c3eaebf",
"sha256": "0bf1dsx4l7c0a1ypmwp0dg6y8f5qds8nxkwzjijmdf7jc4kz0phb",
"type": "tarball",
"url": "https://github.com/nix-community/home-manager/archive/21a2ff449620a9cb91802f9d1a9157b2ae8c6b39.tar.gz",
"url": "https://github.com/nix-community/home-manager/archive/039f786e609fdb3cfd9c5520ff3791750c3eaebf.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"impermanence": {
@ -89,10 +89,10 @@
"homepage": null,
"owner": "kittywitch",
"repo": "nixexprs",
"rev": "7869e9c9e3e6b3586a836ae4434e4c45b910e4d5",
"sha256": "1a6jphscm9v2ry9qn51qpjwz29i4psdwy6ldrz6x74z234y405m1",
"rev": "2a5bc583c5d93448345e5bba0134ef2ac4eafb2e",
"sha256": "0yqlrf2yv3bsbvrdq6ijk4gpwpmmbg59q76xzk2f47xaahwaqxwq",
"type": "tarball",
"url": "https://github.com/kittywitch/nixexprs/archive/7869e9c9e3e6b3586a836ae4434e4c45b910e4d5.tar.gz",
"url": "https://github.com/kittywitch/nixexprs/archive/2a5bc583c5d93448345e5bba0134ef2ac4eafb2e.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"niv": {
@ -125,10 +125,10 @@
"homepage": "",
"owner": "vlaci",
"repo": "nix-doom-emacs",
"rev": "1020f27f1fab123f0ce3ed5f6e9c0637d888c884",
"sha256": "1fgrxzmkbh699ah1sqr0937bysfx0v1q805k6kpjjfwbrfn6113h",
"rev": "33064319607745856f488a998ca3db8ffcede865",
"sha256": "0h9sg744w6nafmp1lkpdrb71c6gpy8p8i05iy5rn1f3vqdzvd90x",
"type": "tarball",
"url": "https://github.com/vlaci/nix-doom-emacs/archive/1020f27f1fab123f0ce3ed5f6e9c0637d888c884.tar.gz",
"url": "https://github.com/vlaci/nix-doom-emacs/archive/33064319607745856f488a998ca3db8ffcede865.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"nixos-mailserver": {
@ -147,10 +147,10 @@
"homepage": "",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "8d8a28b47b7c41aeb4ad01a2bd8b7d26986c3512",
"sha256": "1s29nc3ppsjdq8kgbh8pc26xislkv01yph58xv2vjklkvsmz5pzm",
"rev": "bbbe2b35f736d039884e082ecc6d6e631e126029",
"sha256": "09356lp9r1wx311ak6d94bx35xnvj8cabvwqirklylql8q7f52lc",
"type": "tarball",
"url": "https://github.com/nixos/nixpkgs/archive/8d8a28b47b7c41aeb4ad01a2bd8b7d26986c3512.tar.gz",
"url": "https://github.com/nixos/nixpkgs/archive/bbbe2b35f736d039884e082ecc6d6e631e126029.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"nur": {
@ -159,10 +159,10 @@
"homepage": "https://nur.nix-community.org/",
"owner": "nix-community",
"repo": "NUR",
"rev": "d2cdb44f12b82d9d207b6e6596cc9d2a2e1361eb",
"sha256": "01gs4vvhq4i71l9q7xlb3py4kadq2s7acdndkvdk2lk3l8d13qm1",
"rev": "a06738f7be02242e5f4bb56d6aa17ef74034e4a9",
"sha256": "0xw073j1cc6s3l9s1zwkrl4q3z8lwqbzgiynam7lxpwqmcmf1mrs",
"type": "tarball",
"url": "https://github.com/nix-community/NUR/archive/d2cdb44f12b82d9d207b6e6596cc9d2a2e1361eb.tar.gz",
"url": "https://github.com/nix-community/NUR/archive/a06738f7be02242e5f4bb56d6aa17ef74034e4a9.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"tf-nix": {

2
overlays/exprs

@ -1 +1 @@
Subproject commit 7869e9c9e3e6b3586a836ae4434e4c45b910e4d5
Subproject commit 2a5bc583c5d93448345e5bba0134ef2ac4eafb2e