diff --git a/files/.config/nvim/init.lua b/files/.config/nvim/init.lua new file mode 100644 index 0000000..732d22f --- /dev/null +++ b/files/.config/nvim/init.lua @@ -0,0 +1,25 @@ +vim.g.mapleader = " " +vim.g.maplocalleader = "," +vim.cmd.colorscheme("lunaperche") +vim.opt.smarttab = true +vim.opt.tabstop = 2 +vim.opt.shiftwidth = 2 +vim.opt.clipboard = "unnamedplus" -- use system clipboard + +vim.pack.add{ + { src = 'https://github.com/neovim/nvim-lspconfig' }, + { src = 'https://github.com/junegunn/fzf.vim' }, +} + +vim.lsp.config('chicken', { + cmd = {'chicken-lsp-server'}, + filetypes = {'scheme'}, + root_markers = {'Makefile', 'build.meson', '.git'}, +}) + +vim.lsp.enable('chicken') +vim.lsp.enable('clangd') +vim.lsp.enable('lua_ls') + +vim.keymap.set("n", "b", "Buffers") +vim.keymap.set("n", "f", "Files") diff --git a/files/.config/nvim/nvim-pack-lock.json b/files/.config/nvim/nvim-pack-lock.json new file mode 100644 index 0000000..93f1306 --- /dev/null +++ b/files/.config/nvim/nvim-pack-lock.json @@ -0,0 +1,12 @@ +{ + "plugins": { + "fzf.vim": { + "rev": "d2a59a992a2455f609c0fde2ebd84427ea8f919a", + "src": "https://github.com/junegunn/fzf.vim" + }, + "nvim-lspconfig": { + "rev": "d592c1e6ad9a0a01b3d5ed3f0345d68407167181", + "src": "https://github.com/neovim/nvim-lspconfig" + } + } +} diff --git a/files/.config/vis/themes/kento2.lua b/files/.config/vis/themes/kento2.lua index 901791a..9e1093f 100644 --- a/files/.config/vis/themes/kento2.lua +++ b/files/.config/vis/themes/kento2.lua @@ -24,7 +24,7 @@ local colors = { ['bwht'] = '#c0c0c0', -- special colors - ['dim1'] = '#111111', + ['dim1'] = '#555555', ['dim2'] = '#010101' } diff --git a/files/.config/vis/visrc.lua b/files/.config/vis/visrc.lua index 4603d5d..b789e51 100644 --- a/files/.config/vis/visrc.lua +++ b/files/.config/vis/visrc.lua @@ -15,7 +15,8 @@ local plugins = { plug.init(plugins, true) vis.events.subscribe(vis.events.INIT, function() - vis:command("set theme kento2") + --vis:command("set theme kento2") + vis:command("set theme plain2") vis.options.autoindent = true vis.options.breakat = " " @@ -62,20 +63,25 @@ vis.events.subscribe(vis.events.INIT, function() vis:map(vis.modes.VISUAL, ' g', function() vis:command("grep") + vis:redraw() end) vis:map(vis.modes.NORMAL, ' f', function() vis:command("!make; read a") + vis:redraw() end) vis:map(vis.modes.NORMAL, 'mm', function() vis:command("!make; read a") + vis:redraw() end) vis:map(vis.modes.NORMAL, 'mc', function() vis:command("!make check; read a") + vis:redraw() end) vis:map(vis.modes.NORMAL, 'mt', function() vis:command("!make test; read a") + vis:redraw() end) end) diff --git a/files/.profile b/files/.profile index 73e6bba..b171fc5 100644 --- a/files/.profile +++ b/files/.profile @@ -7,3 +7,15 @@ export EDITOR=/usr/bin/vis export XBPS_DISTDIR="$HOME/void-packages" export CHEZSCHEMELIBDIRS="/usr/local/lib/csv10.3.0/":"$CHEZSCHEMELIBDIRS" + +is_login() { + echo "$-" | grep -q l && test "$(tty)" = '/dev/tty1' +} +if is_login; then + cd + echo 'Press return to start gui' + read && exec startx +fi +# OPS config +export OPS_DIR="$HOME/.ops" +export PATH="$HOME/.ops/bin:$PATH" diff --git a/files/.zprofile b/files/.zprofile index 6c40308..eca885b 100644 --- a/files/.zprofile +++ b/files/.zprofile @@ -5,6 +5,7 @@ export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig/:/usr/lib/pkgconfig export XKB_DEFAULT_LAYOUT=de export XBPS_DISTDIR="$HOME/void-packages" +export GOPHER=/usr/local/bin/sacc export EDITOR=/usr/bin/vis export CHEZSCHEMELIBDIRS="/usr/local/lib/csv10.3.0/":"$CHEZSCHEMELIBDIRS" diff --git a/files/.zshrc b/files/.zshrc index 34501a3..48b8c47 100644 --- a/files/.zshrc +++ b/files/.zshrc @@ -9,10 +9,10 @@ PS1='%B%m%(?.. %??)%(1j. %j&.)%b %2~%B%#%b ' setopt histignoredups histignorespace incappendhistory extendedhistory SAVEHIST=9000 HISTSIZE=9000 HISTFILE=~/.zsh_history # minimal functions, 08sep2017 +leah+ -g() { LC_ALL=C grep --exclude "*~" -r -P ${@:?regexp missing} } -sprunge() { cat $@ | curl -sF 'sprunge=<-' http://sprunge.us } +g() { LC_ALL=C grep --exclude "*~" -r -P ${@:?regexp missing}; } +sprunge() { cat $@ | curl -sF 'sprunge=<-' http://sprunge.us; } # minimal functions, 02mar -mkcd() { mkdir -p "$1"; cd "$1" } +mkcd() { mkdir -p "$1"; cd "$1"; } set -o emacs @@ -27,14 +27,13 @@ test -d ~/Downloads && rmdir ~/Downloads kcdp() { name="`lr -A -t 'depth > 3 ? prune : print' -t 'type=d' "$HOME/src" -s | fzy`" - cd "$HOME/src/$name" + test $? -eq 0 && cd "$HOME/src/$name" } -kmktags() { ctags `lr -A -t 'name=~".(ch)$"'` } +kmktags() { ctags `lr -A -t 'name=~".(ch)$"'`; } alias xi='doas xi -y' alias vi='vis' alias xr='doas xbps-remove -y' alias kpc='pass -c' alias kp='pass' alias nman='man -M /usr/local/netbsd-man' -