diff --git a/fnl/personalize.fnl b/fnl/personalize.fnl index 14f0cff..23857a2 100644 --- a/fnl/personalize.fnl +++ b/fnl/personalize.fnl @@ -2,21 +2,21 @@ [cmp (require :cmp) luasnip (require :luasnip) ] - {:keymap (fn [] - (let [nmap #(vim.keymap.set [:n] $1 $2 {:desc $3})] - (nmap "" ":bnext" "Next Buffer") - (nmap "" ":bprevious" "Previous Buffer") - (nmap "" ":write|bdelete" "Save and delete buffer") - (nmap "" ":Telescope find_files" "Telescope find_files") - (nmap "" ":Telescope live_grep" "Telescope live_grep") - (nmap "" ":Telescope buffers" "Telescope buffers") - (nmap "" ":Telescope treesitter" "Telescope treesitter"))) + {:options (fn [] + (set vim.o.termguicolors true) + (set vim.o.mouse :a) + (set vim.o.clipboard :unnamedplus) + (vim.cmd.colorscheme :everforest)) - :options (fn [] - (set vim.o.termguicolors true) - (set vim.o.mouse :a) - (set vim.o.clipboard :unnamedplus) - (vim.cmd.colorscheme :everforest)) + :keymap (fn [] + (let [nmap #(vim.keymap.set [:n] $1 $2 {:desc $3})] + (nmap "" ":bnext" "Next Buffer") + (nmap "" ":bprevious" "Previous Buffer") + (nmap "" ":write|bdelete" "Save and delete buffer") + (nmap "" ":Telescope find_files" "Telescope find_files") + (nmap "" ":Telescope live_grep" "Telescope live_grep") + (nmap "" ":Telescope buffers" "Telescope buffers") + (nmap "" ":Telescope treesitter" "Telescope treesitter"))) :cmp-mapping {: (cmp.mapping.select_next_item) @@ -48,6 +48,7 @@ [:vim ]}}} :bashls {:filetypes [:bash]}} + :lsp-attach (fn [_ bufnr] (let [nmap #(vim.keymap.set :n $1 $2 {:buffer bufnr :desc (.. "LSP: " $3)}) diff --git a/fnl/setup-cmp.fnl b/fnl/setup-cmp.fnl index 94dfbb1..1f66952 100644 --- a/fnl/setup-cmp.fnl +++ b/fnl/setup-cmp.fnl @@ -1,4 +1,3 @@ -;; Autocompletion and Snippets with nvim-cmp and luasnip (let [cmp (require :cmp) luasnip (require :luasnip) diff --git a/fnl/setup-mason.fnl b/fnl/setup-mason.fnl index 9ea3d51..ec438e8 100644 --- a/fnl/setup-mason.fnl +++ b/fnl/setup-mason.fnl @@ -1,4 +1,3 @@ -;; language server protocols via mason (let [neodev (require :neodev) mason (require :mason) diff --git a/fnl/setup-treesitter.fnl b/fnl/setup-treesitter.fnl index 77f2177..41d11ab 100644 --- a/fnl/setup-treesitter.fnl +++ b/fnl/setup-treesitter.fnl @@ -1,6 +1,3 @@ -;; Syntax Highlighting via Treesitter -;; NOTE: if you add a language to treesitter for syntax highlighting or otherwise -;; consider also adding the LSP via Mason below... (let [treesitter (require :nvim-treesitter.configs)] (treesitter.setup