wireguard: make sure wg never blocks boot

modules/desktop-extended/default.nix

@@ -30,6 +30,8 @@ in {
     element-b12f
     element-mezza
 
+    whalebird
+
     # Nix specific utilities
     alejandra
     manix

modules/terminal-life/nvim/default.nix

@@ -45,55 +45,7 @@ in {
     ];
 
   plugins = with pkgs.vimPlugins; lib.mkIf cfg.full [
-    (pkgs.vimPlugins.nvim-treesitter.withPlugins (p: [
-      p.ini
-      p.json
-      p.json5
-      p.markdown
-      p.nix
-      p.toml
-      p.yaml
-
-      p.css
-      p.graphql
-      p.html
-      p.javascript
-      p.scss
-      p.tsx
-      p.typescript
-      p.vue
-
-      p.c
-      p.cpp
-      p.go
-      p.gomod
-      p.gosum
-      p.haskell
-      p.lua
-      p.php
-      p.python
-      p.ruby
-      p.rust
-
-      p.vim
-      p.vimdoc
-
-      p.passwd
-      p.sql
-
-      p.diff
-      p.gitcommit
-      p.gitignore
-      p.git_config
-      p.gitattributes
-      p.git_rebase
-
-      p.bash
-      p.dockerfile
-      p.make
-      p.ninja
-      p.terraform
-    ]))
+    pkgs.vimPlugins.nvim-treesitter.withAllGrammars
 
     # Dependencies for nvim-lspconfig
     nvim-cmp
@@ -186,6 +138,7 @@ in {
     (builtins.readFile ./ui.vim)
     (builtins.readFile ./quickfixopenall.vim)
     (builtins.readFile ./lsp.vim)
+    (builtins.readFile ./filetypes.vim)
     ''
       " fzf with file preview
       command! -bang -nargs=? -complete=dir Files

modules/terminal-life/nvim/filetypes.vim

@@ -0,0 +1,3 @@
+au BufRead,BufNewFile *.html.twig set filetype=html
+au BufRead,BufNewFile *.vto set filetype=html
+au BufRead,BufNewFile *.njk set filetype=html

modules/wireguard/private.nix

@@ -44,6 +44,8 @@ in {
   config =  mkIf (builtins.length cfg.ownIPs != 0) {
     networking.firewall.allowedUDPPorts = [51899];
 
+    systemd.network.wait-online.ignoredInterfaces = [ "wg-private" ];
+
     systemd.services.wireguard-wg-private = {
       wantedBy = [
         "network.target"

modules/wireguard/pub.solar.nix

@@ -24,6 +24,8 @@ in {
   config = mkIf (length cfg.ownIPs != 0){
     networking.firewall.allowedUDPPorts = [51821];
 
+    systemd.network.wait-online.ignoredInterfaces = [ "wg-pub-solar" ];
+
     systemd.services.wireguard-wg-pub-solar = {
       after = [
         "network.target"

modules/wireguard/tunnel.nix

@@ -41,6 +41,12 @@ in {
   config = mkIf (length cfg.ownIPs != 0){
     networking.firewall.allowedUDPPorts = [51820];
 
+    systemd.network.wait-online.ignoredInterfaces = [ "wg-tunnel" ];
+
+    systemd.targets.wireguard-wg-tunnel = {
+      wantedBy = lib.mkForce [];
+    };
+
     systemd.services.wireguard-wg-tunnel = {
       wants = [
         "wireguard-wg-private.service"

overlays/default.nix

@@ -20,6 +20,7 @@
             paperless-ngx = unstable.paperless-ngx;
             waybar = master.waybar;
             ungoogled-chromium = master.ungoogled-chromium;
+            whalebird = master.whalebird;
             authelia = authelia-438.authelia;
 
             adlist = inputs.adblock-unbound.packages.${prev.system};