Fix tab/shift-tab key bindings for fzf-lua

README.md

@@ -3,7 +3,7 @@
 - Install packages:
 
 ```
-sudo pacman -S fd fzf neovim neovim-qt xclip xxhash
+sudo pacman -S fd fzf neovim neovim-qt xclip xxhash wl-clipboard
 ```
 
 - `mkdir ~/.config/nvim`

ftdetect/propane.vim

@@ -0,0 +1 @@
+au BufNewFile,BufRead *.propane set filetype=propane

plugin/holtrop.lua

@@ -5,6 +5,20 @@ vim.cmd([[colorscheme tokyonight-night]])
 -- Load fzf-lua plugin
 vim.opt.rtp:prepend("~/.config/nvim/holtrop.nvim/fzf-lua.nvim")
 vim.cmd([[runtime plugin/fzf-lua.lua]])
+require('fzf-lua').setup({
+  winopts = {
+    preview = {
+      layout = 'vertical',
+      vertical = 'down:50%',
+    },
+  },
+  keymap = {
+    fzf = {
+      ["tab"] = "down",
+      ["shift-tab"] = "up",
+    },
+  },
+})
 
 -- Show titlestring in GUI window title
 vim.opt.title = true
@@ -15,7 +29,15 @@ vim.opt.cursorcolumn = true
 vim.opt.cursorline = true
 vim.opt.so = 8
 vim.opt.wildmode = {'list:longest'}
+vim.opt.splitbelow = true
+vim.opt.splitright = true
 vim.g.editorconfig = false
+-- Following are also set in the BufReadPost autocommand below
+vim.opt.expandtab = true
+vim.opt.ts = 4
+vim.opt.sw = 4
+vim.opt.sts = 4
+vim.opt.cinoptions = ":0,g0"
 
 local holtrop_bufread_group = vim.api.nvim_create_augroup("holtrop_bufread_group", { clear = true })
 
@@ -27,16 +49,40 @@ vim.api.nvim_create_autocmd({ "BufReadPost", "BufNewFile" }, {
             if vim.bo.filetype ~= "make" then
                 vim.opt_local.expandtab = true
             end
-            vim.opt_local.ts = 4
-            vim.opt_local.sw = 4
-            vim.opt_local.sts = 4
+            local ft = vim.bo.filetype
+            local indent = 4
+            if ft == "ruby" or ft == "html" or ft == "xml" then
+                indent = 2
+            end
+            vim.opt_local.ts = indent
+            vim.opt_local.sw = indent
+            vim.opt_local.sts = indent
             vim.opt_local.cinoptions = ":0,g0"
         end)
     end,
 })
 
+-- Restore cursor position after opening a file
+local cursor_group = vim.api.nvim_create_augroup("holtrop_restore_cursor", { clear = true })
+
+vim.api.nvim_create_autocmd("BufReadPost", {
+  group = cursor_group,
+  pattern = "*",
+  callback = function()
+    -- Get the row and column of the last cursor position mark
+    local mark = vim.api.nvim_buf_get_mark(0, '"')
+    local lcount = vim.api.nvim_buf_line_count(0)
+
+    -- If the mark is valid, jump to it, unless it's a git commit message
+    if mark[1] > 0 and mark[1] <= lcount and vim.bo.filetype ~= "gitcommit" then
+      pcall(vim.api.nvim_win_set_cursor, 0, mark)
+    end
+  end,
+})
+
 -- Shortcuts
-vim.cmd([[map <C-s> :FzfLua combine pickers=buffers,files<CR>]])
+vim.cmd([[map <C-s> :FzfLua combine pickers=buffers,git_files<CR>]])
+vim.cmd([[map f<C-s> :FzfLua combine pickers=buffers,files<CR>]])
 vim.cmd([[inoremap <C-Enter> <Esc>O]])
 vim.cmd([[vnoremap < <gv]])
 vim.cmd([[vnoremap > >gv]])
