diff --git a/flake.lock b/flake.lock index f029988..6d4dce5 100644 --- a/flake.lock +++ b/flake.lock @@ -1226,6 +1226,22 @@ "type": "github" } }, + "dropbar-nvim": { + "flake": false, + "locked": { + "lastModified": 1721885574, + "narHash": "sha256-M5PSMiglIu22FA7Hzr6bhfLyXBFVPyV13PaZbiU+jSs=", + "owner": "Bekaboo", + "repo": "dropbar.nvim", + "rev": "aa4c0ab1ade45ff9a3c5d4c06365c9b119f32d36", + "type": "github" + }, + "original": { + "owner": "Bekaboo", + "repo": "dropbar.nvim", + "type": "github" + } + }, "efmls-configs-nvim": { "flake": false, "locked": { @@ -3588,6 +3604,7 @@ "diffview-nvim": "diffview-nvim", "direnv-vim": "direnv-vim", "dressing-nvim": "dressing-nvim", + "dropbar-nvim": "dropbar-nvim", "efmls-configs-nvim": "efmls-configs-nvim", "flake-parts": "flake-parts_2", "flit-nvim": "flit-nvim", @@ -3863,11 +3880,11 @@ "statuscol-nvim": { "flake": false, "locked": { - "lastModified": 1718485869, - "narHash": "sha256-kzaSpkeiH0kOvMQJSHioOcbXTnSKaSglIMf+53q+ZGM=", + "lastModified": 1722422861, + "narHash": "sha256-Rgyjgoc/2unXBo/icbfhj92XlSt2CnpEu4m/5iTYgDE=", "owner": "luukvbaal", "repo": "statuscol.nvim", - "rev": "d6f7f5437c5404d958b88bb73e0721b1c0e09223", + "rev": "93d8bcda516fc86e11c03f9ef577bae9a72fba0e", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 6098040..9e605ef 100644 --- a/flake.nix +++ b/flake.nix @@ -993,6 +993,10 @@ url = "github:/ibhagwan/fzf-lua"; flake = false; }; + dropbar-nvim = { + url = "github:Bekaboo/dropbar.nvim"; + flake = false; + }; }; outputs = diff --git a/fnl/hook-buffer.fnl b/fnl/hook-buffer.fnl index ccbdc3a..063ee79 100644 --- a/fnl/hook-buffer.fnl +++ b/fnl/hook-buffer.fnl @@ -30,7 +30,12 @@ ;; カレントウィンドウの最小幅 :winwidth 20 ;; カレントウィンドウの最小高 - :winheight 1}] + :winheight 1 + :foldcolumn :1 + :signcolumn :yes + :number true + :foldenable true + :fillchars "eob: ,fold: ,foldopen:,foldsep: ,foldclose:"}] (each [k v (pairs opts)] (tset vim.o k v))) diff --git a/fnl/prelude.fnl b/fnl/prelude.fnl index 2fa00f1..5952d24 100644 --- a/fnl/prelude.fnl +++ b/fnl/prelude.fnl @@ -48,13 +48,11 @@ ;; SpecificFileEnter (let [A vim.api] (set specificFileEnterAutoCmd - (A.nvim_create_autocmd :FileType + (A.nvim_create_autocmd :BufReadPost {:callback (fn [] - (if (let [F vim.bo.filetype - B vim.bo.buftype - ] - (not (or (= F "") - (= B :prompt) + (if (let [;; F vim.bo.filetype + B vim.bo.buftype] + (not (or (= B :prompt) (= B :nofile)))) (do (A.nvim_exec_autocmds :User diff --git a/fnl/statuscol.fnl b/fnl/statuscol.fnl index 2a1bffc..b6578b5 100644 --- a/fnl/statuscol.fnl +++ b/fnl/statuscol.fnl @@ -2,11 +2,5 @@ {:__index (require :statuscol)}) segments [{:text ["%s"] :maxwidth 2 :click "v:lua.ScSa"} {:text [M.builtin.lnumfunc] :click "v:lua.ScLa"} - {:text [" " M.builtin.foldfunc " "] :click "v:lua.ScFa"}] - ft_ignore []] - (M.setup {:setopt true :relculright false : ft_ignore : segments})) - -;; 行数表示 -(set vim.o.number true) -;; signcolumnのがたつきを無くす -(set vim.o.signcolumn :yes) + {:text [" " M.builtin.foldfunc " "] :click "v:lua.ScFa"}]] + (M.setup {:setopt true :relculright false : segments})) diff --git a/fnl/ufo.fnl b/fnl/ufo.fnl index d71e484..bccf287 100644 --- a/fnl/ufo.fnl +++ b/fnl/ufo.fnl @@ -1,12 +1,7 @@ (let [M (require :ufo) - provider_selector (fn [bufnr filetype buftype] [:treesitter :indent]) + provider_selector (fn [_bufnr _filetype _buftype] [:treesitter :indent]) map vim.keymap.set - opts {:foldcolumn :1 - :foldenable true - :fillchars "eob: ,fold: ,foldopen:,foldsep: ,foldclose:"} opt {:noremap true :silent true}] - (each [k v (pairs opts)] - (tset vim.o k v)) (M.setup {: provider_selector}) (map :n :zR M.openAllFolds opt) (map :n :zM M.closeAllFolds opt) diff --git a/lua/autogen/hook-buffer.lua b/lua/autogen/hook-buffer.lua index 2ff4f16..bd81cfe 100644 --- a/lua/autogen/hook-buffer.lua +++ b/lua/autogen/hook-buffer.lua @@ -1,7 +1,7 @@ -- [nfnl] Compiled from fnl/hook-buffer.fnl by https://github.com/Olical/nfnl, do not edit. do local cachePath = vim.fn.stdpath("cache") - local opts = {helplang = "ja,en", mouse = "a", hidden = true, autoread = true, undofile = true, undodir = (cachePath .. "/undo"), swapfile = true, directory = (cachePath .. "/swap"), backup = true, backupcopy = "yes", backupdir = (cachePath .. "/backup"), diffopt = "internal,filler,closeoff,vertical", splitright = true, splitbelow = true, winwidth = 20, winheight = 1, startofline = false, equalalways = false} + local opts = {helplang = "ja,en", mouse = "a", hidden = true, autoread = true, undofile = true, undodir = (cachePath .. "/undo"), swapfile = true, directory = (cachePath .. "/swap"), backup = true, backupcopy = "yes", backupdir = (cachePath .. "/backup"), diffopt = "internal,filler,closeoff,vertical", splitright = true, splitbelow = true, winwidth = 20, winheight = 1, foldcolumn = "1", signcolumn = "yes", number = true, foldenable = true, fillchars = "eob: ,fold: ,foldopen:\239\145\188,foldsep: ,foldclose:\239\145\160", equalalways = false, startofline = false} for k, v in pairs(opts) do vim.o[k] = v end diff --git a/lua/autogen/prelude.lua b/lua/autogen/prelude.lua index dd49d17..1fad9e3 100644 --- a/lua/autogen/prelude.lua +++ b/lua/autogen/prelude.lua @@ -1,6 +1,6 @@ -- [nfnl] Compiled from fnl/prelude.fnl by https://github.com/Olical/nfnl, do not edit. vim.loader.enable() -for k, v in pairs({langmenu = "none", shortmess = (vim.o.shortmess .. "sWIcCS"), cmdheight = 0, termguicolors = true, signcolumn = "no", showtabline = 0, laststatus = 0, foldlevel = 99, foldlevelstart = 99, showmode = false, number = false}) do +for k, v in pairs({langmenu = "none", shortmess = (vim.o.shortmess .. "sWIcCS"), cmdheight = 0, termguicolors = true, signcolumn = "no", showtabline = 0, laststatus = 0, foldlevel = 99, foldlevelstart = 99, number = false, showmode = false}) do vim.o[k] = v end vim.g.mapleader = " " @@ -26,9 +26,8 @@ do local function _2_() local _3_ do - local F = vim.bo.filetype local B = vim.bo.buftype - _3_ = not ((F == "") or (B == "prompt") or (B == "nofile")) + _3_ = not ((B == "prompt") or (B == "nofile")) end if _3_ then A.nvim_exec_autocmds("User", {pattern = "SpecificFileEnter"}) @@ -37,7 +36,7 @@ do return nil end end - specificFileEnterAutoCmd = A.nvim_create_autocmd("FileType", {callback = _2_}) + specificFileEnterAutoCmd = A.nvim_create_autocmd("BufReadPost", {callback = _2_}) end vim.cmd("colorscheme morimo") local M = require("config-local") diff --git a/lua/autogen/statuscol.lua b/lua/autogen/statuscol.lua index e953f61..2c1bcd2 100644 --- a/lua/autogen/statuscol.lua +++ b/lua/autogen/statuscol.lua @@ -1,10 +1,4 @@ -- [nfnl] Compiled from fnl/statuscol.fnl by https://github.com/Olical/nfnl, do not edit. -do - local M = setmetatable({builtin = require("statuscol.builtin")}, {__index = require("statuscol")}) - local segments = {{text = {"%s"}, maxwidth = 2, click = "v:lua.ScSa"}, {text = {M.builtin.lnumfunc}, click = "v:lua.ScLa"}, {text = {" ", M.builtin.foldfunc, " "}, click = "v:lua.ScFa"}} - local ft_ignore = {} - M.setup({setopt = true, ft_ignore = ft_ignore, segments = segments, relculright = false}) -end -vim.o.number = true -vim.o.signcolumn = "yes" -return nil +local M = setmetatable({builtin = require("statuscol.builtin")}, {__index = require("statuscol")}) +local segments = {{text = {"%s"}, maxwidth = 2, click = "v:lua.ScSa"}, {text = {M.builtin.lnumfunc}, click = "v:lua.ScLa"}, {text = {" ", M.builtin.foldfunc, " "}, click = "v:lua.ScFa"}} +return M.setup({setopt = true, segments = segments, relculright = false}) diff --git a/lua/autogen/ufo.lua b/lua/autogen/ufo.lua index 41b2dde..b2e78c5 100644 --- a/lua/autogen/ufo.lua +++ b/lua/autogen/ufo.lua @@ -1,16 +1,12 @@ -- [nfnl] Compiled from fnl/ufo.fnl by https://github.com/Olical/nfnl, do not edit. local M = require("ufo") local provider_selector -local function _1_(bufnr, filetype, buftype) +local function _1_(_bufnr, _filetype, _buftype) return {"treesitter", "indent"} end provider_selector = _1_ local map = vim.keymap.set -local opts = {foldcolumn = "1", foldenable = true, fillchars = "eob: ,fold: ,foldopen:\239\145\188,foldsep: ,foldclose:\239\145\160"} local opt = {noremap = true, silent = true} -for k, v in pairs(opts) do - vim.o[k] = v -end M.setup({provider_selector = provider_selector}) map("n", "zR", M.openAllFolds, opt) map("n", "zM", M.closeAllFolds, opt) diff --git a/overlays.nix b/overlays.nix index c188384..69db408 100644 --- a/overlays.nix +++ b/overlays.nix @@ -45,7 +45,7 @@ inputs: with inputs; [ map (name: { inherit name; value = buildVimPlugin { - version = "bundled"; + version = (getAttr name inputs).rev; pname = name; src = getAttr name inputs; };