chore: flake update

users/config/shell/zsh/default.nix

@@ -18,16 +18,18 @@
       save = 1000500;
       size = 1000000;
     };
-    initExtra = lib.readFile ./zshrc;
-    initExtraFirst = ''
-      HISTDB_FILE=''${XDG_DATA_HOME-$HOME/.local/share}/zsh/history.db
+    initContent = lib.mkMerge [
+      (lib.mkBefore ''
+        HISTDB_FILE=''${XDG_DATA_HOME-$HOME/.local/share}/zsh/history.db
 
-      # Do this early so fast-syntax-highlighting can wrap and override this
-      if autoload history-search-end; then
-        zle -N history-beginning-search-backward-end history-search-end
-        zle -N history-beginning-search-forward-end  history-search-end
-      fi
-    '';
+        # Do this early so fast-syntax-highlighting can wrap and override this
+        if autoload history-search-end; then
+          zle -N history-beginning-search-backward-end history-search-end
+          zle -N history-beginning-search-forward-end  history-search-end
+        fi
+      '')
+      (lib.readFile ./zshrc)
+    ];
     plugins = [
       {
         # Must be before plugins that wrap widgets, such as zsh-autosuggestions or fast-syntax-highlighting

users/myuser/default.nix

@@ -61,7 +61,7 @@ lib.optionalAttrs (!minimal) {
     };
 
     # Autostart hyprland if on tty1 (once, don't restart after logout)
-    programs.zsh.initExtra = lib.mkOrder 9999 ''
+    programs.zsh.initContent = lib.mkOrder 9999 ''
       if [[ -t 0 && "$(tty || true)" == /dev/tty1 && -z "$DISPLAY" && -z "$WAYLAND_DISPLAY" ]] && uwsm check may-start; then
         echo "Login shell detected. Starting Hyprland..."
         uwsm start -S -F Hyprland

users/myuser/neovim/lsp.nix

@@ -5,11 +5,12 @@
 }:
 {
   programs.nixvim.plugins = {
-    nvim-jdtls = {
+    jdtls = {
       enable = true;
-      data = "~/.cache/jdtls/workspace";
-      cmd = [
+      settings.cmd = [
         "${lib.getExe pkgs.jdt-language-server}"
+        "-data"
+        "~/.cache/jdtls/workspace"
       ];
     };
     lsp = {