From 1b191c936989d970d78d1dae1795c77d593ed402 Mon Sep 17 00:00:00 2001 From: Anthony Cicchetti Date: Sun, 20 Nov 2022 12:55:09 -0500 Subject: [PATCH] Updates --- nvim/fnl/config/core.fnl | 22 +++++- nvim/fnl/config/module/core.fnl | 12 --- nvim/fnl/config/module/plugin.fnl | 79 -------------------- nvim/fnl/config/module/plugin/base16-vim.fnl | 4 - nvim/fnl/config/module/plugin/bubbly.fnl | 3 - nvim/fnl/config/module/plugin/mason.fnl | 4 - nvim/fnl/config/plugin.fnl | 1 + nvim/fnl/config/plugin/treesitter.fnl | 7 +- 8 files changed, 25 insertions(+), 107 deletions(-) delete mode 100644 nvim/fnl/config/module/core.fnl delete mode 100644 nvim/fnl/config/module/plugin.fnl delete mode 100644 nvim/fnl/config/module/plugin/base16-vim.fnl delete mode 100644 nvim/fnl/config/module/plugin/bubbly.fnl delete mode 100644 nvim/fnl/config/module/plugin/mason.fnl diff --git a/nvim/fnl/config/core.fnl b/nvim/fnl/config/core.fnl index 07b08ac..e5fb290 100644 --- a/nvim/fnl/config/core.fnl +++ b/nvim/fnl/config/core.fnl @@ -1,11 +1,29 @@ (module config.core {autoload {nvim aniseed.nvim}}) -(set nvim.o.termguicolors true) +(set nvim.o.number true) +(set nvim.o.relativenumber true) +(set nvim.o.tabstop 4) +(set nvim.o.shiftwidth 4) +(set nvim.o.smarttab true) +(set nvim.o.expandtab true) +(set nvim.o.hidden true) +(set nvim.o.showtabline 1) +(set nvim.o.title true) (set nvim.o.list true) -(set nvim.o.spell true) +(set nvim.o.listchars "tab:→ ,eol:¬,trail:•,extends:❯,precedes:❮,space:‣") +(set nvim.o.showbreak "↪") +(set nvim.o.timeoutlen 500) +(set nvim.o.ignorecase true) +(set nvim.o.smartcase true) +(set nvim.o.splitbelow true) +(set nvim.o.splitright true) +(set nvim.o.inccommand "split") +(set nvim.o.termguicolors true) (set nvim.o.wildmenu true) (set nvim.o.wildmode "list:longest,full") (set nvim.o.mouse "a") (set nvim.o.updatetime 500) (set nvim.o.sessionoptions "blank,curdir,folds,help,tabpages,winsize") + +(nvim.ex.au "TextYankPost * silent! lua vim.highlight.on_yank()") diff --git a/nvim/fnl/config/module/core.fnl b/nvim/fnl/config/module/core.fnl deleted file mode 100644 index 352d616..0000000 --- a/nvim/fnl/config/module/core.fnl +++ /dev/null @@ -1,12 +0,0 @@ -(local nvim (require :aniseed.nvim)) - -;; Generic Neovim configuration. -(set nvim.o.termguicolors true) -(set nvim.o.list true) -(set nvim.o.spell true) -(set nvim.o.wildmenu true) -(set nvim.o.wildmode "list:longest,full") -(set nvim.o.mouse "a") -(set nvim.o.updatetime 500) -(set nvim.o.sessionoptions "blank,curdir,folds,help,tabpages,winsize") -;; (nvim.colorscheme "base16-oceanicnext") diff --git a/nvim/fnl/config/module/plugin.fnl b/nvim/fnl/config/module/plugin.fnl deleted file mode 100644 index 6eca029..0000000 --- a/nvim/fnl/config/module/plugin.fnl +++ /dev/null @@ -1,79 +0,0 @@ -(local nvim (require :aniseed.nvim)) -(local core (require :aniseed.core)) -(local util (require :config.util)) - -(lambda plug [coord ?opts] - "Defines a plugin through vim-plug." - (if (= opts nil) - (nvim.fn.plug# coord) - (nvim.fn.plug# coord opts))) - -(fn known-plugin? [candidate] - "Returns true if the given name can be found within any of the required - plugin names. So `deoplete` would match `deoplete.nvim`." - (or (. nvim.g.plugs candidate) - (->> (core.keys nvim.g.plugs) - (core.some - (fn [plug-name] - (plug-name:find candidate 1 true)))))) - -;; Set up vim-plug, like in init.vim earlier. -(nvim.fn.plug#begin (.. (nvim.fn.stdpath "data") "/plugged")) - -;; This is in init.vim but if it's not here too sync.sh will delete it. -; (plug "Olical/aniseed") -(plug "Olical/aniseed" {:branch :develop}) - -(plug "inkarkat/vim-ReplaceWithRegister") -(plug "chriskempson/base16-vim") - -;; LSP Stuff -(plug "williamboman/mason.nvim") -(plug "williamboman/mason-lspconfig.nvim") -(plug "neovim/nvim-lspconfig") - -;; Lisp-in-lua -(plug "Olical/conjure") -(plug "bakpakin/fennel.vim") - -(plug "ctrlpvim/ctrlp.vim") - -;; Usable dispatch -(plug "tpope/vim-dispatch") -(plug "radenling/vim-dispatch-neovim") - -;; Follow symlinks -(plug "moll/vim-bbye") -(plug "aymericbeaumet/vim-symlink") - -;; Respect editorconfig -(plug "gpanders/editorconfig.nvim") - -(plug "terryma/vim-expand-region") - - -;; TODO CONFIGURE -(plug "nvim-treesitter/nvim-treesitter" {:do ":TSUpdate"}) -(plug "https://git.sr.ht/~p00f/nvim-ts-rainbow") - -;; TODO CONFIGURE -(plug "datwaft/bubbly.nvim") - -(plug "tpope/vim-fugitive") -(plug "mhinz/vim-signify") -(plug "tpope/vim-commentary") -(plug "mbbill/undotree") -(plug "folke/which-key.nvim") -(plug "airblade/vim-rooter") - -;; Define all required plugins. -(nvim.fn.plug#end) - -;; Load plugin configuration modules. -(core.run! - (fn [path] - (let [name (nvim.fn.fnamemodify path ":t:r")] - (if (known-plugin? name) - (require (.. "config.module.plugin." name)) - (print (.. "Orphan plugin configuration: " name))))) - (util.glob (.. (nvim.fn.stdpath "config") "/lua/config/module/plugin/*.lua"))) diff --git a/nvim/fnl/config/module/plugin/base16-vim.fnl b/nvim/fnl/config/module/plugin/base16-vim.fnl deleted file mode 100644 index 5c5c805..0000000 --- a/nvim/fnl/config/module/plugin/base16-vim.fnl +++ /dev/null @@ -1,4 +0,0 @@ -(local nvim (require :aniseed.nvim)) - -(nvim.ex.colorscheme "base16-oceanicnext") - diff --git a/nvim/fnl/config/module/plugin/bubbly.fnl b/nvim/fnl/config/module/plugin/bubbly.fnl deleted file mode 100644 index 4e4cfee..0000000 --- a/nvim/fnl/config/module/plugin/bubbly.fnl +++ /dev/null @@ -1,3 +0,0 @@ -(local nvim (require :aniseed.nvim)) - -(set nvim.g.bubbly_tabline 1) diff --git a/nvim/fnl/config/module/plugin/mason.fnl b/nvim/fnl/config/module/plugin/mason.fnl deleted file mode 100644 index 2773a69..0000000 --- a/nvim/fnl/config/module/plugin/mason.fnl +++ /dev/null @@ -1,4 +0,0 @@ -(local nvim (require :aniseed.nvim)) - -(nvim.ex.lua "require('mason').setup()") -(nvim.ex.lua "require('mason-lspconfig').setup()") diff --git a/nvim/fnl/config/plugin.fnl b/nvim/fnl/config/plugin.fnl index cd6dd93..200a382 100644 --- a/nvim/fnl/config/plugin.fnl +++ b/nvim/fnl/config/plugin.fnl @@ -57,6 +57,7 @@ :datwaft/bubbly.nvim {:mod :bubbly} :tpope/vim-fugitive {:mod :fugitive} + :tpope/vim-surround {} :mhinz/vim-signify {} :tpope/vim-commentary {} :mbbill/undotree {} diff --git a/nvim/fnl/config/plugin/treesitter.fnl b/nvim/fnl/config/plugin/treesitter.fnl index d4830f9..28ead69 100644 --- a/nvim/fnl/config/plugin/treesitter.fnl +++ b/nvim/fnl/config/plugin/treesitter.fnl @@ -12,9 +12,9 @@ :enable true :keymaps { :init_selection "s" - :node_incremental "u" - :scope_incremental "s" - :node_decremental "d" + :node_incremental "u" + :scope_incremental "s" + :node_decremental "d" } } :refactor { @@ -34,4 +34,5 @@ :ensure_installed [:python :yaml :rust :fennel :lua]}) (set nvim.o.foldmethod "expr") (set nvim.o.foldexpr "nvim_treesitter#foldexpr()") + (set nvim.o.foldenable false) ))