diff --git a/nixos/configs/sterni/configuration.nix b/nixos/configs/sterni/configuration.nix index 8621bde..b4e7708 100644 --- a/nixos/configs/sterni/configuration.nix +++ b/nixos/configs/sterni/configuration.nix @@ -19,6 +19,9 @@ system.custom.wifi.interfaces = [ "wlp3s0" ]; + sops.secrets.tinc_retiolum_ed25519_key = { }; + sops.secrets.tinc_retiolum_rsa_key = { }; + security.wrappers = { pmount.source = "${pkgs.pmount}/bin/pmount"; pumount.source = "${pkgs.pmount}/bin/pumount"; diff --git a/nixos/system/all/tinc.nix b/nixos/system/all/tinc.nix index af20dfe..d5182bc 100644 --- a/nixos/system/all/tinc.nix +++ b/nixos/system/all/tinc.nix @@ -23,8 +23,8 @@ in { AutoConnect = yes ''; privateEd25519KeyFile = - toString config.sops.secrets.tinc_ed25519_key.path; - privateRsaKeyFile = toString config.sops.secrets.tinc_rsa_key.path; + toString config.sops.secrets.tinc_retiolum_ed25519_key.path; + privateRsaKeyFile = toString config.sops.secrets.tinc_retiolum_rsa_key.path; hosts = { pepe = { tincIp = "10.243.23.1"; diff --git a/nixos/system/desktop/home-manager.nix b/nixos/system/desktop/home-manager.nix index b80bfac..48a23b4 100644 --- a/nixos/system/desktop/home-manager.nix +++ b/nixos/system/desktop/home-manager.nix @@ -81,6 +81,11 @@ in { github.include_user_repos = False ''; + xdg.configFile."ncmpcpp/config".text = '' + mpd_host = "pepe.private" + mpd_port = 6600 + ''; + home.file.".zshrc".text = '' # a fix for https://github.com/NixOS/nixpkgs/issues/27587 autoload -U compinit && compinit diff --git a/nixos/system/desktop/packages.nix b/nixos/system/desktop/packages.nix index e05a06b..3f52f9d 100644 --- a/nixos/system/desktop/packages.nix +++ b/nixos/system/desktop/packages.nix @@ -379,8 +379,6 @@ in { parseUrl parseAndCopyLink - ncmpcpp - # needed for pycairo (in venv) pkgconf cairo