diff options
| -rw-r--r-- | nvim/init.vim | 36 | ||||
| l--------- | nvim/nvim | 1 | ||||
| m--------- | zsh/omz | 0 | ||||
| -rw-r--r-- | zsh/zshrc | 79 |
4 files changed, 38 insertions, 78 deletions
diff --git a/nvim/init.vim b/nvim/init.vim index 5b93952..c5665d7 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -72,9 +72,33 @@ Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' } Plug 'junegunn/fzf.vim' Plug 'crusoexia/vim-monokai' Plug 'projekt0n/github-nvim-theme' -call plug#end() +Plug 'neovim/nvim-lspconfig' +Plug 'nvim-treesitter/nvim-treesitter' + +Plug 'mfussenegger/nvim-dap' +Plug 'rcarriga/nvim-dap-ui' +Plug 'theHamsta/nvim-dap-virtual-text' +Plug 'ray-x/guihua.lua' " float term, codeaction and codelens gui support -set number relativenumber +Plug 'ray-x/go.nvim' +call plug#end() +lua <<EOF +require 'go'.setup({ + goimport = 'gopls', -- if set to 'gopls' will use golsp format + gofmt = 'gopls', -- if set to gopls will use golsp format + max_line_len = 120, + tag_transform = false, + test_dir = '', + comment_placeholder = ' ', + lsp_cfg = true, -- false: use your own lspconfig + lsp_gofumpt = true, -- true: set default gofmt in gopls format to gofumpt + lsp_on_attach = true, -- use on_attach from go.nvim + dap_debug = true, +}) + +local protocol = require'vim.lsp.protocol' + +EOF set nu rnu set tabstop=4 set shiftwidth=0 @@ -166,8 +190,8 @@ let NERDTreeIgnore = ['_site'] " Buffer handling nmap L :let &number=1-&number<CR> -nmap <leader>] :bnext<CR> -nmap <leader>[ :bprevious<CR> +nmap <silent> <c-]> :bnext<CR> +nmap <silent> <c-[> :bprevious<CR> nmap <leader>bq :bp <BAR> bd #<CR> nmap <leader>bl :ls<CR> nmap <leader>0 :set invnumber<CR> @@ -175,3 +199,7 @@ nmap <leader>0 :set invnumber<CR> " http://stackoverflow.com/questions/7513380/vim-change-x-function-to-delete-buffer-instead-of-save-quit cnoreabbrev <expr> x getcmdtype() == ":" && getcmdline() == 'x' ? 'bd' : 'x' +nmap <silent> <c-k> :wincmd k<CR> +nmap <silent> <c-j> :wincmd j<CR> +nmap <silent> <c-h> :wincmd h<CR> +nmap <silent> <c-l> :wincmd l<CR> diff --git a/nvim/nvim b/nvim/nvim deleted file mode 120000 index f767680..0000000 --- a/nvim/nvim +++ /dev/null @@ -1 +0,0 @@ -/Users/neonxp/dev/dotfiles/nvim
\ No newline at end of file diff --git a/zsh/omz b/zsh/omz -Subproject 9c84c344d762b200de7acc794b9a0e7832144e7 +Subproject c10241f3d1d7bf77d483e11869a6a00f1d2e5e8 @@ -1,28 +1,12 @@ -# If you come from bash you might have to change your $PATH. export PATH=$HOME/.bin:/usr/local/bin:$HOME/go/bin:$PATH -alias pomodoro=/Users/neonxp/go/bin/pomodoro -alias docker=podman # Path to your oh-my-zsh installation. -export ZSH="/Users/neonxp/.oh-my-zsh" +export ZSH="$HOME/.oh-my-zsh" export EDITOR="/usr/local/bin/micro" -# Set name of the theme to load --- if set to "random", it will -# load a random theme each time oh-my-zsh is loaded, in which case, -# to know which specific one was loaded, run: echo $RANDOM_THEME -# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes ZSH_THEME="robbyrussell" -# Set list of themes to pick from when loading at random -# Setting this variable when ZSH_THEME=random will cause zsh to load -# a theme from this variable instead of looking in $ZSH/themes/ -# If set to an empty array, this variable will have no effect. -# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" ) - # Uncomment the following line to use case-sensitive completion. # CASE_SENSITIVE="true" - -# Uncomment the following line to use hyphen-insensitive completion. -# Case-sensitive completion must be off. _ and - will be interchangeable. # HYPHEN_INSENSITIVE="true" # Uncomment one of the following lines to change the auto-update behavior @@ -33,80 +17,29 @@ ZSH_THEME="robbyrussell" # Uncomment the following line to change how often to auto-update (in days). # zstyle ':omz:update' frequency 13 -# Uncomment the following line if pasting URLs and other text is messed up. -# DISABLE_MAGIC_FUNCTIONS="true" - -# Uncomment the following line to disable colors in ls. -# DISABLE_LS_COLORS="true" - -# Uncomment the following line to disable auto-setting terminal title. -# DISABLE_AUTO_TITLE="true" - -# Uncomment the following line to enable command auto-correction. -# ENABLE_CORRECTION="true" - -# Uncomment the following line to display red dots whilst waiting for completion. -# You can also set it to another string to have that shown instead of the default red dots. -# e.g. COMPLETION_WAITING_DOTS="%F{yellow}waiting...%f" -# Caution: this setting can cause issues with multiline prompts in zsh < 5.7.1 (see #5765) -# COMPLETION_WAITING_DOTS="true" - -# Uncomment the following line if you want to disable marking untracked files -# under VCS as dirty. This makes repository status check for large repositories -# much, much faster. -# DISABLE_UNTRACKED_FILES_DIRTY="true" +COMPLETION_WAITING_DOTS="true" -# Uncomment the following line if you want to change the command execution time -# stamp shown in the history command output. -# You can set one of the optional three formats: -# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd" -# or set a custom format using the strftime function format specifications, -# see 'man strftime' for details. +DISABLE_UNTRACKED_FILES_DIRTY="true" # HIST_STAMPS="mm/dd/yyyy" -# Would you like to use another custom folder than $ZSH/custom? -# ZSH_CUSTOM=/path/to/new-custom-folder - ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=yellow,underline" -# Which plugins would you like to load? -# Standard plugins can be found in $ZSH/plugins/ -# Custom plugins may be added to $ZSH_CUSTOM/plugins/ -# Example format: plugins=(rails git textmate ruby lighthouse) -# Add wisely, as too many plugins slow down shell startup. - - -plugins=(git zsh-autosuggestions fzf) +plugins=(git zsh-autosuggestions fzf golang) source $ZSH/oh-my-zsh.sh -# User configuration - -# export MANPATH="/usr/local/man:$MANPATH" - -# You may need to manually set your language environment # export LANG=en_US.UTF-8 # Preferred editor for local and remote sessions if [[ -n $SSH_CONNECTION ]]; then export EDITOR='vim' else - export EDITOR='nvim' + export EDITOR='a' fi -# Compilation flags # export ARCHFLAGS="-arch x86_64" -# Set personal aliases, overriding those provided by oh-my-zsh libs, -# plugins, and themes. Aliases can be placed here, though oh-my-zsh -# users are encouraged to define aliases within the ZSH_CUSTOM folder. -# For a full list of active aliases, run `alias`. -# -# Example aliases -# alias zshconfig="mate ~/.zshrc" -# alias ohmyzsh="mate ~/.oh-my-zsh" - - +[ -f ~/.zshrc.local ] && source ~/.zshrc.local [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh ### Added by Zinit's installer |