@@ -44,6 +90,8 @@ vim.cmd([[nnoremap <silent> ,t :tabn<CR>]])
 vim.cmd([[nnoremap <silent> ,T :tabp<CR>]])
 vim.cmd([[nnoremap <silent> <C-S-PageUp> :tabmove -1<CR>]])
 vim.cmd([[nnoremap <silent> <C-S-PageDown> :tabmove +1<CR>]])
+vim.cmd([[nnoremap <silent> ,j Ji<CR><Esc>]])
+vim.cmd([[nnoremap ,s :%s/\v +$//<CR>]])
 
 -- Use system clipboard for unnamed register
 vim.opt.clipboard = "unnamedplus"
@@ -60,3 +108,14 @@ vim.api.nvim_create_autocmd({ "FocusGained", "BufEnter" }, {
 })
 
 vim.filetype.add({filename = {["Rsconscript"] = "ruby"}})
+
+-- Treat *.rs.erb files as eruby with an embedded Rust subtype
+vim.filetype.add({
+  pattern = {
+    [".*%.rs%.erb"] = function(_, bufnr)
+      return "eruby", function()
+        vim.b[bufnr].eruby_subtype = "rust"
+      end
+    end,
+  },
+})

syntax/propane.vim

@@ -0,0 +1,51 @@
+" Vim syntax file for Propane
+" Language: propane
+" Maintainer: Josh Holtrop
+" URL: https://github.com/holtrop/propane
+
+if exists("b:current_syntax")
+  finish
+endif
+
+if !exists("b:propane_subtype")
+  if search('\<import\s\+\%(std\|core\)\.', 'nw') > 0
+    let b:propane_subtype = "d"
+  else
+    let b:propane_subtype = "cpp"
+  endif
+endif
+
+exe "syn include @propaneTarget syntax/".b:propane_subtype.".vim"
+
+syn region propaneTarget matchgroup=propaneDelimiter start="<<" end=">>$" contains=@propaneTarget keepend
+
+syn match propaneComment "#.*"
+syn match propaneFieldAlias ":[a-zA-Z0-9_]\+" contains=propaneFieldOperator
+syn match propaneFieldOperator ":" contained
+syn match propaneOperator "?"
+" The right-hand side of a rule (after '->' up to '<<' or ';') lists symbol
+" names that may coincide with propane keywords (e.g. 'start', 'token',
+" 'tree'). Wrap it in a region that excludes keyword matches so those names
+" are not highlighted as keywords. The '<<' is left unconsumed so the
+" propaneTarget region can still match it.
+syn region propaneRuleRhs matchgroup=propaneOperator start="->" end="\ze<<" end=";" contains=propaneFieldAlias,propaneRuleOperator,propaneComment keepend
+syn match propaneRuleOperator "?" contained
+" Keywords that introduce a user-defined name. The name is consumed by
+" propaneName via nextgroup so a name matching a keyword (e.g. 'token start')
+" is not highlighted as a keyword. These must be a match (not syn keyword)
+" because a syn keyword always wins over a contained nextgroup match.
+syn match propaneNameDecl "\<\%(tokenid\|token\|lex_fn\|module\|start\|tree_prefix\|tree_suffix\)\>" nextgroup=propaneName skipwhite
+syn match propaneName "\<\h\w*\>" contained
+syn match propaneKeyword "\<\%(context_user_fields\|drop\|free_token_node\|noline\|on_token_node\|prefix\|ptype\|token_user_fields\|tree\)\>"
+
+syn region propaneRegex start="/" end="/" skip="\v\\\\|\\/"
+
+hi def link propaneComment Comment
+hi def link propaneKeyword Keyword
+hi def link propaneNameDecl Keyword
+hi def link propaneRegex String
+hi def link propaneOperator Operator
+hi def link propaneRuleOperator Operator
+hi def link propaneFieldOperator Operator
+hi def link propaneDelimiter Delimiter
+hi def link propaneFieldAlias Identifier