Skip to content

Commit 98c5836

Browse files
joehannesjoehannes
committed
chore(bump): monolithic
1 parent 2977eba commit 98c5836

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+668
-1383
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ node_modules/
44
sessions/*
55
bookmarks
66
.lazy-lock.json
7+
verbose.log

‎.nfnl.fnl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{:source-file-patterns ["fnl/**/*.fnl"]}
1+
{:source-file-patterns ["fnl/*.fnl" "fnl/**/*.fnl" "fnl/**/**/*.fnl"]}

‎fnl/keymappings/normal.fnl

+10-8
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
:notifications]]
4848
(.. my.icon.ui.Check " " :dismiss)]
4949
["["
50-
[[:b :<Cmd>BufferLineCyclePrev<CR> "buf to left"]
51-
[:B :<Cmd>bprevious<CR> "buf to left"]
50+
[[:b :<Cmd>bprevious<CR> "buf to left"]
51+
[:B :<Cmd>BufMRUPrev<CR> "buf mru prev"]
5252
[:d "<cmd>lua vim.diagnostic.goto_prev()<CR>" :diag]
5353
[:e "<Plug>(ultest-prev-fail)" "failed test"]
5454
[:h "<cmd>Gitsigns prev_hunk<CR>" :hunk]
@@ -86,8 +86,8 @@
8686
[:w :<Cmd>tabprevious<CR> :tab/winLayout]]
8787
(.. my.icon.ui.BoldArrowLeft " " :Prev...)]
8888
["]"
89-
[[:b :<Cmd>BufferLineCycleNext<CR> "next buf"]
90-
[:B :<Cmd>bnext<CR> "next buf"]
89+
[[:b :<Cmd>bnext<CR> "next buf"]
90+
[:B :<Cmd>BufMRUNext<CR> "buf mru next"]
9191
[:d "<cmd>lua vim.diagnostic.goto_next()<CR>" :diag]
9292
[:e "<Plug>(ultest-next-fail)" "failed test"]
9393
[:h "<cmd>Gitsigns next_hunk<CR>" :hunk]
@@ -154,6 +154,9 @@
154154
[:I
155155
:<cmd>TypescriptOrganizeImports<CR>
156156
"typescript organize imports"]
157+
[:K
158+
:<cmd>TWValues<CR>
159+
"TailwindCSSValues"]
157160
[:r ":IncRename " "symbol refactor/rename"]
158161
[:R
159162
:<cmd>TypescriptRenameFile<CR>
@@ -260,7 +263,7 @@
260263
[">"
261264
[
262265
[:s :<Cmd>SessionSave<CR> (.. my.icon.ui.SignOut " Session")]
263-
[:x :<Cmd>FnlCompile<CR> (.. my.icon.ui.Code " FnlCompile")]]
266+
[:x "<Cmd>lua require('nfnl.api')['compile-all-files']()<CR>" (.. my.icon.ui.Code " FnlCompile")]]
264267
(.. my.icon.ui.SignOut " Out...")]
265268
[:b
266269
[[:q ":bp|bd #<CR>" "quit current buffer"]
@@ -333,9 +336,8 @@
333336
(.. my.icon.kind.Module " Symbols...")]
334337
[:a "<Cmd>Telescope lsp_code_actions<CR>" "code actions"]
335338
[:b
336-
[["*" "<Cmd>Telescope scope buffers<CR>" "GlobalBuffers"]
337-
["." "<Cmd>Telescope buffers<CR>" "LocalBuffers"]]
338-
(.. my.icon.ui.Telescope my.icon.ui.Files " OpenBuffers...")]
339+
"<Cmd>Telescope buffers<CR>"
340+
(.. my.icon.ui.Telescope my.icon.ui.Files " OpenedBuffers")]
339341
[:d "<Cmd>Telescope lsp_definitions<CR>" :definitions]
340342
[:i "<Cmd>Telescope lsp_implementations<CR>" :implementations]
341343
[:r "<Cmd>Telescope lsp_references<CR>" :references]

‎fnl/plugins/buffer.fnl

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
(local my _G.my)
22

3-
[{1 :tiagovla/scope.nvim
4-
:config (fn []
5-
((. (require :scope) :setup)))}
3+
[; {1 :tiagovla/scope.nvim
4+
; :config (fn []
5+
; ((. (require :scope) :setup))
6+
[:mildred/vim-bufmru]
67
{1 :kwkarlwang/bufresize.nvim
78
:config (fn []
89
(local opts {:noremap true :silent true})

‎fnl/plugins/coding.fnl

+13-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
:dependencies ["MunifTanjim/nui.nvim"
1919
"nvim-lua/plenary.nvim"
2020
"nvim-telescope/telescope.nvim"]}
21-
[:subnut/nvim-ghost.nvim]
21+
{1 :glacambre/firenvim
22+
:lazy (not vim.g.started_by_firenvim)
23+
:build #((. vim.fn "firenvim#install") 0)}
2224
{1 :nvim-treesitter/nvim-treesitter
2325
:branch :master
2426
:build ":TSUpdate"
@@ -82,5 +84,14 @@
8284
:after_open (fn [] (vim.api.nvim_buf_set_keymap 0 "n" "<Esc>" ":close<CR>" {}))}))}
8385
[:sheerun/vim-polyglot]
8486
[:othree/es.next.syntax.vim]
85-
[:othree/javascript-libraries-syntax.vim]]
87+
[:othree/javascript-libraries-syntax.vim]
88+
{1 :MaximilianLloyd/tw-values.nvim
89+
:opts {:border :rounded
90+
:copy_register ""
91+
:focus_preview true
92+
:keymaps {:copy :<C-y>}
93+
:show_unknown_classes true}}
94+
{1 :luckasRanarison/tailwind-tools.nvim
95+
:opts {}}]
96+
8697

‎fnl/plugins/config/bufferline.fnl

+83-84
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
(local my _G.my)
2-
(set vim.opt.termguicolors true)
32

43
(local M {})
54

@@ -14,12 +13,12 @@
1413
(my.color.fn.background_blend (vimode-color) 50))
1514

1615
{:background {:bg (tertiary-vimode-color)
17-
:fg my.color.my.theme.bold-retro.primary
16+
:fg (. (my.color.theme my.color.my.current-theme) :primary)
1817
:force true}
1918
:buffer {:bg (tertiary-vimode-color) :fg my.color.my.dark :force true}
2019
:buffer_selected {:bg (vimode-color)
2120
:bold true
22-
:fg my.color.my.theme.bold-retro.primary
21+
:fg (. (my.color.theme my.color.my.current-theme) :primary)
2322
:force true}
2423
:buffer_visible {:bg (secondary-vimode-color)
2524
:fg my.color.my.purple
@@ -28,29 +27,29 @@
2827
:fg (. my.color.my (vim.opt.background:get))}
2928
:close_button_selected {:bg (vimode-color)
3029
:bold true
31-
:fg my.color.my.theme.bold-retro.primary}
30+
:fg (. (my.color.theme my.color.my.current-theme) :primary)}
3231
:close_button_visible {:bg (secondary-vimode-color)
33-
:fg my.color.my.theme.bold-retro.primary}
34-
:diagnostic {:bg (tertiary-vimode-color) :fg my.color.my.theme.bold-retro.attention}
32+
:fg (. (my.color.theme my.color.my.current-theme) :primary)}
33+
:diagnostic {:bg (tertiary-vimode-color) :fg (. (my.color.theme my.color.my.current-theme) :attention)}
3534
:diagnostic_selected {:bg (vimode-color)
3635
:bold true
37-
:fg my.color.my.theme.bold-retro.attention
36+
:fg (. (my.color.theme my.color.my.current-theme) :attention)
3837
:italic true}
3938
:diagnostic_visible {:bg (secondary-vimode-color)
4039
:bold true
41-
:fg my.color.my.theme.bold-retro.attention}
40+
:fg (. (my.color.theme my.color.my.current-theme) :attention)}
4241
:error {:bg (tertiary-vimode-color)
43-
:fg (my.color.util.darken my.color.my.theme.bold-retro.attention 66)}
44-
:error_diagnostic {:bg (tertiary-vimode-color) :fg my.color.my.theme.bold-retro.attention}
42+
:fg (my.color.util.darken (. (my.color.theme my.color.my.current-theme) :attention) 66)}
43+
:error_diagnostic {:bg (tertiary-vimode-color) :fg (. (my.color.theme my.color.my.current-theme) :attention)}
4544
:error_diagnostic_selected {:bg (vimode-color)
46-
:fg (my.color.util.darken my.color.my.theme.bold-retro.attention 33)}
45+
:fg (my.color.util.darken (. (my.color.theme my.color.my.current-theme) :attention) 33)}
4746
:error_diagnostic_visible {:bg (secondary-vimode-color)
48-
:fg (my.color.util.darken my.color.my.theme.bold-retro.attention 21)}
47+
:fg (my.color.util.darken (. (my.color.theme my.color.my.current-theme) :attention) 21)}
4948
:error_selected {:bg (vimode-color)
50-
:fg (my.color.util.darken my.color.my.theme.bold-retro.attention 66)}
49+
:fg (my.color.util.darken (. (my.color.theme my.color.my.current-theme) :attention) 66)}
5150
:error_visible {:bg (secondary-vimode-color)
52-
:fg (my.color.util.darken my.color.my.theme.bold-retro.attention 66)}
53-
:fill {:bg my.color.my.theme.bold-retro.primary}
51+
:fg (my.color.util.darken (. (my.color.theme my.color.my.current-theme) :attention) 66)}
52+
:fill {:bg (. (my.color.theme my.color.my.current-theme) :primary)}
5453
:hint {:bg (tertiary-vimode-color)
5554
:fg (my.color.util.darken my.color.my.yellow 66)}
5655
:hint_diagnostic {:bg (tertiary-vimode-color) :fg my.color.my.yellow}
@@ -73,14 +72,14 @@
7372
:fg (my.color.util.darken my.color.my.blue 66)}
7473
:info_visible {:bg (secondary-vimode-color)
7574
:fg (my.color.util.darken my.color.my.blue 66)}
76-
:modified {:bg (tertiary-vimode-color) :fg my.color.my.theme.bold-retro.attention}
77-
:modified_selected {:bg (vimode-color) :fg my.color.my.theme.bold-retro.attention}
78-
:modified_visible {:bg (secondary-vimode-color) :fg my.color.my.theme.bold-retro.attention}
75+
:modified {:bg (tertiary-vimode-color) :fg (. (my.color.theme my.color.my.current-theme) :attention)}
76+
:modified_selected {:bg (vimode-color) :fg (. (my.color.theme my.color.my.current-theme) :attention)}
77+
:modified_visible {:bg (secondary-vimode-color) :fg (. (my.color.theme my.color.my.current-theme) :attention)}
7978
:pick_selected {:bg (. my.color.my (vim.opt.background:get))
8079
:fg (vimode-color)}
81-
:separator {:bg (tertiary-vimode-color) :fg my.color.my.theme.bold-retro.primary}
82-
:separator_selected {:bg (vimode-color) :fg my.color.my.theme.bold-retro.primary}
83-
:separator_visible {:bg (secondary-vimode-color) :fg my.color.my.theme.bold-retro.primary}
80+
:separator {:bg (tertiary-vimode-color) :fg (. (my.color.theme my.color.my.current-theme) :primary)}
81+
:separator_selected {:bg (vimode-color) :fg (. (my.color.theme my.color.my.current-theme) :primary)}
82+
:separator_visible {:bg (secondary-vimode-color) :fg (. (my.color.theme my.color.my.current-theme) :primary)}
8483
:tab {:bg (tertiary-vimode-color)}
8584
:tab_close {:bg (vimode-color) :bold true :fg my.color.my.dark}
8685
:tab_selected {:bg (vimode-color) :bold true :fg my.color.my.light}
@@ -98,71 +97,71 @@
9897
:warning_visible {:bg (secondary-vimode-color)
9998
:fg (my.color.util.darken my.color.my.orange 66)}})
10099

