4 files changed, 36 insertions, 14 deletions

diff --git a/home-modules/apps/nvim/default.nix b/home-modules/apps/nvim/default.nix
index 7aad816..ff541b8 100644
--- a/home-modules/apps/nvim/default.nix
+++ b/home-modules/apps/nvim/default.nix
@@ -20,16 +20,25 @@ in
     };
 
     programs.neovim = {
-      enable = false;
+      enable = true;
       defaultEditor = true;
       viAlias = true;
       vimAlias = true;
       vimdiffAlias = true;
-      withPython3 = false;
-      withNodeJs = false;
-      withRuby = false;
+      withPython3 = true;
+      withNodeJs = true;
+      withRuby = true;
 
       # coc.enable = false;
+
+      initLua = lib.mkMerge [
+        ''
+          -- Load in the real config, if exists
+          local ok, _ pcall (require, "entry")
+          if not ok then 
+            vim.notify("lua/entry.lua not found, no config to load", vim.log.levels.DEBUG)
+          end''
+      ];
     };
 
     home.file = lib.mkIf config.homeapps.nvim.lsp {
@@ -53,10 +62,10 @@ in
           ts_ls
           vue_ls
         ]))
-        [
-          neovim
-          neovim-node-client
-        ]
+        # [
+        #   neovim
+        #   neovim-node-client
+        # ]
       ];
   };
 }
diff --git a/hosts/apocalypse/default.nix b/hosts/apocalypse/default.nix
index a6aa964..5bbac60 100644
--- a/hosts/apocalypse/default.nix
+++ b/hosts/apocalypse/default.nix
@@ -5,12 +5,13 @@
     ./nvidia.nix
     ./backup.nix
     ./firewall.nix
+    ../../services/mail2.nix
   ];
 
   ## TODO REMOVE LATER TO PREVENT ELI FROM BUILDING REMOTELY
   boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
   networking.hosts = {
-    "127.0.0.1" = [ "omega-relay.local" ];
+    "127.0.0.1" = [ "apocalypse.local" ];
   };
 
   services.logind.settings.Login = {
@@ -19,6 +20,16 @@
     HandleLidSwitchDocked = "ignore";
   };
 
+  wilkuu.services.test_endpoint.enable = false;
+  wilkuu.services.mail = {
+    enable = true;
+    doACME = false;
+    defaultDomain = "apocalypse.local";
+    domains = [ "apocalypse.local" ];
+    wellKnownDomains = [ ];
+    startupMode = "bootstrap";
+  };
+
   ## Addons for this system
   addons = {
     desktop.hyprland.enable = false;
@@ -32,7 +43,7 @@
 
     vpn.mullvad.enable = true;
     vpn.eduvpn.enable = true;
-    vpn.fortissl.enable = true; 
+    vpn.fortissl.enable = true;
     gpg.enable = true;
 
     remote_builder = {
diff --git a/modules/vpn.nix b/modules/vpn.nix
index 93db975..1ff0877 100644
--- a/modules/vpn.nix
+++ b/modules/vpn.nix
@@ -22,7 +22,10 @@ in
       networking.networkmanager.plugins = [ pkgs.networkmanager-openvpn ];
     })
     (lib.mkIf cfg.fortissl.enable {
-      networking.networkmanager.plugins = [ pkgs.networkmanager-fortisslvpn ];  
+      networking.networkmanager.plugins = [
+        pkgs.networkmanager-fortisslvpn
+        pkgs.networkmanager-openconnect
+      ];
     })
     (lib.mkIf desktop.enable (
       lib.mkMerge [
diff --git a/services/mail2.nix b/services/mail2.nix
index dcea8c0..ae4a9eb 100644
--- a/services/mail2.nix
+++ b/services/mail2.nix
@@ -8,7 +8,6 @@ let
   hostname = config.networking.hostName;
 in
 {
-  imports = [ ./stalwart0_16.nix ];
   options.wilkuu.services.mail = with lib; {
     enable = mkEnableOption "Enable webmail";
     doACME = mkEnableOption "Enable ACME for stalwart here";
@@ -58,7 +57,7 @@ in
 
   config = lib.mkIf cfg.enable (
     let
-      tools = config.wilkuu.services.stalwart16.toolbox;
+      tools = config.stalwart-nix.stalwart.toolbox;
       sopsPath = ../secrets/${hostname}/stalwart.yaml;
       secrets = [
         "admin_user"
@@ -258,7 +257,7 @@ in
           };
         }));
 
-      wilkuu.services.stalwart16 = {
+      stalwart-nix.stalwart = {
         enable = cfg.enable;
         url = if cfg.startupMode != "normal" then "http://localhost:8080/" else cfg.defaultDomain;
         credentialsFile = config.sops.templates.stalwart-config-creds.path;