Skip to content

Commit 7fbd24b

Browse files
fedemengofedemengo
committed
fnl fmt
1 parent dea4769 commit 7fbd24b

3 files changed

Lines changed: 56 additions & 80 deletions

File tree

‎fnl/core.fnl‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
(module :core)
2+
23
;; autocmd
34

45
(when (vim.fn.has :autocmd)
@@ -138,13 +139,13 @@
138139

139140
(set vim.o.list true)
140141
(set vim.opt.listchars {:tab "▸ " :eol "↵"})
141-
142142
; :space "⋅"})
143143

144144
;; open all folds by default
145145

146146
(set vim.o.foldenable false)
147147
(set vim.o.foldexpr "nvim_treesitter#foldexpr()")
148+
148149
;; undo dir
149150

150151
(local undodir_path (.. (os.getenv :HOME) :/.nvim/undo-dir/))
@@ -153,6 +154,7 @@
153154

154155
(set vim.o.undodir undodir_path)
155156
(set vim.o.undofile true)
157+
156158
;(vim.cmd "colorscheme monokai-pro-spectrum")
157159

158160
(match (pcall #(vim.cmd "colorscheme PaperColor"))

‎fnl/mapping.fnl‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
(module :mapping)
2-
32
;; open new file at current line in new tab
43

54
(fn opentab-at-location []
@@ -30,8 +29,8 @@
3029

3130
(fn toggle-theme []
3231
(if (= :dark (. vim.o :background))
33-
(light-theme)
34-
(dark-theme)))
32+
(light-theme)
33+
(dark-theme)))
3534

3635
(fn open-web-commit []
3736
(let [path (vim.fn.expand "%:p:h")
@@ -69,32 +68,27 @@
6968
(fn toggle-wrap []
7069
(let [has-wrap (. vim.wo :wrap)]
7170
(if has-wrap
72-
(vim.cmd "windo set nowrap")
73-
(vim.cmd "windo set wrap"))))
71+
(vim.cmd "windo set nowrap")
72+
(vim.cmd "windo set wrap"))))
7473

7574
(map [:v] :<leader><space> eval-expression {:desc "Evaluate expression"})
76-
7775
;; search with s instead of f
7876

7977
(map [:n] :s :f)
8078
(map [:n] :S :F)
81-
8279
;; disable arrows
8380

8481
(map [:n :i :v :x :c] :<up> :<nop>)
8582
(map [:n :i :v :x :c] :<down> :<nop>)
8683
(map [:n :i :v :x :c] :<left> :<nop>)
8784
(map [:n :i :v :x :c] :<right> :<nop>)
88-
8985
;; jk is the new esc
9086

9187
(map [:i :t :v :x :c] :jk "<C-\\><C-n>")
92-
9388
;; move in cmd mode
9489

9590
(map [:c] :<C-b> :<S-Left>)
9691
(map [:c] :<C-f> :<S-Right>)
97-
9892
;; quick movement between splits
9993

10094
(each [_ k (pairs [:h :j :k :l])]
@@ -108,13 +102,11 @@
108102
(map [:n] :tv (bindcmd [:vsplit :term]) {:desc "Open term in vertical split"})
109103
(map [:n] :ts (bindcmd [:split :term]) {:desc "Open term in horizontal split"})
110104
(map [:n :t] :<leader>ex (bindcmd :exit) {:desc "Close current buffer"})
111-
112105
;; keep visual mode while indenting left/right
113106

114107
(map [:v :s] "<" :<gv)
115108
(map [:v :s] ">" :>gv)
116109
(map [:n] :gf (bindcmd "edit <cfile>") {:desc "Edit file under cursor"})
117-
118110
;; hide search highlight
119111

120112
(map [:n] :<Esc> (bindcmd "silent! nohls") {:desc "Clear search highlight"})
@@ -143,8 +135,8 @@
143135

144136
(map [:n] :<leader>s (bindcmd :split) {:desc "Split window horizontally"})
145137
(map [:n] :<leader>v (bindcmd :vsplit) {:desc "Split window vertically"})
146-
(map [:n] :sd (bindcmd "vertical resize -15") {:desc "Decrease split width"})
147-
(map [:n] :si (bindcmd "vertical resize +15") {:desc "Increase split width"})
138+
(map [:n] :sd (bindcmd "vertical resize -15") {:desc "Decrease split width"})
139+
(map [:n] :si (bindcmd "vertical resize +15") {:desc "Increase split width"})
148140
(map [:n] :<leader>w toggle-wrap {:desc "Toggle wrap"})
149141

150142
(map [:n] :<leader>q (bindcmd :qa) {:desc "Quit all"})

‎fnl/plugins.fnl‎

Lines changed: 47 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -11,29 +11,32 @@
1111
(defn safe-mod-require [mod]
1212
(safe-require (.. :mods "." mod)))
1313

14-
(defn bootstrap-lazy []
14+
(defn bootstrap-lazy
15+
[]
1516
(let [lazypath (.. (vim.fn.stdpath :data) :/lazy/lazy.nvim)
1617
uv (or vim.uv vim.loop)]
1718
(when (not (uv.fs_stat lazypath))
1819
(vim.fn.system [:git
1920
:clone
20-
:--filter=blob:none
21-
:https://github.com/folke/lazy.nvim.git
21+
"--filter=blob:none"
22+
"https://github.com/folke/lazy.nvim.git"
2223
:--branch=stable
2324
lazypath])
2425
(when (not (= 0 vim.v.shell_error))
2526
(error "failed to bootstrap lazy.nvim")))
2627
(vim.opt.rtp:prepend lazypath)))
2728

28-
(defn to-lazy-spec [name opts]
29+
(defn to-lazy-spec
30+
[name opts]
2931
(let [spec [name]
3032
opts (or opts {})]
3133
(each [k v (pairs opts)]
3234
(match k
3335
:requires (tset spec :dependencies v)
3436
:run (tset spec :build v)
35-
:mod (tset spec :config (fn [_plugin _opts]
36-
(safe-mod-require v)))
37+
:mod (tset spec :config
38+
(fn [_plugin _opts]
39+
(safe-mod-require v)))
3740
_ (tset spec k v)))
3841
spec))
3942

@@ -48,8 +51,7 @@
4851
(bootstrap-lazy)
4952
(let [lazy (safe-require :lazy)]
5053
(when lazy
51-
(lazy.setup specs
52-
{:ui {:border :rounded}})))))
54+
(lazy.setup specs {:ui {:border :rounded}})))))
5355

