diff --git a/flake.lock b/flake.lock index 63423d6..430c962 100644 --- a/flake.lock +++ b/flake.lock @@ -51,7 +51,41 @@ "inputs": { "flake-utils": "flake-utils", "nixpkgs": "nixpkgs", - "rainbow-vim-src": "rainbow-vim-src" + "rainbow-vim-src": "rainbow-vim-src", + "slimv-src": "slimv-src", + "vim-racket-src": "vim-racket-src" + } + }, + "slimv-src": { + "flake": false, + "locked": { + "lastModified": 1600894996, + "narHash": "sha256-5HCyyBXoA/esoTYlFBX/5vxQ7LK/w+rcXoAc6gQ5WCs=", + "owner": "kovisoft", + "repo": "slimv", + "rev": "6dfc46912655ab629634d021e9c5b0bd27023417", + "type": "github" + }, + "original": { + "owner": "kovisoft", + "repo": "slimv", + "type": "github" + } + }, + "vim-racket-src": { + "flake": false, + "locked": { + "lastModified": 1595555951, + "narHash": "sha256-XqbR9qMvvaeZ7LHUemocJQQ/CaJSHxEwh7B7Y1o6KhU=", + "owner": "wlangstroth", + "repo": "vim-racket", + "rev": "bca2643c3d8bd0fcd46ab73bee69023a5da1964b", + "type": "github" + }, + "original": { + "owner": "wlangstroth", + "repo": "vim-racket", + "type": "github" } } }, diff --git a/flake.nix b/flake.nix index 43eb17d..e2dd72f 100644 --- a/flake.nix +++ b/flake.nix @@ -13,14 +13,31 @@ url = "github:frazrepo/vim-rainbow"; flake = false; }; + vim-racket-src = { + url = "github:wlangstroth/vim-racket"; + flake = false; + }; + slimv-src = { + url = "github:kovisoft/slimv"; + flake = false; + }; }; - outputs = { self, nixpkgs, flake-utils, rainbow-vim-src, ... }: + outputs = { self, nixpkgs, flake-utils, rainbow-vim-src + , vim-racket-src, slimv-src, ... }: let customPlugins = pkgs: { rainbow-vim = pkgs.vimUtils.buildVimPlugin { name = "rainbow-vim"; src = rainbow-vim-src; }; + vim-racket = pkgs.vimUtils.buildVimPlugin { + name = "vim-racket"; + src = vim-racket-src; + }; + slimv = pkgs.vimUtils.buildVimPlugin { + name = "slimv"; + src = slimv-src; + }; }; in flake-utils.lib.eachDefaultSystem (system: let diff --git a/overlay.nix b/overlay.nix index 10feb14..3844c0c 100644 --- a/overlay.nix +++ b/overlay.nix @@ -4,8 +4,9 @@ customPlugins: self: super: { name = "vim"; vimrcConfig = { pathogen = { - knownPlugins = (customPlugins super) // super.vimPlugins; + knownPlugins = super.vimPlugins // (customPlugins super); pluginNames = [ + "vim-racket" "haskell-vim" "rainbow-vim" "vimwiki" @@ -13,35 +14,41 @@ customPlugins: self: super: { "vim-sexp" "vim-surround" "vim-repeat" + "slimv" ]; }; customRC = '' - set colorcolumn=80 set nocompatible + + filetype on filetype plugin on filetype indent on - filetype on + syntax on + set encoding=utf-8 + set autoindent set smartindent + set ignorecase set smartcase set hlsearch set history=100 + set number set wildmenu + set backspace=eol,indent,start - set tabstop=3 softtabstop=3 expandtab shiftwidth=3 smarttab + set tabstop=2 softtabstop=2 expandtab shiftwidth=2 smarttab autocmd BufNewFile,BufRead *.rkt set filetype=scheme autocmd FileType scheme :packadd vim-sexp - autocmd FileType scheme :packadd vim-sexp-for-normies + autocmd FileType scheme :packadd vim-sexp-for-regular-people autocmd FileType scheme :packadd vim-surround autocmd FileType scheme :packadd vim-repeat - autocmd FileType scheme :packadd paredit-vim - autocmd FileType scheme :packadd vim-tslime - autocmd FileType scheme :packadd racket-vim + autocmd FileType scheme :packadd slimv + autocmd FileType scheme :packadd vim-racket autocmd BufNewFile,BufRead *.hoon set filetype=hoon autocmd FileType hoon :packadd hoon-vim diff --git a/test.rkt b/test.rkt new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/test.rkt @@ -0,0 +1 @@ +