Merge branch 'main' of github.com:qwjyh/dotfiles

dotfiles/neovim/init.lua

@@ -361,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', '<C-w>h', '<C-\\><C-N><C-w>h',
     { noremap = true, desc = "Exit terminal-mode and move to left window." })

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
+}

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
       ];