mirror of
https://github.com/kmein/niveum
synced 2026-03-19 11:31:09 +01:00
Revert "chore: get secrets via input, mock for CI"
This reverts commit 3138fd23ef.
This commit is contained in:
@@ -2,7 +2,6 @@
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
inputs,
|
||||
...
|
||||
}: let
|
||||
defaults = {
|
||||
@@ -20,43 +19,43 @@
|
||||
in {
|
||||
age.secrets = {
|
||||
email-password-cock = {
|
||||
file = inputs.secrets + "/email-password-cock.age";
|
||||
file = ../secrets/email-password-cock.age;
|
||||
owner = config.users.users.me.name;
|
||||
group = config.users.users.me.group;
|
||||
mode = "400";
|
||||
};
|
||||
email-password-fysi = {
|
||||
file = inputs.secrets + "/email-password-fysi.age";
|
||||
file = ../secrets/email-password-fysi.age;
|
||||
owner = config.users.users.me.name;
|
||||
group = config.users.users.me.group;
|
||||
mode = "400";
|
||||
};
|
||||
email-password-posteo = {
|
||||
file = inputs.secrets + "/email-password-posteo.age";
|
||||
file = ../secrets/email-password-posteo.age;
|
||||
owner = config.users.users.me.name;
|
||||
group = config.users.users.me.group;
|
||||
mode = "400";
|
||||
};
|
||||
email-password-meinhark = {
|
||||
file = inputs.secrets + "/email-password-meinhark.age";
|
||||
file = ../secrets/email-password-meinhark.age;
|
||||
owner = config.users.users.me.name;
|
||||
group = config.users.users.me.group;
|
||||
mode = "400";
|
||||
};
|
||||
email-password-meinhaki = {
|
||||
file = inputs.secrets + "/email-password-meinhaki.age";
|
||||
file = ../secrets/email-password-meinhaki.age;
|
||||
owner = config.users.users.me.name;
|
||||
group = config.users.users.me.group;
|
||||
mode = "400";
|
||||
};
|
||||
email-password-dslalewa = {
|
||||
file = inputs.secrets + "/email-password-dslalewa.age";
|
||||
file = ../secrets/email-password-dslalewa.age;
|
||||
owner = config.users.users.me.name;
|
||||
group = config.users.users.me.group;
|
||||
mode = "400";
|
||||
};
|
||||
email-password-fsklassp = {
|
||||
file = inputs.secrets + "/email-password-fsklassp.age";
|
||||
file = ../secrets/email-password-fsklassp.age;
|
||||
owner = config.users.users.me.name;
|
||||
group = config.users.users.me.group;
|
||||
mode = "400";
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
inputs,
|
||||
...
|
||||
}: let
|
||||
inherit (import ../lib) tmpfilesConfig;
|
||||
@@ -98,7 +97,7 @@ in {
|
||||
];
|
||||
|
||||
age.secrets.mega-password = {
|
||||
file = inputs.secrets + "/mega-password.age";
|
||||
file = ../secrets/mega-password.age;
|
||||
owner = config.users.users.me.name;
|
||||
group = config.users.users.me.group;
|
||||
mode = "400";
|
||||
|
||||
@@ -37,13 +37,13 @@ in {
|
||||
{
|
||||
age.secrets = {
|
||||
di-fm-key = {
|
||||
file = inputs.secrets + "/di-fm-key.age";
|
||||
file = ../secrets/di-fm-key.age;
|
||||
owner = config.users.users.me.name;
|
||||
group = config.users.users.me.group;
|
||||
mode = "400";
|
||||
};
|
||||
restic = {
|
||||
file = inputs.secrets + "/restic.age";
|
||||
file = ../secrets/restic.age;
|
||||
owner = config.users.users.me.name;
|
||||
group = config.users.users.me.group;
|
||||
mode = "400";
|
||||
@@ -76,7 +76,7 @@ in {
|
||||
};
|
||||
|
||||
age.secrets = {
|
||||
kfm-password.file = inputs.secrets + "/kfm-password.age";
|
||||
kfm-password.file = ../secrets/kfm-password.age;
|
||||
};
|
||||
|
||||
home-manager.users.me.xdg.enable = true;
|
||||
|
||||
@@ -1,9 +1,15 @@
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
inherit (lib.strings) fileContents;
|
||||
inherit (import ../lib) sshPort;
|
||||
eduroam = {
|
||||
identity = fileContents <secrets/eduroam/identity>;
|
||||
password = fileContents <secrets/eduroam/password>;
|
||||
};
|
||||
hu-berlin-cifs-options = [
|
||||
"uid=${toString config.users.users.me.uid}"
|
||||
"gid=${toString config.users.groups.users.gid}"
|
||||
@@ -29,7 +35,7 @@ in {
|
||||
options = hu-berlin-cifs-options;
|
||||
};
|
||||
|
||||
age.secrets.cifs-credentials-hu-berlin.file = inputs.secrets + "/cifs-credentials-hu-berlin.age";
|
||||
age.secrets.cifs-credentials-hu-berlin.file = ../secrets/cifs-credentials-hu-berlin.age;
|
||||
|
||||
home-manager.users.me.programs.ssh = {
|
||||
matchBlocks = {
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
pkgs,
|
||||
lib,
|
||||
niveumPackages,
|
||||
inputs,
|
||||
...
|
||||
}: let
|
||||
inherit (import ../lib) defaultApplications colours;
|
||||
@@ -66,13 +65,13 @@
|
||||
in {
|
||||
age.secrets = {
|
||||
github-token-i3status-rust = {
|
||||
file = inputs.secrets + "/github-token-i3status-rust.age";
|
||||
file = ../secrets/github-token-i3status-rust.age;
|
||||
owner = config.users.users.me.name;
|
||||
group = config.users.users.me.group;
|
||||
mode = "400";
|
||||
};
|
||||
openweathermap-api-key = {
|
||||
file = inputs.secrets + "/openweathermap-api-key.age";
|
||||
file = ../secrets/openweathermap-api-key.age;
|
||||
owner = config.users.users.me.name;
|
||||
group = config.users.users.me.group;
|
||||
mode = "400";
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
davHome = "~/.local/share/dav";
|
||||
@@ -18,13 +18,13 @@
|
||||
in {
|
||||
age.secrets = {
|
||||
nextcloud-password-kieran = {
|
||||
file = inputs.secrets + "/nextcloud-password-kieran.age";
|
||||
file = ../secrets/nextcloud-password-kieran.age;
|
||||
owner = config.users.users.me.name;
|
||||
group = config.users.users.me.group;
|
||||
mode = "400";
|
||||
};
|
||||
nextcloud-password-fysi = {
|
||||
file = inputs.secrets + "/nextcloud-password-fysi.age";
|
||||
file = ../secrets/nextcloud-password-fysi.age;
|
||||
owner = config.users.users.me.name;
|
||||
group = config.users.users.me.group;
|
||||
mode = "400";
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
inputs,
|
||||
niveumPackages,
|
||||
unstablePackages,
|
||||
...
|
||||
}: let
|
||||
worldradio = pkgs.callPackage ../packages/worldradio.nix {};
|
||||
@@ -289,7 +291,7 @@ in {
|
||||
];
|
||||
|
||||
age.secrets.home-assistant-token = {
|
||||
file = inputs.secrets + "/home-assistant-token.age";
|
||||
file = ../secrets/home-assistant-token.age;
|
||||
owner = config.users.users.me.name;
|
||||
group = config.users.users.me.group;
|
||||
mode = "400";
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
pkgs,
|
||||
inputs,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}: let
|
||||
@@ -22,7 +22,7 @@ in {
|
||||
command = "${autorenkalender}/bin/autorenkalender";
|
||||
};
|
||||
|
||||
age.secrets.telegram-token-kmein.file = inputs.secrets + "/telegram-token-kmein.age";
|
||||
age.secrets.telegram-token-kmein.file = ../../secrets/telegram-token-kmein.age;
|
||||
|
||||
niveum.passport.services = [
|
||||
{
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
inputs,
|
||||
...
|
||||
}: let
|
||||
@@ -47,9 +48,9 @@ in {
|
||||
];
|
||||
|
||||
age.secrets = {
|
||||
telegram-token-reverse.file = inputs.secrets + "/telegram-token-reverse.age";
|
||||
telegram-token-betacode.file = inputs.secrets + "/telegram-token-betacode.age";
|
||||
telegram-token-proverb.file = inputs.secrets + "/telegram-token-proverb.age";
|
||||
telegram-token-reverse.file = ../../secrets/telegram-token-reverse.age;
|
||||
telegram-token-betacode.file = ../../secrets/telegram-token-betacode.age;
|
||||
telegram-token-proverb.file = ../../secrets/telegram-token-proverb.age;
|
||||
};
|
||||
|
||||
systemd.services.telegram-reverse = {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
pkgs,
|
||||
config,
|
||||
inputs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
nachtischsatan-bot = {tokenFile}:
|
||||
@@ -36,7 +36,7 @@ in {
|
||||
serviceConfig.Restart = "always";
|
||||
};
|
||||
|
||||
age.secrets.telegram-token-nachtischsatan.file = inputs.secrets + "/telegram-token-nachtischsatan.age";
|
||||
age.secrets.telegram-token-nachtischsatan.file = ../../secrets/telegram-token-nachtischsatan.age;
|
||||
|
||||
niveum.passport.services = [
|
||||
{
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
inherit (import ../lib) localAddresses;
|
||||
@@ -20,7 +20,7 @@ in {
|
||||
];
|
||||
|
||||
age.secrets.traadfri-key = {
|
||||
file = inputs.secrets + "/traadfri-key.age";
|
||||
file = ../secrets/traadfri-key.age;
|
||||
owner = config.users.users.me.name;
|
||||
group = config.users.users.me.group;
|
||||
mode = "400";
|
||||
|
||||
Reference in New Issue
Block a user