nix/configuration/roles/emacs/default.nix

@@ -127,8 +127,6 @@ in
                     final.nixfmt-rfc-style # auto-formatting nix files through nixd
                     final.clang # To compile tree-sitter grammars
                     final.shellcheck
-                    final.cmake-language-server
-                    final.cmake # Used by cmake-language-server
                   ]
                 }
               '';

nix/configuration/roles/emacs/files/emacs/elisp/lang-cmake.el

@@ -1,18 +0,0 @@
-(require 'common-lsp)
-
-(use-package cmake-mode
-  :commands cmake-mode
-  :hook (
-         (cmake-mode . (lambda ()
-                         (eglot-ensure)
-                         (defclass my/eglot-cmake (eglot-lsp-server) ()
-                           :documentation
-                           "Own eglot server class.")
-
-                         (add-to-list 'eglot-server-programs
-                                      '(cmake-mode . (my/eglot-cmake "cmake-language-server")))
-                         ))
-         )
-  )
-
-(provide 'lang-cmake)

nix/configuration/roles/emacs/files/emacs/init.el

@@ -38,6 +38,4 @@
 
 (require 'lang-nix)
 
-(require 'lang-cmake)
-
 (load-directory autoload-directory)

nix/configuration/roles/wireguard/default.nix

@@ -9,9 +9,11 @@ let
     networking.wg-quick.interfaces."${name}".configFile = "/persist/manual/wireguard/${name}.conf";
     systemd.services."wg-quick-${name}" = {
       after = [
-        "network-online.target"
         "nss-lookup.target"
+        "systemd-resolved.service"
+        "multi-user.target"
       ];
+      preStart = "${pkgs.toybox}/bin/sleep 10";
     };
     # systemd.services."wg-quick-${name}".after = [
     #   "nss-lookup.target"