diff --git a/bin/install.ps1 b/bin/install.ps1 index 40629db..1726980 100644 --- a/bin/install.ps1 +++ b/bin/install.ps1 @@ -57,16 +57,19 @@ New-Item -ItemType SymbolicLink -Path ~\AppData\Local\nvim\lua\term_powershell.l New-Item -ItemType SymbolicLink -Path ~\AppData\Local\nvim\lua\lsp_config.lua -Target (Resolve-Path .\dotfiles\neovim\lua\lsp_config.lua) -Force New-Item -ItemType SymbolicLink -Path ~\AppData\Local\nvim\lua\local_settings.lua -Target (Resolve-Path .\dotfiles\neovim\lua\local_settings.lua) -Force New-Item -ItemType SymbolicLink -Path ~\AppData\Local\nvim\lua\lspconfig\server_configurations\satysfi_ls.lua -Target (Resolve-Path .\dotfiles\neovim\lua\lspconfig\server_configurations\satysfi_ls.lua) -Force +New-Item -ItemType SymbolicLink -Path ~\AppData\Local\nvim\lua\lspconfig\server_configurations\jetls.lua -Target (Resolve-Path .\dotfiles\neovim\lua\lspconfig\server_configurations\jetls.lua) -Force mkdir $env:LOCALAPPDATA\nvim\after\ftplugin New-Item -ItemType SymbolicLink -Path $env:LOCALAPPDATA\nvim\after\ftplugin\satysfi.lua -Target (Resolve-Path .\dotfiles\neovim\after\ftplugin\satysfi.lua) New-Item -ItemType SymbolicLink -Path $env:LOCALAPPDATA\nvim\after\ftplugin\tex.lua -Target (Resolve-Path .\dotfiles\neovim\after\ftplugin\tex.lua) New-Item -ItemType SymbolicLink -Path $env:LOCALAPPDATA\nvim\after\ftplugin\typst.lua -Target (Resolve-Path .\dotfiles\neovim\after\ftplugin\typst.lua) +New-Item -ItemType SymbolicLink -Path $env:LOCALAPPDATA\nvim\after\ftplugin\org.lua -Target (Resolve-Path .\dotfiles\neovim\after\ftplugin\org.lua) mkdir $env:LOCALAPPDATA\nvim\after\queries\satysfi Invoke-WebRequest -Uri "https://raw.githubusercontent.com/monaqa/tree-sitter-satysfi/master/queries/highlights.scm" -OutFile $env:LOCALAPPDATA\nvim\after\queries\satysfi\highlights.scm Invoke-WebRequest -Uri "https://raw.githubusercontent.com/monaqa/tree-sitter-satysfi/master/queries/indents.scm" -OutFile $env:LOCALAPPDATA\nvim\after\queries\satysfi\indents.scm Invoke-WebRequest -Uri "https://raw.githubusercontent.com/monaqa/tree-sitter-satysfi/master/queries/matchup.scm" -OutFile $env:LOCALAPPDATA\nvim\after\queries\satysfi\matchup.scm mkdir $env:LOCALAPPDATA\nvim\after\queries\julia New-Item -ItemType SymbolicLink -Path $env:LOCALAPPDATA\nvim\after\queries\julia\injections.scm -Target (Resolve-Path .\dotfiles\neovim\after\queries\julia\injections.scm) + # pwsh New-Item -ItemType SymbolicLink -Path $PROFILE -Target (Resolve-Path .\dotfiles\pwsh\powershell_profile.ps1) -Force New-Item -ItemType SymbolicLink -Path ~\.config\powershell\chezmoi_completion.ps1 -Target (Resolve-Path .\dotfiles\pwsh\chezmoi_completion.ps1) -Force diff --git a/dotfiles/neovim/init.lua b/dotfiles/neovim/init.lua index ff1e361..6c5dd9c 100644 --- a/dotfiles/neovim/init.lua +++ b/dotfiles/neovim/init.lua @@ -346,6 +346,7 @@ vim.o.errorbells = true vim.opt.undofile = true -- Save undo history vim.o.completeopt = 'menuone,noselect' -- for better completion experience vim.o.termguicolors = true +vim.o.exrc = true vim.keymap.set('n', 'H', 'tabp', { desc = 'tab previous' }) vim.keymap.set('n', 'L', 'tabn', { desc = 'tab next' }) @@ -360,6 +361,33 @@ vim.cmd.colorscheme "catppuccin-mocha" ----------------------------------------------------------- vim.g.mapleader = ' ' vim.g.maplocalleader = ' ' +local virt_lines_ns = vim.api.nvim_create_namespace 'on_diagnostic_jump' +--- @param diagnostic? vim.Diagnostic +--- @param bufnr integer +local function on_jump(diagnostic, bufnr) + if not diagnostic then return end + vim.diagnostic.show( + virt_lines_ns, + bufnr, + { diagnostic }, + { virtual_lines = { current_line = true }, virtual_text = false } + ) +end +-- vim.diagnostic.config({ +-- jump = { on_jump = on_jump }, +-- }) +vim.keymap.set('n', ']d', function() + vim.diagnostic.jump({ + count = 1, + float = true, + }) +end) +vim.keymap.set('n', '[d', function() + vim.diagnostic.jump({ + count = -1, + float = true, + }) +end) -- some terminalmode settings vim.keymap.set('t', 'h', 'h', { noremap = true, desc = "Exit terminal-mode and move to left window." }) @@ -634,10 +662,10 @@ lspconfig.julials.setup { end, capabilities = capabilities, cmd = { "julia", "--startup-file=no", "--history-file=no", - -- julials_so_option[1], julials_so_option[2], + julials_so_option[1], julials_so_option[2], -- use below 2 lines to collect script to be included in sysimage - -- '--trace-compile', - -- vim.env.HOME .. "/.julia/environments/nvim-lspconfig/tracecompile.jl", + '--trace-compile', + vim.env.HOME .. "/.julia/environments/nvim-lspconfig/tracecompile.jl", "-t4", "-e", [[ @@ -668,6 +696,7 @@ lspconfig.julials.setup { Base.load_path_expand("@v#.#"), )) end + ENV["JULIA_DEBUG"] = "LanguageServer" @info "Running language server" VERSION pwd() project_path depot_path server = LanguageServer.LanguageServerInstance(stdin, stdout, project_path, depot_path) server.runlinter = true diff --git a/dotfiles/neovim/lua/lspconfig/server_configurations/jetls.lua b/dotfiles/neovim/lua/lspconfig/server_configurations/jetls.lua index fb6b304..c2a66d1 100644 --- a/dotfiles/neovim/lua/lspconfig/server_configurations/jetls.lua +++ b/dotfiles/neovim/lua/lspconfig/server_configurations/jetls.lua @@ -7,6 +7,7 @@ configs.jetls = { default_config = { cmd = { 'julia', + '+beta', '--project=' .. vim.env.HOME .. '/work/julia/JETLS.jl', '--startup-file=no', '--history-file=no', diff --git a/extra_configs/qpdfview/update_config.py b/extra_configs/qpdfview/update_config.py index d6593e4..85e1506 100755 --- a/extra_configs/qpdfview/update_config.py +++ b/extra_configs/qpdfview/update_config.py @@ -68,6 +68,8 @@ shortcut_config["General"]["findPrevious"] = "Ctrl+Shift+G, Shift+Return" shortcut_config["General"]["jumpToPage"] = "Ctrl+J, G" shortcut_config["General"]["nextPage"] = "Space, N" shortcut_config["General"]["previousPage"] = "Backspace, P" +shortcut_config["General"]["zoomIn"] = "Ctrl+Up, Ctrl++" +shortcut_config["General"]["zoomOut"] = "Ctrl+Down, Ctrl+-" with open(QPDFVIEW_CONFIG_SHORTCUTS, "w") as file: shortcut_config.write(file, space_around_delimiters=False) diff --git a/nix/flake.lock b/nix/flake.lock new file mode 100644 index 0000000..e89d268 --- /dev/null +++ b/nix/flake.lock @@ -0,0 +1,27 @@ +{ + "nodes": { + "nixpkgs": { + "locked": { + "lastModified": 1745391562, + "narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/nix/flake.nix b/nix/flake.nix index b43071e..a382c7d 100644 --- a/nix/flake.nix +++ b/nix/flake.nix @@ -15,7 +15,15 @@ nixpkgs.legacyPackages.x86_64-linux.curl nixpkgs.legacyPackages.x86_64-linux.neovim nixpkgs.legacyPackages.x86_64-linux.ripgrep + nixpkgs.legacyPackages.x86_64-linux.bat + nixpkgs.legacyPackages.x86_64-linux.eza + nixpkgs.legacyPackages.x86_64-linux.zoxide + nixpkgs.legacyPackages.x86_64-linux.yazi + nixpkgs.legacyPackages.x86_64-linux.hexyl nixpkgs.legacyPackages.x86_64-linux.fzf + nixpkgs.legacyPackages.x86_64-linux.difftastic + nixpkgs.legacyPackages.x86_64-linux.starship + nixpkgs.legacyPackages.x86_64-linux.lazygit nixpkgs.legacyPackages.x86_64-linux.clang-tools ];