update

5 files changed, 31 insertions, 24 deletions

diff --git a/.config/nvim/lua/user/plugins/lspconfig.lua b/.config/nvim/lua/user/plugins/lspconfig.lua
index 1351959..43274fa 100644
--- a/.config/nvim/lua/user/plugins/lspconfig.lua
+++ b/.config/nvim/lua/user/plugins/lspconfig.lua
@@ -68,7 +68,7 @@ require 'lspconfig'.lua_ls.setup {
     flags = {
         debounce_text_changes = 150,
     },
-    cmd = { "/home/cafebabe/.local/src/lua-language-server/bin/lua-language-server", "-E", "/home/cafebabe/.local/src/lua-language-server/bin/main.lua" };
+    cmd = { "/home/cafebabe/.local/share/lua-language-server/bin/lua-language-server", "-E", "/home/cafebabe/.local/share/lua-language-server/bin/main.lua" };
     settings = {
         Lua = {
             runtime = {
@@ -115,16 +115,16 @@ require 'lspconfig'.clangd.setup {
     flags = {
         debounce_text_changes = 150,
     },
-    cmd = { "/usr/bin/clangd-13" };
+    cmd = { "clangd" };
 }
 
-require 'lspconfig'.solargraph.setup {
-    on_attach = on_attach,
-    capabilities = capabilities,
-    flags = {
-        debounce_text_changes = 150,
-    }
-}
+-- require 'lspconfig'.solargraph.setup {
+--     on_attach = on_attach,
+--     capabilities = capabilities,
+--     flags = {
+--         debounce_text_changes = 150,
+--     }
+-- }
 
 -- suppress error messages from lang servers
 vim.notify = function(msg, log_level, _)
diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc
index 62ccb34..67ae3d0 100644
--- a/.config/shell/aliasrc
+++ b/.config/shell/aliasrc
@@ -9,19 +9,24 @@ alias open='xdg-open'
 alias mutt='pushd ~/.mutt/attachments; mutt; popd'
 alias jpwine='LANG=ja_JP.UTF-8 WINEDEBUG=-all wine'
 alias emacsd='/usr/bin/emacs --daemon &'
+alias vi='$EDITOR'
 alias z='zathura'
 alias cn='clear;neofetch'
 alias nnn='nnn -Hde'
-alias ea='$EDITOR ~/.config/shell/aliasrc'
-alias ez='$EDITOR ~/.config/zsh/.zshrc'
-alias setkeys='xset r rate 250 30 && setxkbmap -option "ctrl:nocaps"'
-alias freyr='docker run -it -v /media/hdd/music:/data freyr-dev'
+alias ea='vi ~/.config/shell/aliasrc'
+alias ez='vi ~/.config/zsh/.zshrc'
 alias cam='mpv --profile=low-latency --untimed /dev/video0'
 
 # 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'
 
-# setting custom ascii
+# start freyr docker image to download music from spotify
+alias freyr='docker run -it -v /media/hdd/music:/data freyr-dev'
+
+# set my preferred keyboard options
+alias setkeys='xset r rate 250 30 && setxkbmap -option "ctrl:nocaps"'
+
+# set custom ascii
 # alias neofetch='neofetch --source ~/docs/ascii/lain'
 
 # cp mv and rm always verbose
@@ -30,7 +35,7 @@ alias mv='mv -iv'
 alias rm='rm -Iv'
 alias mkd='mkdir -pv'
 
-# Colorize grep output
+# colorize grep output
 alias grep='grep --color=auto -i'
 
 # ls shortcuts
@@ -46,12 +51,12 @@ ld() {
     fi
 }
 
-# Control Audio
+# control audio
 alias headset="wpctl set-default $(wpctl status | grep 'Headphones' | cut -b11-12)"
 alias speakers="wpctl set-default $(wpctl status | grep 'Speakers' | cut -b11-12)"
 alias setvol='pactl set-sink-volume @DEFAULT_SINK@'
 
-# Monitor / Resolution settings, mainly for playing old-ass games
+# monitor / resolution settings, mainly for playing old-ass games
 alias setrmon-lowres='xrandr --auto --output HDMI-A-0 --mode 640x480 --primary'
 alias setrmon-midres='xrandr --auto --output HDMI-A-0 --mode 800x600 --primary'
 alias setrmon-default='xrandr --auto --output HDMI-A-0 --mode 1920x1080 --primary'
@@ -77,7 +82,6 @@ stopwatch() {
    done
 }
 
-
 ## FUNCTIONS FOR CONVERTING DATE TO ISO 8601
 
 # convert date from YYYYMMDD to YYYY-MM-DD
diff --git a/.config/shell/profile b/.config/shell/profile
index b443e3b..2adf26c 100644
--- a/.config/shell/profile
+++ b/.config/shell/profile
@@ -1,7 +1,7 @@
 umask 0077
 
 export _JAVA_AWT_WM_NONREPARENTING=1
-export EDITOR="nano"
+export EDITOR="nvim"
 export TERMINAL="st"
 export BROWSER="icecat"
 
@@ -23,6 +23,3 @@ export XDG_SESSION_TYPE='x11'
 export VDPAU_DRIVER=radeonsi
 
 export PATH="$PATH:$HOME/.local/bin:$HOME/.fzf/bin:/sbin:/usr/sbin"
-
-
-
diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf
index 9ad7b50..ef0dabb 100644
--- a/.config/tmux/tmux.conf
+++ b/.config/tmux/tmux.conf
@@ -1,7 +1,7 @@
 set -g default-command "${SHELL}"
 
 # Status-bar settings
-set -g status-right "%H:%M"
+set -g status-right "%A, %F - %H:%M"
 set -g window-status-current-style "underscore"
 set -g message-command-style 'fg=#000000,bg=#FFFF00' 
 set -g message-style 'fg=#000000, bg=#FFFF00'
@@ -9,6 +9,7 @@ set -g status-bg '#333333'
 set -g status-fg '#FFFFFF'
 set -g set-titles on
 set -g set-titles-string "#T"
+set -g automatic-rename off
 
 # Enable RGB colour if running in xterm(1)
 set-option -sa terminal-overrides ",xterm*:Tc"
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index d27b9ac..e1884a3 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -4,7 +4,10 @@ stty stop undef
 setopt no_nomatch
 
 autoload -U compinit
+autoload -Uz vcs_info
+precmd() { vcs_info }
 zstyle ':completion:*' menu select
+zstyle ':vcs_info:git:*' formats ' (on %b)'
 zmodload zsh/complist
 compinit
 _comp_options+=(globdots)
@@ -17,7 +20,7 @@ bindkey -e
 # fix del key just inserting a tilde
 bindkey "^[[3~" delete-char
 
-PROMPT='%B%{$fg[red]%}[%{$fg[magenta]%}%n%{$fg[green]%}@%{$fg[blue]%}%M %{$fg[yellow]%}%~%{$fg[red]%}]%b '
+PROMPT='%B%{$fg[red]%}[%{$fg[magenta]%}%n%{$fg[green]%}@%{$fg[blue]%}%M%{$fg[white]%}${vcs_info_msg_0_}:%{$fg[yellow]%}%~]%{$reset_color%}%b '
 
 setopt extendedGlob
 
@@ -74,3 +77,5 @@ 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