summaryrefslogtreecommitdiff
path: root/fnl/settings
diff options
context:
space:
mode:
Diffstat (limited to 'fnl/settings')
-rw-r--r--fnl/settings/init.fnl4
-rw-r--r--fnl/settings/keymaps.fnl3
-rw-r--r--fnl/settings/options.fnl159
3 files changed, 80 insertions, 86 deletions
diff --git a/fnl/settings/init.fnl b/fnl/settings/init.fnl
index 2b6836f..a6f74fb 100644
--- a/fnl/settings/init.fnl
+++ b/fnl/settings/init.fnl
@@ -1,4 +1,2 @@
;; Load nvim settings
-(module settings
- {require [settings.options
- settings.keymaps]})
+(module settings {require [settings.options settings.keymaps]})
diff --git a/fnl/settings/keymaps.fnl b/fnl/settings/keymaps.fnl
index bf68c38..52254cd 100644
--- a/fnl/settings/keymaps.fnl
+++ b/fnl/settings/keymaps.fnl
@@ -1,6 +1,5 @@
;; Custom keymappings.
-(module settings.keymaps
- {autoload {nvim aniseed.nvim}})
+(module settings.keymaps {autoload {nvim aniseed.nvim}})
(def- opts {:noremap true :silent true})
(defn- map [mode lhs rhs opt] (nvim.set_keymap mode lhs rhs opt))
diff --git a/fnl/settings/options.fnl b/fnl/settings/options.fnl
index c468f16..ec43440 100644
--- a/fnl/settings/options.fnl
+++ b/fnl/settings/options.fnl
@@ -1,88 +1,85 @@
;; Sets options in neovim
-(module settings.options
- {autoload {nvim aniseed.nvim}})
+(module settings.options {autoload {nvim aniseed.nvim}})
-(defn- apply-opts [opts]
- (each [k v (pairs opts)]
- (tset vim.opt k v)))
+(defn- apply-opts [opts] (each [k v (pairs opts)]
+ (tset vim.opt k v)))
-(def- opts
- {;; creates a backup file
- :backup false
- ;; allows neovim to access the system clipboard
- :clipboard :unnamedplus
- ;; more space in the neovim command line for displaying messages
- :cmdheight 2
- ;; mostly just for cmp
- :completeopt {:menuone :noselect}
- ;; so that `` is visible in markdown files
- :conceallevel 0
- ;; the encoding written to a file
- :fileencoding :utf-8
- ;; highlight all matches on previous search pattern
- :hlsearch true
- ;; ignore case in search patterns
- :ignorecase true
- ;; disable the mouse to be used in neovim
- :mouse ""
- ;; pop up menu height
- :pumheight 10
- ;; we don't need to see things like ;; INSERT ;; anymore
- :showmode false
- ;; always show tabs
- :showtabline 2
- ;; smart case
- :smartcase true
- ;; make indenting smarter again
- :smartindent true
- ;; force all horizontal splits to go below current window
- :splitbelow true
- ;; force all vertical splits to go to the right of current window
- :splitright true
- ;; creates a swapfile
- :swapfile false
- ;; set term gui colors (most terminals support this)
- :termguicolors true
- ;; time to wait for a mapped sequence to complete (in milliseconds)
- :timeoutlen 1000
- ;; enable persistent undo
- :undofile true
- ;; faster completion (4000ms default)
- :updatetime 300
- ;; if a file is being edited by another program (or was written
- ;; to file while editing with another program), it is not allowed
- ;; to be edited
- :writebackup false
- ;; convert tabs to spaces
- :expandtab true
- ;; the number of spaces inserted for each indentation
- :shiftwidth 2
- ;; insert 2 spaces for a tab
- :tabstop 2
- ;; highlight the current line
- :cursorline true
- ;; set numbered lines
- :number true
- ;; set relative numbered lines
- :relativenumber true
- ;; set number column width to 2 {default 4}
- :numberwidth 2
- ;; always show the sign column, otherwise it would shift the text
- ;; each time
- :signcolumn :yes
- ;; display lines as one long line
- :wrap false
- :laststatus 3
- ;; is one of my fav
- :scrolloff 8
- :sidescrolloff 8
- ;; the font used in graphical neovim applications
- :guifont "monospace:h17"})
+(def- opts {;; creates a backup file
+ :backup false
+ ;; allows neovim to access the system clipboard
+ :clipboard :unnamedplus
+ ;; more space in the neovim command line for displaying messages
+ :cmdheight 2
+ ;; mostly just for cmp
+ :completeopt {:menuone :noselect}
+ ;; so that `` is visible in markdown files
+ :conceallevel 0
+ ;; the encoding written to a file
+ :fileencoding :utf-8
+ ;; highlight all matches on previous search pattern
+ :hlsearch true
+ ;; ignore case in search patterns
+ :ignorecase true
+ ;; disable the mouse to be used in neovim
+ :mouse ""
+ ;; pop up menu height
+ :pumheight 10
+ ;; we don't need to see things like ;; INSERT ;; anymore
+ :showmode false
+ ;; always show tabs
+ :showtabline 2
+ ;; smart case
+ :smartcase true
+ ;; make indenting smarter again
+ :smartindent true
+ ;; force all horizontal splits to go below current window
+ :splitbelow true
+ ;; force all vertical splits to go to the right of current window
+ :splitright true
+ ;; creates a swapfile
+ :swapfile false
+ ;; set term gui colors (most terminals support this)
+ :termguicolors true
+ ;; time to wait for a mapped sequence to complete (in milliseconds)
+ :timeoutlen 1000
+ ;; enable persistent undo
+ :undofile true
+ ;; faster completion (4000ms default)
+ :updatetime 300
+ ;; if a file is being edited by another program (or was written
+ ;; to file while editing with another program), it is not allowed
+ ;; to be edited
+ :writebackup false
+ ;; convert tabs to spaces
+ :expandtab true
+ ;; the number of spaces inserted for each indentation
+ :shiftwidth 2
+ ;; insert 2 spaces for a tab
+ :tabstop 2
+ ;; highlight the current line
+ :cursorline true
+ ;; set numbered lines
+ :number true
+ ;; set relative numbered lines
+ :relativenumber true
+ ;; set number column width to 2 {default 4}
+ :numberwidth 2
+ ;; always show the sign column, otherwise it would shift the text
+ ;; each time
+ :signcolumn :yes
+ ;; display lines as one long line
+ :wrap false
+ :laststatus 3
+ ;; is one of my fav
+ :scrolloff 8
+ :sidescrolloff 8
+ ;; the font used in graphical neovim applications
+ :guifont "monospace:h17"})
(apply-opts opts)
(nvim.ex.set "whichwrap+=<,>,[,],h,l")
-(nvim.ex.set "iskeyword+=-")
-(nvim.ex.set "formatoptions-=cro")
-(nvim.ex.set "colorcolumn=80")
-(nvim.ex.set "shortmess+=c")
+(nvim.ex.set :iskeyword+=-)
+(nvim.ex.set :formatoptions-=cro)
+(nvim.ex.set :colorcolumn=80)
+(nvim.ex.set :shortmess+=c)