From 7b0ea5cbdaaa5b8392777ad207c74cb27411eab1 Mon Sep 17 00:00:00 2001 From: Jacob Janzen Date: Tue, 1 Oct 2024 17:42:59 -0500 Subject: the big refactor --- common/.config/nvim/init.lua.org | 27 +++++++++++++++++++++++++++ common/.config/nvim/init.org | 27 --------------------------- common/.config/nvim/lua/appearance.lua.org | 15 +++++++++++++++ common/.config/nvim/lua/appearance.org | 15 --------------- common/.config/nvim/lua/behaviour.lua.org | 19 +++++++++++++++++++ common/.config/nvim/lua/behaviour.org | 19 ------------------- common/.config/nvim/lua/plugins.lua.org | 27 +++++++++++++++++++++++++++ common/.config/nvim/lua/plugins.org | 27 --------------------------- 8 files changed, 88 insertions(+), 88 deletions(-) create mode 100644 common/.config/nvim/init.lua.org delete mode 100644 common/.config/nvim/init.org create mode 100644 common/.config/nvim/lua/appearance.lua.org delete mode 100644 common/.config/nvim/lua/appearance.org create mode 100644 common/.config/nvim/lua/behaviour.lua.org delete mode 100644 common/.config/nvim/lua/behaviour.org create mode 100644 common/.config/nvim/lua/plugins.lua.org delete mode 100644 common/.config/nvim/lua/plugins.org (limited to 'common/.config/nvim') diff --git a/common/.config/nvim/init.lua.org b/common/.config/nvim/init.lua.org new file mode 100644 index 0000000..0f7dffa --- /dev/null +++ b/common/.config/nvim/init.lua.org @@ -0,0 +1,27 @@ +#+title: Neovim Settings +This is the entry point for my Neovim configuration. I don't use Neovim much these days, so it is very stripped back from what it once was. Emacs is much comfier for most uses, so Neovim is mostly relegated to editing system configuration files. + +Disable timeout to speed things up. +#+begin_src lua :tangle ~/.config/nvim/init.lua :mkdirp yes + vim.cmd([[set notimeout]]) +#+end_src + +Fix unable to open swap file issue. +#+begin_src lua :tangle ~/.config/nvim/init.lua :mkdirp yes + vim.cmd([[set directory=~/.local/share/nvim/swap//]]) +#+end_src + +Install plugins in the [[./lua/plugins.org][plugins.lua]] file. +#+begin_src lua :tangle ~/.config/nvim/init.lua :mkdirp yes + require('plugins') +#+end_src + +Set up behaviour in the [[./lua/behaviour.org][behaviour.lua]] file. +#+begin_src lua :tangle ~/.config/nvim/init.lua :mkdirp yes + require('behaviour') +#+end_src + +Set up appearance in the [[./lua/appearance.org][appearance.lua]] file. +#+begin_src lua :tangle ~/.config/nvim/init.lua :mkdirp yes + require('appearance') +#+end_src diff --git a/common/.config/nvim/init.org b/common/.config/nvim/init.org deleted file mode 100644 index 0f7dffa..0000000 --- a/common/.config/nvim/init.org +++ /dev/null @@ -1,27 +0,0 @@ -#+title: Neovim Settings -This is the entry point for my Neovim configuration. I don't use Neovim much these days, so it is very stripped back from what it once was. Emacs is much comfier for most uses, so Neovim is mostly relegated to editing system configuration files. - -Disable timeout to speed things up. -#+begin_src lua :tangle ~/.config/nvim/init.lua :mkdirp yes - vim.cmd([[set notimeout]]) -#+end_src - -Fix unable to open swap file issue. -#+begin_src lua :tangle ~/.config/nvim/init.lua :mkdirp yes - vim.cmd([[set directory=~/.local/share/nvim/swap//]]) -#+end_src - -Install plugins in the [[./lua/plugins.org][plugins.lua]] file. -#+begin_src lua :tangle ~/.config/nvim/init.lua :mkdirp yes - require('plugins') -#+end_src - -Set up behaviour in the [[./lua/behaviour.org][behaviour.lua]] file. -#+begin_src lua :tangle ~/.config/nvim/init.lua :mkdirp yes - require('behaviour') -#+end_src - -Set up appearance in the [[./lua/appearance.org][appearance.lua]] file. -#+begin_src lua :tangle ~/.config/nvim/init.lua :mkdirp yes - require('appearance') -#+end_src diff --git a/common/.config/nvim/lua/appearance.lua.org b/common/.config/nvim/lua/appearance.lua.org new file mode 100644 index 0000000..1f1d534 --- /dev/null +++ b/common/.config/nvim/lua/appearance.lua.org @@ -0,0 +1,15 @@ +#+title: Neovim Appearance Settings +Use line numbers. +#+begin_src lua :tangle ~/.config/nvim/lua/appearance.lua :mkdirp yes + vim.opt.number = true +#+end_src + +Turn on syntax highlighting. +#+begin_src lua :tangle ~/.config/nvim/lua/appearance.lua :mkdirp yes + vim.cmd([[ + set notermguicolors + syntax on + colorscheme default + set background=light + ]]) +#+end_src diff --git a/common/.config/nvim/lua/appearance.org b/common/.config/nvim/lua/appearance.org deleted file mode 100644 index 1f1d534..0000000 --- a/common/.config/nvim/lua/appearance.org +++ /dev/null @@ -1,15 +0,0 @@ -#+title: Neovim Appearance Settings -Use line numbers. -#+begin_src lua :tangle ~/.config/nvim/lua/appearance.lua :mkdirp yes - vim.opt.number = true -#+end_src - -Turn on syntax highlighting. -#+begin_src lua :tangle ~/.config/nvim/lua/appearance.lua :mkdirp yes - vim.cmd([[ - set notermguicolors - syntax on - colorscheme default - set background=light - ]]) -#+end_src diff --git a/common/.config/nvim/lua/behaviour.lua.org b/common/.config/nvim/lua/behaviour.lua.org new file mode 100644 index 0000000..871b65e --- /dev/null +++ b/common/.config/nvim/lua/behaviour.lua.org @@ -0,0 +1,19 @@ +#+title: Neovim Behaviour Settings + +Use tabs with width 4. +#+begin_src lua :tangle ~/.config/nvim/lua/behaviour.lua :mkdirp yes + vim.opt.tabstop = 4 + vim.opt.expandtab = true + vim.opt.shiftwidth = 4 + vim.opt.autoindent = true +#+end_src + +Better command line completion. +#+begin_src lua :tangle ~/.config/nvim/lua/behaviour.lua :mkdirp yes + vim.opt.wildmode = 'longest,list' +#+end_src + +Better management of file types. +#+begin_src lua :tangle ~/.config/nvim/lua/behaviour.lua :mkdirp yes + vim.cmd('filetype plugin indent on') +#+end_src diff --git a/common/.config/nvim/lua/behaviour.org b/common/.config/nvim/lua/behaviour.org deleted file mode 100644 index 871b65e..0000000 --- a/common/.config/nvim/lua/behaviour.org +++ /dev/null @@ -1,19 +0,0 @@ -#+title: Neovim Behaviour Settings - -Use tabs with width 4. -#+begin_src lua :tangle ~/.config/nvim/lua/behaviour.lua :mkdirp yes - vim.opt.tabstop = 4 - vim.opt.expandtab = true - vim.opt.shiftwidth = 4 - vim.opt.autoindent = true -#+end_src - -Better command line completion. -#+begin_src lua :tangle ~/.config/nvim/lua/behaviour.lua :mkdirp yes - vim.opt.wildmode = 'longest,list' -#+end_src - -Better management of file types. -#+begin_src lua :tangle ~/.config/nvim/lua/behaviour.lua :mkdirp yes - vim.cmd('filetype plugin indent on') -#+end_src diff --git a/common/.config/nvim/lua/plugins.lua.org b/common/.config/nvim/lua/plugins.lua.org new file mode 100644 index 0000000..f3027f9 --- /dev/null +++ b/common/.config/nvim/lua/plugins.lua.org @@ -0,0 +1,27 @@ +#+title: Neovim Plugins +* Setup +Use =lazy= to manage plugins. This block activates =lazy=. +#+begin_src lua :tangle ~/.config/nvim/lua/plugins.lua :mkdirp yes + local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" + if not vim.loop.fs_stat(lazypath) then + vim.fn.system({ + "git", + "clone", + "--filter=blob:none", + "https://github.com/folke/lazy.nvim.git", + "--branch=stable", + lazypath, + }) + end + vim.opt.rtp:prepend(lazypath) +#+end_src + +* Plugins +I use =lightline= for a nice status bar. The Ayu theme matches my overall colour scheme. =delimitmate= provides better delimiter handling. Trailing whitespace is highlighted with =vim-trailing-whitespace=. +#+begin_src lua :tangle ~/.config/nvim/lua/plugins.lua :mkdirp yes + require('lazy').setup({ + 'itchyny/lightline.vim', + 'Raimondi/delimitMate', + 'bronson/vim-trailing-whitespace', + }) +#+end_src diff --git a/common/.config/nvim/lua/plugins.org b/common/.config/nvim/lua/plugins.org deleted file mode 100644 index f3027f9..0000000 --- a/common/.config/nvim/lua/plugins.org +++ /dev/null @@ -1,27 +0,0 @@ -#+title: Neovim Plugins -* Setup -Use =lazy= to manage plugins. This block activates =lazy=. -#+begin_src lua :tangle ~/.config/nvim/lua/plugins.lua :mkdirp yes - local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" - if not vim.loop.fs_stat(lazypath) then - vim.fn.system({ - "git", - "clone", - "--filter=blob:none", - "https://github.com/folke/lazy.nvim.git", - "--branch=stable", - lazypath, - }) - end - vim.opt.rtp:prepend(lazypath) -#+end_src - -* Plugins -I use =lightline= for a nice status bar. The Ayu theme matches my overall colour scheme. =delimitmate= provides better delimiter handling. Trailing whitespace is highlighted with =vim-trailing-whitespace=. -#+begin_src lua :tangle ~/.config/nvim/lua/plugins.lua :mkdirp yes - require('lazy').setup({ - 'itchyny/lightline.vim', - 'Raimondi/delimitMate', - 'bronson/vim-trailing-whitespace', - }) -#+end_src -- cgit v1.2.3