5456
;; setup is used for inline setup for modules that require no or {} arg
5557

@@ -63,71 +65,53 @@
6365
(plugin.setup arg))
6466
(plugin.setup))))))
6567

66-
(use
67-
;; ensured
68-
:Olical/aniseed {}
69-
:lewis6991/impatient.nvim {}
70-
:NLKNguyen/papercolor-theme {}
71-
:fedemengo/github-nvim-theme {}
72-
:catppuccin/nvim {}
73-
:loctvl842/monokai-pro.nvim {:mod :ui.monokai}
74-
:AlexvZyl/nordic.nvim {}
75-
68+
(use ;; ensured
69+
:Olical/aniseed {} :lewis6991/impatient.nvim {} :NLKNguyen/papercolor-theme
70+
{} :fedemengo/github-nvim-theme {} :catppuccin/nvim {}
71+
:loctvl842/monokai-pro.nvim {:mod :ui.monokai} :AlexvZyl/nordic.nvim {}
7672
:zbirenbaum/copilot.lua {;:cmd :Copilot
7773
;:event :InsertEnter
7874
:mod :dev.copilot}
7975
:zbirenbaum/copilot-cmp {:mod :dev.copilot_cmp}
8076
:MeanderingProgrammer/render-markdown.nvim {:mod :ui.render-markdown}
8177
:yetone/avante.nvim {:requires [[:nvim-treesitter/nvim-treesitter]
82-
[:HakonHarnes/img-clip.nvim]
83-
[:stevearc/dressing.nvim]
84-
[:nvim-lua/plenary.nvim]
85-
[:MunifTanjim/nui.nvim]
86-
[:nvim-tree/nvim-web-devicons]]
87-
:run :make
88-
:mod :dev.avante}
89-
90-
;; dev
91-
:stevearc/profile.nvim {:mod :dev.profile}
92-
:ruifm/gitlinker.nvim {:requires [[:nvim-lua/plenary.nvim]] :mod :dev.gitlinker}
93-
:RRethy/vim-illuminate {:mod :tools.illuminate}
94-
:sopa0/telescope-makefile {:requires [[:akinsho/toggleterm.nvim]]}
95-
;; utils
96-
:wellle/targets.vim {}
97-
:folke/which-key.nvim {:mod :tools.which-key}
78+
[:HakonHarnes/img-clip.nvim]
79+
[:stevearc/dressing.nvim]
80+
[:nvim-lua/plenary.nvim]
81+
[:MunifTanjim/nui.nvim]
82+
[:nvim-tree/nvim-web-devicons]]
83+
:run :make
84+
:mod :dev.avante} ;; dev
85+
:stevearc/profile.nvim {:mod :dev.profile} :ruifm/gitlinker.nvim
86+
{:requires [[:nvim-lua/plenary.nvim]] :mod :dev.gitlinker}
87+
:RRethy/vim-illuminate {:mod :tools.illuminate} :sopa0/telescope-makefile
88+
{:requires [[:akinsho/toggleterm.nvim]]} ;; utils
89+
:wellle/targets.vim {} :folke/which-key.nvim {:mod :tools.which-key}
9890
:folke/trouble.nvim {:mod :tools.trouble}
9991
:nvim-telescope/telescope-fzf-native.nvim {:run :make}
100-
:nvim-telescope/telescope.nvim {:requires [[:nvim-lua/popup.nvim] [:nvim-lua/plenary.nvim]] :mod :tools.telescope}
101-
:kevinhwang91/nvim-hlslens {:mod :ui.hlslens}
92+
:nvim-telescope/telescope.nvim
93+
{:requires [[:nvim-lua/popup.nvim] [:nvim-lua/plenary.nvim]]
94+
:mod :tools.telescope} :kevinhwang91/nvim-hlslens {:mod :ui.hlslens}
10295
:lukas-reineke/indent-blankline.nvim {:mod :ui.indentblank :main :ibl}
103-
:norcalli/nvim-colorizer.lua {:mod :ui.colorizer}
104-
:numToStr/FTerm.nvim {:mod :tools.fterm}
105-
:SmiteshP/nvim-navic {}
106-
:jdhao/better-escape.vim {:mod :tools.better-escape}
107-
:mhinz/vim-startify {:mod :ui.startify}
108-
:karb94/neoscroll.nvim {:mod :ui.neoscroll}
109-
:ggandor/leap.nvim {:url "https://codeberg.org/andyg/leap.nvim"
110-
:mod :tools.leap}
111-
:windwp/nvim-autopairs {}
112-
;; theme
113-
:rcarriga/nvim-notify {:mod :ui.notify}
114-
:folke/zen-mode.nvim {:mod :ui.zenmode}
115-
:nvim-lualine/lualine.nvim {}
116-
:arkav/lualine-lsp-progress {:mod :ui.lualine}
117-
:akinsho/bufferline.nvim {:requires [[:nvim-tree/nvim-web-devicons]] :mod :ui.tab}
118-
:nvim-focus/focus.nvim {:mod :ui.focus}
119-
:petertriho/nvim-scrollbar {:mod :ui.scrollbar}
120-
;; programming
96+
:norcalli/nvim-colorizer.lua {:mod :ui.colorizer} :numToStr/FTerm.nvim
97+
{:mod :tools.fterm} :SmiteshP/nvim-navic {} :jdhao/better-escape.vim
98+
{:mod :tools.better-escape} :mhinz/vim-startify {:mod :ui.startify}
99+
:karb94/neoscroll.nvim {:mod :ui.neoscroll} :ggandor/leap.nvim
100+
{:url "https://codeberg.org/andyg/leap.nvim" :mod :tools.leap}
101+
:windwp/nvim-autopairs {} ;; theme
102+
:rcarriga/nvim-notify {:mod :ui.notify} :folke/zen-mode.nvim
103+
{:mod :ui.zenmode} :nvim-lualine/lualine.nvim {}
104+
:arkav/lualine-lsp-progress {:mod :ui.lualine} :akinsho/bufferline.nvim
105+
{:requires [[:nvim-tree/nvim-web-devicons]] :mod :ui.tab}
106+
:nvim-focus/focus.nvim {:mod :ui.focus} :petertriho/nvim-scrollbar
107+
{:mod :ui.scrollbar} ;; programming
121108
:nvim-treesitter/nvim-treesitter {:run ":TSUpdate" :mod :tools.treesitter}
122-
:ray-x/go.nvim {:mod :dev.go_nvim}
123-
:Julian/lean.nvim {;:ft [:lean]
124-
:requires [[:neovim/nvim-lspconfig]]
125-
:mod :dev.lean}
126-
:lewis6991/gitsigns.nvim {:mod :tools.gitsigns}
127-
:ray-x/lsp_signature.nvim {}
128-
:hedyhli/outline.nvim {:mod :lsp.symbols}
129-
:wakatime/vim-wakatime {}
130-
:Vonr/align.nvim {:mod :tools.align}
109+
:ray-x/go.nvim {:mod :dev.go_nvim} :Julian/lean.nvim
110+
{;:ft [:lean]
111+
:requires [[:neovim/nvim-lspconfig]]
112+
:mod :dev.lean} :lewis6991/gitsigns.nvim {:mod :tools.gitsigns}
113+
:ray-x/lsp_signature.nvim {} :hedyhli/outline.nvim {:mod :lsp.symbols}
114+
:wakatime/vim-wakatime {} :Vonr/align.nvim {:mod :tools.align}
131115
:VonHeikemen/lsp-zero.nvim {:requires [[:neovim/nvim-lspconfig]
132116
[:williamboman/mason.nvim]
133117
[:williamboman/mason-lspconfig.nvim]
@@ -141,11 +125,9 @@
141125
[:onsails/lspkind.nvim]
142126
[:nvimtools/none-ls.nvim]]
143127
:mod :lsp.lsp}
144-
145128
;; misc
146129
:gruvw/strudel.nvim {:run "npm install" :mod :misc.strudel})
147130

148-
149131
(map [:n] :<space>pi ":Lazy install<cr>" {:desc "Install plugins"})
150132
(map [:n] :<space>pu ":Lazy update<cr>" {:desc "Update plugins"})
151133
(map [:n] :<space>pc ":Lazy clean<cr>" {:desc "Clean plugins"})

0 commit comments

Comments
 (0)