diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/nvim/lua/plugins.lua | 23 | ||||
| -rw-r--r-- | config/tmux/tmux.conf | 5 | ||||
| -rw-r--r-- | config/zsh/.zshrc | 19 | ||||
| -rwxr-xr-x | config/zsh/zprofile | 1 |
4 files changed, 15 insertions, 33 deletions
diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua index 97dc63b..ddfd50f 100644 --- a/config/nvim/lua/plugins.lua +++ b/config/nvim/lua/plugins.lua @@ -50,28 +50,10 @@ return require("packer").startup(function() end } - -- tags managment - use { - "ludovicchabant/vim-gutentags", - config = function() - vim.g.gutentags_ctags_exclude = { - "doc/*", - "docs/*", - "Makefile", - ".mypy_cache", - ".pytest_cache", - ".tox", - "build/*", - "dist/*" - } - end - } - - -- nvim lsp configuration use { "neovim/nvim-lspconfig", - ft = {"rust", "python", "c", "cpp", "lua", "go", "haskell"}, + ft = {"rust", "python", "c", "cpp", "lua", "go", "haskell", "ocaml"}, config = function() local on_attach = function(_, bufnr) local opts = { noremap = true, silent = true } @@ -134,6 +116,9 @@ return require("packer").startup(function() -- brew install haskell-language-server lspconfig.hls.setup {} + -- opam install ocaml-lsp-server + lspconfig.ocamllsp.setup {} + -- package lua-language-server on ArchLinux -- lspconfig.sumneko_lua.setup { -- on_attach = on_attach , diff --git a/config/tmux/tmux.conf b/config/tmux/tmux.conf index abcea6d..777810f 100644 --- a/config/tmux/tmux.conf +++ b/config/tmux/tmux.conf @@ -28,8 +28,6 @@ bind R source-file ~/.config/tmux/tmux.conf set -g status-right-length 100 -# set -g @plugin '~/git/tmux-ssh-mode' - set -g @plugin 'tmux-plugins/tpm' # set -g @plugin 'egel/tmux-gruvbox' # set -g @tmux-gruvbox 'dark' @@ -43,8 +41,5 @@ set -g @prefix_highlight_copy_mode_attr 'fg=black,bg=yellow,bold' # default is ' set -g @prefix_highlight_show_sync_mode 'on' set -g @prefix_highlight_sync_mode_attr 'fg=black,bg=green' # default is 'fg=default,bg=yellow' -set -g status-right "#{prefix_highlight}#{tmux-ssh-mode}#[fg=brightblack,bg=black,nobold,noitalics,nounderscore]#[fg=white,bg=brightblack] %Y-%m-%d #[fg=white,bg=brightblack,nobold,noitalics,nounderscore]#[fg=white,bg=brightblack] %H:%M #[fg=cyan,bg=brightblack,nobold,noitalics,nounderscore]#[fg=black,bg=cyan,bold] #H " - -# set -g @plugin 'tomhey/tmux-remote-sessions' run "$XDG_CONFIG_HOME/tmux/plugins/tpm/tpm" diff --git a/config/zsh/.zshrc b/config/zsh/.zshrc index 9e9f583..e7dac3d 100644 --- a/config/zsh/.zshrc +++ b/config/zsh/.zshrc @@ -66,15 +66,15 @@ chpwd() { [ "$(uname)" = 'Linux' ] && [ "$(stat -c "%U" .)" = "$USER" ] && touch . # to sort by last cd # change conda env if name of the directory is the name of an env - [ ! -d "$PWD/.git" ] && return - name="$(basename "$PWD")" - [ "$name" = $CONDA_DEFAULT_ENV ] && return - [ ! -e "$HOME/conda_envs" ] && conda env list > "$HOME/conda_envs" - < "$HOME/conda_envs" \ - cut -d ' ' -f 1 | - sed -e '/^#/d' -e '/^$/d' -e '/^base$/d' | - grep -q "$name" && - conda activate "$name" + # [ ! -d "$PWD/.git" ] && return + # name="$(basename "$PWD")" + # [ "$name" = $CONDA_DEFAULT_ENV ] && return + # [ ! -e "$HOME/conda_envs" ] && conda env list > "$HOME/conda_envs" + # < "$HOME/conda_envs" \ + # cut -d ' ' -f 1 | + # sed -e '/^#/d' -e '/^$/d' -e '/^base$/d' | + # grep -q "$name" && + # conda activate "$name" } # https://wiki.archlinux.org/title/Zsh#Shortcut_to_exit_shell_on_partial_command_line @@ -136,3 +136,4 @@ if [ -f "/usr/local/anaconda3/etc/profile.d/mamba.sh" ]; then fi # <<< conda initialize <<< +eval "$(opam env)" diff --git a/config/zsh/zprofile b/config/zsh/zprofile index 6476dd7..ecf3ca7 100755 --- a/config/zsh/zprofile +++ b/config/zsh/zprofile @@ -10,6 +10,7 @@ then export PATH="/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin" export PATH="$PATH:$HOME/.brew/bin:$HOME/git/dotfiles/bin:$HOME/bin:/usr/local/anaconda3/bin" export PATH="$PATH:$HOME/.local/share/go/bin" + export PATH="$PATH:$HOME/.local/bin" export MAIL='charles.cabergs@colruytgroup.com' export SUDO='sudo' export LC_CTYPE='en_US.UTF-8' |