diff options
| -rw-r--r-- | .config/i3status/config | 2 | ||||
| -rwxr-xr-x | .config/nnn/nnn.bash | 2 | ||||
| -rw-r--r-- | .config/nvim/lua/user/plugins/lspconfig.lua | 50 | ||||
| -rw-r--r-- | .config/shell/aliasrc | 9 | ||||
| -rw-r--r-- | .config/x11/xinitrc | 2 | ||||
| -rw-r--r-- | .config/zsh/.zshrc | 5 |
6 files changed, 42 insertions, 28 deletions
diff --git a/.config/i3status/config b/.config/i3status/config index 8fb7d28..315dae5 100644 --- a/.config/i3status/config +++ b/.config/i3status/config @@ -44,5 +44,5 @@ volume master { } tztime local { - format = "%A, %Y-%m-%d %H:%M" + format = "%A, %Y-%m-%d %H:%M " } diff --git a/.config/nnn/nnn.bash b/.config/nnn/nnn.bash index 92a10dd..966ba30 100755 --- a/.config/nnn/nnn.bash +++ b/.config/nnn/nnn.bash @@ -1,4 +1,4 @@ # NNN -export NNN_PLUG='t:preview-tabbed;' +export NNN_PLUG='t:preview-tui;b:preview-tabbed' export NNN_FIFO="/tmp/nnn.fifo" diff --git a/.config/nvim/lua/user/plugins/lspconfig.lua b/.config/nvim/lua/user/plugins/lspconfig.lua index 67d82a7..2e51445 100644 --- a/.config/nvim/lua/user/plugins/lspconfig.lua +++ b/.config/nvim/lua/user/plugins/lspconfig.lua @@ -59,27 +59,37 @@ require 'lspconfig'.emmet_ls.setup { filetypes = { 'html', 'javascript', 'typescript', 'javascriptreact', 'typescriptreact', 'eruby' } } +-- require'lspconfig'.lua_ls.setup { +-- on_init = function(client) +-- local path = client.workspace_folders[1].name +-- if not vim.loop.fs_stat(path..'/.luarc.json') and not vim.loop.fs_stat(path..'/.luarc.jsonc') then +-- client.config.settings = vim.tbl_deep_extend('force', client.config.settings.Lua, { +-- runtime = { +-- -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) +-- version = 'LuaJIT' +-- }, +-- -- Make the server aware of Neovim runtime files +-- workspace = { +-- library = { vim.env.VIMRUNTIME } +-- -- or pull in all of 'runtimepath'. NOTE: this is a lot slower +-- -- library = vim.api.nvim_get_runtime_file("", true) +-- }, +-- cmd = { "~/.emacs.d/.cache/lsp/lua-language-server/bin/lua-language-server" }, +-- }) + +-- client.notify("workspace/didChangeConfiguration", { settings = client.config.settings }) +-- end +-- return true +-- end +-- } + require'lspconfig'.lua_ls.setup { - on_init = function(client) - local path = client.workspace_folders[1].name - if not vim.loop.fs_stat(path..'/.luarc.json') and not vim.loop.fs_stat(path..'/.luarc.jsonc') then - client.config.settings = vim.tbl_deep_extend('force', client.config.settings.Lua, { - runtime = { - -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) - version = 'LuaJIT' - }, - -- Make the server aware of Neovim runtime files - workspace = { - library = { vim.env.VIMRUNTIME } - -- or pull in all of 'runtimepath'. NOTE: this is a lot slower - -- library = vim.api.nvim_get_runtime_file("", true) - } - }) - - client.notify("workspace/didChangeConfiguration", { settings = client.config.settings }) - end - return true - end + on_attach = on_attach, + capabilities = capabilities, + flags = { + debounce_text_changes = 150, + }, + cmd = { "/home/cafebabe/.emacs.d/.cache/lsp/lua-language-server/bin/lua-language-server" }, } require 'lspconfig'.bashls.setup { diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc index 0599553..0757b44 100644 --- a/.config/shell/aliasrc +++ b/.config/shell/aliasrc @@ -24,7 +24,7 @@ alias tma='tmux a -t' alias tmn='tmux new-session -s' # rename files in pwd in their current order to 4-digit numbers -alias ofn='/bin/ls | cat -n | while read n f; do perl-rename "s/${f%.*}/$(printf "%04d" "$n")/" "$f"; done' +alias ofn='/bin/ls | cat -n | while read n f; do rename "s/${f%.*}/$(printf "%04d" "$n")/" "$f"; done' # start freyr docker image to download music from spotify # alias freyr='docker run -it -v /media/hdd/music:/data freyr-dev' @@ -34,7 +34,7 @@ alias setkeys='xset r rate 250 30 && setxkbmap -layout us,us -variant dvorak, -o alias setus='setxkbmap -layout us,us -option "ctrl:nocaps"' # pad numbers in filenames with zeros -alias padz='perl-rename "s/\d+/sprintf(\"%02d\",$&)/e"' +alias padz='rename "s/\d+/sprintf(\"%02d\",$&)/e"' # set custom ascii # alias neofetch='neofetch --source ~/docs/ascii/lain' @@ -143,10 +143,13 @@ alias dfiles='/usr/bin/git --git-dir=$HOME/.dotfiles --work-tree=$HOME' alias dcomm='dfiles commit -m' alias dpush='dfiles push origin' -# package manager +# package management alias aptsr='apt search' alias aptin='sudo apt install' alias aptrm='sudo apt remove --autoremove' alias aptupd='sudo apt update' alias aptupg='sudo apt upgrade' alias aptup='aptupd && aptupg' +alias aptli='apt list --installed' +alias aptlu='apt list --upgradable' +alias aptman='apt-mark showmanual' diff --git a/.config/x11/xinitrc b/.config/x11/xinitrc index 4305681..d2db958 100644 --- a/.config/x11/xinitrc +++ b/.config/x11/xinitrc @@ -16,7 +16,7 @@ setxkbmap -layout us,us -variant dvorak, -option "ctrl:nocaps,lv3:rwin_switch,gr xrdb -merge ~/.Xresources ~/.local/bin/set-wallpaper & -/usr/bin/emacs --daemon & +/usr/local/bin/emacs --daemon & urxvtd -q -o -f & pipewire & diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 19cc643..efdc061 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -80,5 +80,6 @@ if [ -f $XDG_DATA_HOME/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighti . $XDG_DATA_HOME/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh fi - -alias luamake=/home/cafebabe/.local/src/lua-language-server/3rd/luamake/luamake +if [ -f $XDG_DATA_HOME/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh ]; then + . $XDG_DATA_HOME/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh +fi |