Merge remote-tracking branch 'origin/nixos' into nixos

This commit is contained in:
Moritz Böhme 2023-05-27 12:03:51 +02:00
commit a66a17984e
No known key found for this signature in database
GPG key ID: 970C6E89EB0547A9
10 changed files with 50 additions and 26 deletions

View file

@ -72,6 +72,7 @@ in
};
};
services = {
illum.enable = true;
gnome.gnome-keyring.enable = true;
pipewire = {
enable = true;

View file

@ -18,7 +18,7 @@ in
synology-drive.enable = true;
};
programs = {
ssh.includeSecrets = mkDefault [ ../../secrets/ssh-home.age ];
ssh.includeSecrets = [ ../../secrets/ssh-home.age ];
git.signing = mkDefault true;
hub.enable = mkDefault true;
firefox.arkenfox = {

View file

@ -0,0 +1,28 @@
{ lib
, config
, ...
}:
with lib;
let
cfg = config.my.profiles.webis;
in
{
options.my.profiles.webis.enable = mkEnableOption "webis profile";
config = mkIf cfg.enable {
my.programs.ssh.includeSecrets = [ ../../secrets/webis-ssh.age ];
age.secrets.webis = {
file = ../../secrets/webis.age;
name = "webis.ovpn";
};
services.openvpn.servers = {
webis = {
config = "config /run/agenix/webis.ovpn";
autoStart = false;
updateResolvConf = true;
};
};
};
}