diff --git a/configs/.zshrc b/configs/.zshrc index 59754d5..4792e4b 100644 --- a/configs/.zshrc +++ b/configs/.zshrc @@ -57,6 +57,32 @@ if [ -s "$HOME/.asdf" ]; then . $HOME/.asdf/completions/asdf.bash fi +# set PATH so it includes user's private bin if it exists +if [ -d "$HOME/bin" ] ; then + PATH="$HOME/bin:$PATH" +fi + +# set PATH so it includes user's private bin if it exists +if [ -d "$HOME/.local/bin" ] ; then + PATH="$HOME/.local/bin:$PATH" +fi + +#If fdfind is installed force fzf to use it +if [ -s $(which fdfind) ]; then + + # Symlink fdfind to fd if not already symlinked + [[ ! -s $(which fd) ]] && ln -s $(which fdfind) ~/.local/bin/fd + + # Feed the output of fd into fzf + # fd --type f | fzf + + # Setting fd as the default source for fzf + export FZF_DEFAULT_COMMAND='fd --type f' + + # To apply the command to CTRL-T as well + export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND" +fi + # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh. [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh diff --git a/configs/init.vim b/configs/init.vim index 296aa50..956a4cf 100644 --- a/configs/init.vim +++ b/configs/init.vim @@ -1,13 +1,13 @@ set number -set tabstop=4 " The width of a TAB is set to 4. +set tabstop=2 " The width of a TAB is set to 4. " Still it is a \t. It is just that " Vim will interpret it to be having " a width of 4. -set shiftwidth=4 " Indents will have a width of 4 +set shiftwidth=2 " Indents will have a width of 4 -set softtabstop=4 " Sets the number of columns for a TAB +set softtabstop=2 " Sets the number of columns for a TAB set expandtab " Expand TABs to spaces @@ -16,9 +16,14 @@ call plug#begin('~/.vim/plugged') " Declare the list of plugins. Plug 'tpope/vim-sensible' +Plug 'prettier/vim-prettier', { + \ 'do': 'yarn install', + \ 'for': ['javascript', 'typescript', 'css', 'less', 'scss', 'json', 'graphql', 'markdown', 'vue', 'svelte', 'yaml', 'html'] } Plug 'kaicataldo/material.vim', { 'branch': 'main' } Plug 'ryanoasis/vim-devicons' Plug 'preservim/nerdtree' +" For searching through file contents +Plug 'dyng/ctrlsf.vim' " A status line to the bottom " Plug 'itchyny/lightline.vim' @@ -33,7 +38,7 @@ Plug 'mattn/emmet-vim' Plug 'iamcco/markdown-preview.nvim', { 'do': 'cd app && yarn install' } " Display Images in Vim -Plug 'ashisha/image.vim' +" Plug 'ashisha/image.vim' " Svelte support Plug 'leafOfTree/vim-svelte-plugin' @@ -47,6 +52,10 @@ Plug 'junegunn/fzf', { 'do': { -> fzf#install() } } Plug 'kristijanhusak/vim-dadbod-ui' +Plug 'liuchengxu/vim-clap' + +Plug 'glepnir/dashboard-nvim' + " List ends here. Plugins become visible to Vim after this call. call plug#end() @@ -62,6 +71,10 @@ syntax enable let g:material_theme_style = 'ocean-community' colorscheme material +" Remove background color +highlight Normal guibg=none +highlight NonText guibg=none + let g:lightline = { \ 'colorscheme': 'one', \ 'background': 'dark', @@ -88,6 +101,7 @@ nmap l nnoremap H gT nnoremap L gt +:tnoremap autocmd WinEnter * call s:CloseIfOnlyNerdTreeLeft()