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

modules/profiles/base.nix

@@ -84,9 +84,7 @@ in
 
   environment.systemPackages = with pkgs; [
     # archives
-    p7zip
-    unzip
-    zip
+    ouch
 
     # file management
     trash-cli

modules/profiles/desktop.nix

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

modules/profiles/personal.nix

@@ -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 = {

modules/profiles/webis.nix

@@ -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;
+      };
+    };
+  };
+}