moritz/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

change agenix secrets location

Browse source
This commit is contained in:
Moritz Böhme 2021-11-29 11:56:35 +01:00
parent ebe53ce03c
commit fb64729092
2 changed files with 9 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/desktop/apps/spotify.nix
View file

@ -10,13 +10,11 @@
global = { global = {
# A command that gets executed and can be used to # A command that gets executed and can be used to
# retrieve your username. # retrieve your username.
username_cmd = username_cmd = "${pkgs.coreutils}/bin/head -n 1 /run/agenix/spotifyd";
"${pkgs.coreutils}/bin/head -n 1 /run/secrets/spotifyd";
# A command that gets executed and can be used to # A command that gets executed and can be used to
# retrieve your password. # retrieve your password.
password_cmd = password_cmd = "${pkgs.coreutils}/bin/tail -n 1 /run/agenix/spotifyd";
"${pkgs.coreutils}/bin/tail -n 1 /run/secrets/spotifyd";
# The name that gets displayed under the connect tab on # The name that gets displayed under the connect tab on
# official clients. Spaces are not allowed! # official clients. Spaces are not allowed!

77
modules/services/diskstation/default.nix
View file

@ -1,87 +1,16 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
{ {
# services.davfs2 = {
# enable = true;
# extraConfig = ''
# [/auto/keepass]
# trust_server_cert home-boehmies-de.pem
# '';
# };
# services.autofs = {
# enable = true;
# autoMaster = let
# mapConf = pkgs.writeText "auto" ''
# keepass -fstype=davfs,uid=1000 :https\://davs.home.boehmies.de/home/Drive/
# '';
# in ''
# /auto file:${mapConf}
# '';
# };
# environment.etc."davfs2/certs/home-boehmies-de.pem" = {
# text = builtins.readFile ./home-boehmies-de.pem;
# };
fileSystems."/media/media" = { fileSystems."/media/media" = {
device = "//192.168.0.2/media"; device = "//192.168.0.2/media";
fsType = "cifs"; fsType = "cifs";
options = options = let
let
# this line prevents hanging on network split # this line prevents hanging on network split
automount_opts = automount_opts =
"x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s"; "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s";
in in [
[ "${automount_opts},credentials=/run/agenix/smbMedia,uid=1000,gid=100"
"${automount_opts},credentials=/run/secrets/smbMedia,uid=1000,gid=100"
]; ];
}; };
# fileSystems."/media/diskstation" = {
# device = "//192.168.0.2/home/Drive";
# fsType = "cifs";
# options = let
# # this line prevents hanging on network split
# automount_opts =
# "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s";
# in [
# "${automount_opts},credentials=/run/secrets/smbMoritz,uid=1000,gid=100"
# ];
# };
# home-manager.users.moritz = {
# services.unison = {
# enable = true;
# pairs = {
# keepass = {
# roots = [ "/home/moritz/Keepass" "/auto/keepass" ];
# commandOptions = {
# auto = "true";
# batch = "true";
# log = "false";
# repeat = "watch";
# sshcmd = "\${pkgs.openssh}/bin/ssh";
# ui = "text";
# ignore = "Name {lost+found}";
# };
# };
# diskstation = {
# roots = [ "/home/moritz/Documents" "/media/diskstation" ];
# commandOptions = {
# auto = "true";
# batch = "true";
# log = "false";
# repeat = "watch";
# sshcmd = "\${pkgs.openssh}/bin/ssh";
# ui = "text";
# fastcheck = "true";
# # debug = "verbose";
# perms = "0o1666";
# ignore = "Name {.direnv}";
# };
# };
# };
# };
# };
} }