From 0da729ce7eda7211b14b7d8d00c1b5ea90075f12 Mon Sep 17 00:00:00 2001 From: qwjyh Date: Tue, 12 Nov 2024 10:23:30 +0900 Subject: [PATCH 1/5] update(nix): add starship & reevaluate --- nix/flake.lock | 27 +++++++++++++++++++++++++++ nix/flake.nix | 1 + 2 files changed, 28 insertions(+) create mode 100644 nix/flake.lock diff --git a/nix/flake.lock b/nix/flake.lock new file mode 100644 index 0000000..e3a64e1 --- /dev/null +++ b/nix/flake.lock @@ -0,0 +1,27 @@ +{ + "nodes": { + "nixpkgs": { + "locked": { + "lastModified": 1731139594, + "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", + "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..c6dcf63 100644 --- a/nix/flake.nix +++ b/nix/flake.nix @@ -16,6 +16,7 @@ nixpkgs.legacyPackages.x86_64-linux.neovim nixpkgs.legacyPackages.x86_64-linux.ripgrep nixpkgs.legacyPackages.x86_64-linux.fzf + nixpkgs.legacyPackages.x86_64-linux.starship nixpkgs.legacyPackages.x86_64-linux.clang-tools ]; From 7d8b8e3f14b19ed193f32083d706d1a8e2d09cb5 Mon Sep 17 00:00:00 2001 From: qwjyh Date: Tue, 12 Nov 2024 11:06:56 +0900 Subject: [PATCH 2/5] udpate(nix): add bat --- nix/flake.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nix/flake.nix b/nix/flake.nix index c6dcf63..b82ede3 100644 --- a/nix/flake.nix +++ b/nix/flake.nix @@ -15,6 +15,7 @@ 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.fzf nixpkgs.legacyPackages.x86_64-linux.starship From 58a5e3b60c0935b11b55a586b4252c86912036da Mon Sep 17 00:00:00 2001 From: qwjyh Date: Fri, 30 May 2025 16:44:27 +0900 Subject: [PATCH 3/5] update: add some packages to nix profile --- nix/flake.lock | 6 +++--- nix/flake.nix | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/nix/flake.lock b/nix/flake.lock index e3a64e1..e89d268 100644 --- a/nix/flake.lock +++ b/nix/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1731139594, - "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", + "lastModified": 1745391562, + "narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", + "rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7", "type": "github" }, "original": { diff --git a/nix/flake.nix b/nix/flake.nix index b82ede3..a382c7d 100644 --- a/nix/flake.nix +++ b/nix/flake.nix @@ -16,8 +16,14 @@ 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 ]; From 6ef87fb5a647bbc4ff7700866dc9213b82e7c11e Mon Sep 17 00:00:00 2001 From: qwjyh Date: Fri, 30 May 2025 16:53:35 +0900 Subject: [PATCH 4/5] update(nvim): add svls --- dotfiles/neovim/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotfiles/neovim/init.lua b/dotfiles/neovim/init.lua index 24b870f..c4b0b2a 100644 --- a/dotfiles/neovim/init.lua +++ b/dotfiles/neovim/init.lua @@ -715,7 +715,7 @@ lspconfig.rust_analyzer.setup { } local lss = { "pyright", "texlab", "ccls", "clangd", "ts_ls", --[["tailwindcss"]] "hls", "cmake", - "csharp_ls", "html", "r_language_server", "cssls", "jsonls", "sqls", "vhdl_ls", "ruff" } + "csharp_ls", "html", "r_language_server", "cssls", "jsonls", "sqls", "vhdl_ls", "ruff", "svls" } for _, ls in pairs(lss) do lspconfig[ls].setup { on_attach = on_attach, From acf06ff27f99ff1267da234980d760162d372169 Mon Sep 17 00:00:00 2001 From: qwjyh Date: Mon, 16 Jun 2025 02:49:37 +0900 Subject: [PATCH 5/5] update(nvim): show diagnostic in float window on jump --- dotfiles/neovim/init.lua | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dotfiles/neovim/init.lua b/dotfiles/neovim/init.lua index ff1e361..9fcecba 100644 --- a/dotfiles/neovim/init.lua +++ b/dotfiles/neovim/init.lua @@ -360,6 +360,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." })