diff --git a/config/default.nix b/config/default.nix index e41b3ed..4015a90 100644 --- a/config/default.nix +++ b/config/default.nix @@ -1,7 +1,6 @@ # The line beneath this is called `modeline`. See `:help modeline` # vim: ts=4:sts=0:sw=0:tw=78:noet -{pkgs -, ...}:{ +{ # Import all your configuration modules here imports = [ ./colorscheme/onedark.nix diff --git a/config/sets.nix b/config/sets.nix index a3119b8..825c356 100644 --- a/config/sets.nix +++ b/config/sets.nix @@ -1,66 +1,68 @@ # The line beneath this is called `modeline`. See `:help modeline` # vim: ts=4:sts=0:sw=0:tw=78:noet { -options = { - relativenumber = true; - splitbelow = true; - redrawtime = 5000; - - # new split to the right - splitright = true; - - # show hidden characters - list = true; - - # don't break words on the edge - linebreak = true; - wrap = true; - # length of an actual \t character: - # https://stackoverflow.com/questions/191201/indenting-comments-to-match-code-in-vim - smartindent = false; - # length to use when shifting text (eg. <<, >> and == commands) - - tabstop=4; - shiftwidth = 0; - - expandtab = false; - autoindent = true; - # Set highlight on search - hlsearch = false; - - # Make line numbers default - number = true; - - # Enable mouse mode - mouse = "a"; - - # Sync clipboard between OS and Neovim. - # Remove this option if you want your OS clipboard to remain independent. - # See `:help 'clipboard'` - # vim.o.clipboard = 'unnamedplus' -- REMOVED BY ME - - # Enable break indent - breakindent = true; - - # Save undo history - # vim.o.undofile = true -- REMOVED BY ME - - # Case insensitive searching UNLESS /C or capital in search - ignorecase = true; - smartcase = true; - - # Keep signcolumn on by default - signcolumn = "yes"; - - # Decrease update time - updatetime = 250; - timeout = true; - timeoutlen = 300; - - # Set completeopt to have a better completion experience - completeopt = "menuone,noselect"; - - # NOTE: You should make sure your terminal supports this - termguicolors = true; - }; + config = { + options = { + relativenumber = true; + splitbelow = true; + redrawtime = 5000; + + # new split to the right + splitright = true; + + # show hidden characters + list = true; + + # don't break words on the edge + linebreak = true; + wrap = true; + # length of an actual \t character: + # https://stackoverflow.com/questions/191201/indenting-comments-to-match-code-in-vim + smartindent = false; + # length to use when shifting text (eg. <<, >> and == commands) + + tabstop=4; + shiftwidth = 0; + + expandtab = false; + autoindent = true; + # Set highlight on search + hlsearch = false; + + # Make line numbers default + number = true; + + # Enable mouse mode + mouse = "a"; + + # Sync clipboard between OS and Neovim. + # Remove this option if you want your OS clipboard to remain independent. + # See `:help 'clipboard'` + # vim.o.clipboard = 'unnamedplus' -- REMOVED BY ME + + # Enable break indent + breakindent = true; + + # Save undo history + # vim.o.undofile = true -- REMOVED BY ME + + # Case insensitive searching UNLESS /C or capital in search + ignorecase = true; + smartcase = true; + + # Keep signcolumn on by default + signcolumn = "yes"; + + # Decrease update time + updatetime = 250; + timeout = true; + timeoutlen = 300; + + # Set completeopt to have a better completion experience + completeopt = "menuone,noselect"; + + # NOTE: You should make sure your terminal supports this + termguicolors = true; + }; + }; }