101-
(local opts {:highlights (highlights)
102-
:options {:always_show_bufferline true
103-
:buffer_close_icon ""
104-
:close_command "bp | silent! bd! %d"
105-
:close_icon ""
106-
:custom_areas {}
107-
:custom_filter (fn [buf-number]
108-
(when (not (not (: (vim.api.nvim_buf_get_name buf-number)
109-
:find
110-
(vim.fn.getcwd) 0
111-
true)))
112-
true))
113-
:diagnostics :nvim_lsp
114-
:diagnostics_indicator (fn [count
115-
level
116-
diagnostics-dict
117-
context]
118-
(var s " ")
119-
(each [e n (pairs diagnostics-dict)]
120-
(local sym
121-
(or (and (= e :error)
122-
" ")
123-
(or (and (= e
124-
:warning)
125-
" ")
126-
" ")))
127-
(set s (.. s n sym)))
128-
s)
129-
:enforce_regular_tabs false
130-
:indicator {:icon "▎" :style :icon}
131-
:left_mouse_command "buffer %d"
132-
:left_trunc_marker ""
133-
:max_name_length 21
134-
:max_prefix_length 15
135-
:middle_mouse_command "sbuffer %d"
136-
:modified_icon "●"
137-
:name_formatter (fn [buf]
138-
(vim.fn.fnamemodify buf.name ":t"))
139-
:numbers :none
140-
:persist_buffer_sort true
141-
:right_mouse_command "sbuffer %d"
142-
:right_trunc_marker ""
143-
:separator_style :slope
144-
:show_buffer_close_icons true
145-
:show_buffer_icons true
146-
:show_close_icon true
147-
:show_tab_indicators true
148-
:sort_by (fn [buffer-a buffer-b]
149-
(local mod-a
150-
(or (. (or (. (or (vim.loop.fs_stat buffer-a.path)
100+
(local opts (fn [] {:highlights (highlights)
101+
:options {:always_show_bufferline true
102+
:buffer_close_icon ""
103+
:close_command "bp | silent! bd! %d"
104+
:close_icon ""
105+
:custom_areas {}
106+
:custom_filter (fn [buf-number]
107+
(when (not (not (: (vim.api.nvim_buf_get_name buf-number)
108+
:find
109+
(vim.fn.getcwd) 0
110+
true)))
111+
true))
112+
:diagnostics :nvim_lsp
113+
:diagnostics_indicator (fn [count
114+
level
115+
diagnostics-dict
116+
context]
117+
(var s " ")
118+
(each [e n (pairs diagnostics-dict)]
119+
(local sym
120+
(or (and (= e :error)
121+
" ")
122+
(or (and (= e
123+
:warning)
124+
" ")
125+
" ")))
126+
(set s (.. s n sym)))
127+
s)
128+
:enforce_regular_tabs false
129+
:indicator {:icon "▎" :style :icon}
130+
:left_mouse_command "buffer %d"
131+
:left_trunc_marker ""
132+
:max_name_length 21
133+
:max_prefix_length 15
134+
:middle_mouse_command "sbuffer %d"
135+
:modified_icon "●"
136+
:name_formatter (fn [buf]
137+
(vim.fn.fnamemodify buf.name ":t"))
138+
:numbers :none
139+
:persist_buffer_sort true
140+
:right_mouse_command "sbuffer %d"
141+
:right_trunc_marker ""
142+
:separator_style :slope
143+
:show_buffer_close_icons true
144+
:show_buffer_icons true
145+
:show_close_icon true
146+
:show_tab_indicators true
147+
:sort_by (fn [buffer-a buffer-b]
148+
(local mod-a
149+
(or (. (or (. (or (vim.loop.fs_stat buffer-a.path)
150+
{})
151+
:atime)
151152
{})
152-
:atime)
153-
{})
154-
:sec)
155-
0))
156-
(local mod-b
157-
(or (. (or (. (or (vim.loop.fs_stat buffer-b.path)
153+
:sec)
154+
0))
155+
(local mod-b
156+
(or (. (or (. (or (vim.loop.fs_stat buffer-b.path)
157+
{})
158+
:atime)
158159
{})
159-
:atime)
160-
{})
161-
:sec)
162-
0))
163-
(> mod-a mod-b))
164-
:tab_size 7}})
165-
((. (require :bufferline) :setup) opts))
160+
:sec)
161+
0))
162+
(> mod-a mod-b))
163+
:tab_size 7}}))
164+
((. (require :bufferline) :setup) (opts)))
166165

167166
M
168167

0 commit comments

Comments
 (0)