kfm/niveum
1
0
Fork 0
mirror of https://github.com/kmein/niveum synced 2026-03-21 04:11:07 +01:00
Code Releases Activity

chore: reorganize secrets

Browse Source
This commit is contained in:
Kierán Meinhardt
2020-09-24 19:25:47 +02:00
parent 676a76ea16
commit 7132aeac86
8 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configs/calcurse.nix
View File

@@ -27,7 +27,7 @@
}; };
Auth = { Auth = {
Username = "kieran.meinhardt@posteo.net"; Username = "kieran.meinhardt@posteo.net";
Password = lib.strings.fileContents <shared-secrets/posteo/password>; Password = lib.strings.fileContents <secrets/mail/posteo>;
}; };
}; };
}; };

4
configs/cloud.nix
View File

@@ -30,8 +30,8 @@
configDir = "/home/kfm/.config/syncthing"; configDir = "/home/kfm/.config/syncthing";
dataDir = "/home/kfm/.config/syncthing"; dataDir = "/home/kfm/.config/syncthing";
declarative = rec { declarative = rec {
cert = toString <secrets/syncthing/cert.pem>; cert = toString <system-secrets/syncthing/cert.pem>;
key = toString <secrets/syncthing/key.pem>; key = toString <system-secrets/syncthing/key.pem>;
devices = { devices = {
homeros.id = homeros.id =
"HSOL72W-MMN346W-C3WCWCH-OTRKJYG-MY2WWV6-P7JUHN7-5WYYYRV-ZMH4KAA"; "HSOL72W-MMN346W-C3WCWCH-OTRKJYG-MY2WWV6-P7JUHN7-5WYYYRV-ZMH4KAA";

4
configs/hu-berlin.nix
View File

@@ -2,8 +2,8 @@
let let
inherit (lib.strings) fileContents; inherit (lib.strings) fileContents;
eduroam = { eduroam = {
identity = fileContents <shared-secrets/eduroam/identity>; identity = fileContents <secrets/eduroam/identity>;
password = fileContents <shared-secrets/eduroam/password>; password = fileContents <secrets/eduroam/password>;
}; };
eduroamAuth = '' eduroamAuth = ''
key_mgmt=WPA-EAP key_mgmt=WPA-EAP

12
configs/mail.nix
View File

@@ -104,7 +104,7 @@ in {
userName = "kieran@fysi.tech"; userName = "kieran@fysi.tech";
address = "kieran@fysi.tech"; address = "kieran@fysi.tech";
realName = config.niveum.user.name; realName = config.niveum.user.name;
passwordCommand = pass_ <shared-secrets/fastmail/fysi>; passwordCommand = pass_ <secrets/mail/fastmail>;
}; };
cock = enableDefaults { cock = enableDefaults {
primary = false; primary = false;
@@ -124,7 +124,7 @@ in {
userName = "2210@cock.li"; userName = "2210@cock.li";
address = "2210@cock.li"; address = "2210@cock.li";
realName = "2210"; realName = "2210";
passwordCommand = pass_ <shared-secrets/cock/2210>; passwordCommand = pass_ <secrets/mail/cock>;
}; };
kieran-gmail = enableDefaults { kieran-gmail = enableDefaults {
primary = false; primary = false;
@@ -132,7 +132,7 @@ in {
address = "kieran.meinhardt@gmail.com"; address = "kieran.meinhardt@gmail.com";
realName = config.niveum.user.name; realName = config.niveum.user.name;
userName = "kieran.meinhardt"; userName = "kieran.meinhardt";
passwordCommand = pass_ <shared-secrets/gmail/kieran.meinhardt>; passwordCommand = pass_ <secrets/mail/gmail/kieran.meinhardt>;
folders = { folders = {
drafts = "[Gmail]/Entw&APw-rfe"; drafts = "[Gmail]/Entw&APw-rfe";
sent = "[Gmail]/Gesendet"; sent = "[Gmail]/Gesendet";
@@ -145,7 +145,7 @@ in {
address = "amroplay@gmail.com"; address = "amroplay@gmail.com";
realName = config.niveum.user.name; realName = config.niveum.user.name;
userName = "amroplay"; userName = "amroplay";
passwordCommand = pass_ <shared-secrets/gmail/amroplay>; passwordCommand = pass_ <secrets/mail/gmail/amroplay>;
folders = { folders = {
drafts = "[Gmail]/Drafts"; drafts = "[Gmail]/Drafts";
sent = "[Gmail]/Sent Mail"; sent = "[Gmail]/Sent Mail";
@@ -170,14 +170,14 @@ in {
address = "kieran.meinhardt@posteo.net"; address = "kieran.meinhardt@posteo.net";
realName = config.niveum.user.name; realName = config.niveum.user.name;
userName = "kieran.meinhardt@posteo.net"; userName = "kieran.meinhardt@posteo.net";
passwordCommand = pass_ <shared-secrets/posteo/password>; passwordCommand = pass_ <secrets/mail/posteo>;
}; };
hu-berlin = enableDefaults { hu-berlin = enableDefaults {
primary = false; primary = false;
address = "meinhark@hu-berlin.de"; address = "meinhark@hu-berlin.de";
realName = config.niveum.user.name; realName = config.niveum.user.name;
userName = "meinhark"; userName = "meinhark";
passwordCommand = pass_ <shared-secrets/eduroam/password>; passwordCommand = pass_ <secrets/eduroam/password>;
smtp = { smtp = {
host = "mailhost.cms.hu-berlin.de"; host = "mailhost.cms.hu-berlin.de";
port = 25; port = 25;

2
configs/retiolum.nix
View File

@@ -4,7 +4,7 @@
networking.hosts = { "42:0:ca48:f98f:63d7:31ce:922b:245d" = [ "go" ]; }; networking.hosts = { "42:0:ca48:f98f:63d7:31ce:922b:245d" = [ "go" ]; };
environment.etc."tinc/retiolum/rsa_key.priv" = { environment.etc."tinc/retiolum/rsa_key.priv" = {
text = builtins.readFile <secrets/retiolum.key>; text = builtins.readFile <system-secrets/retiolum.key>;
mode = "400"; mode = "400";
}; };
} }

4
configs/spotify.nix
View File

@@ -13,8 +13,8 @@ in {
}; };
spotifydConf = pkgs.writeText "spotifyd.conf" (lib.generators.toINI { } { spotifydConf = pkgs.writeText "spotifyd.conf" (lib.generators.toINI { } {
global = { global = {
username = fileContents <shared-secrets/spotify/username>; username = fileContents <secrets/spotify/username>;
password = fileContents <shared-secrets/spotify/password>; password = fileContents <secrets/spotify/password>;
backend = "pulseaudio"; backend = "pulseaudio";
on_song_change_hook = toString (pkgs.writers.writeDash "songinfo" '' on_song_change_hook = toString (pkgs.writers.writeDash "songinfo" ''
PATH=$PATH:${ PATH=$PATH:${

2
configs/traadfri.nix
View File

@@ -5,7 +5,7 @@
enable = true; enable = true;
user = "kmein"; user = "kmein";
host = "192.168.178.28"; host = "192.168.178.28";
key = lib.strings.fileContents <shared-secrets/traadfri.key>; key = lib.strings.fileContents <secrets/traadfri.key>;
rooms = { rooms = {
corridor = 131080; corridor = 131080;
kitchen = 131081; kitchen = 131081;

4
deploy.nix
View File

@@ -20,11 +20,11 @@ let
nixos-unstable.git = gitFromJson .versions/nixpkgs-unstable.json; nixos-unstable.git = gitFromJson .versions/nixpkgs-unstable.json;
home-manager.git = gitFromJson .versions/home-manager.json; home-manager.git = gitFromJson .versions/home-manager.json;
stockholm.git = gitFromJson .versions/stockholm.json; stockholm.git = gitFromJson .versions/stockholm.json;
secrets.pass = { system-secrets.pass = {
dir = toString ~/.password-store/systems; dir = toString ~/.password-store/systems;
inherit name; inherit name;
}; };
shared-secrets.pass = { secrets.pass = {
dir = toString ~/.password-store; dir = toString ~/.password-store;
name = "shared"; name = "shared";
}; };