Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
ttak0422 committed Aug 1, 2024
1 parent 53e5ec6 commit aa239e6
Show file tree
Hide file tree
Showing 11 changed files with 46 additions and 44 deletions.
23 changes: 20 additions & 3 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -993,6 +993,10 @@
url = "github:/ibhagwan/fzf-lua";
flake = false;
};
dropbar-nvim = {
url = "github:Bekaboo/dropbar.nvim";
flake = false;
};
};

outputs =
Expand Down
7 changes: 6 additions & 1 deletion fnl/hook-buffer.fnl
Original file line number Diff line number Diff line change
Expand Up @@ -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)))

Expand Down
10 changes: 4 additions & 6 deletions fnl/prelude.fnl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 2 additions & 8 deletions fnl/statuscol.fnl
Original file line number Diff line number Diff line change
Expand Up @@ -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}))
7 changes: 1 addition & 6 deletions fnl/ufo.fnl
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion lua/autogen/hook-buffer.lua

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 3 additions & 4 deletions lua/autogen/prelude.lua

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 3 additions & 9 deletions lua/autogen/statuscol.lua

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 1 addition & 5 deletions lua/autogen/ufo.lua

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion overlays.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
Expand Down

0 comments on commit aa239e6

Please sign in to comment.