commit 84263a42f4ce62e0fca2102dfa97a62e54d88a0e
parent f18c3182bc9084b391ea511f6a881accf9e07c43
Author: Bharatvaj <bharatvaj@yahoo.com>
Date: Wed, 15 Dec 2021 00:27:22 +0530
Merge branch 'base' of github.com:bharatvaj/dotfiles into macos
Diffstat:
10 files changed, 65 insertions(+), 29 deletions(-)
diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml
@@ -1,3 +1,17 @@
+mouse:
+ hide_when_typing: true
+
import:
- ~/.config/alacritty/theme.yml
+ - ~/.config/alacritty/font.yml
+
+cursor:
+ style:
+ shape: Beam
+
+live_config_reload: true
+shell:
+ program: bash
+ args:
+ - --login
diff --git a/.config/alacritty/font.yml b/.config/alacritty/font.yml
@@ -0,0 +1,15 @@
+font:
+ normal:
+ family: Fira Code
+ style: SemiBold
+
+ bold:
+ family: Fira Code
+ style: Bold
+
+ italic:
+ family: Fira Code
+ style: Italic
+
+ bold_italic:
+ family: Fira Code
diff --git a/.config/bash/bashrc b/.config/bash/bashrc
@@ -1,7 +1,3 @@
-#
-# ~/.bashrc
-#
-
PATH_EXPORTS=( "${ESSENTIAL_PATH_EXPORTS[@]}" "${OTHER_PATH_EXPORTS[@]}" )
export PATH="${PATH}:${PATH_EXPORTS[*]}"
diff --git a/.config/sh/aliases b/.config/sh/aliases
@@ -1,7 +1,10 @@
+mich abook && alias abook='abook --config "$XDG_CONFIG_HOME"/abook/abookrc --datafile "$XDG_DATA_HOME"/abook/addressbook'
mich startx && alias startx='startx "$XDG_CONFIG_HOME/X11/xinitrc" vt1'
mich wget && alias wget='wget --hsts-file="$XDG_CACHE_HOME/wget-hsts"'
mich mbsync && alias mbsync='mbsync -c "$XDG_CONFIG_HOME"/isync/mbsyncrc'
mich nvim && alias vim=nvim
+mich emcc && alias emcc='emcc --em-config "$XDG_CONFIG_HOME"/emscripten/config --em-cache "$XDG_CACHE_HOME"/emscripten/cache'
+mich dict && alias dict='dict -c "$XDG_CONFIG_HOME"/dict/dictrc'
# conditioning
## ls conditioning
diff --git a/.config/vim/keybindings/keybindings.vim b/.config/vim/keybindings/keybindings.vim
@@ -2,6 +2,7 @@
nnoremap <leader>t :tabnew<cr>
nnoremap <leader>p :Rg<cr>
nnoremap <leader>f :find
+nmap <leader>F :GFiles<cr>
" Buffer Creation
nnoremap <Leader>v :vsplit<enter>
diff --git a/.config/vim/plugin/development.vim b/.config/vim/plugin/development.vim
@@ -1,8 +1,13 @@
Plug 'editorconfig/editorconfig-vim'
Plug 'cdelledonne/vim-cmake'
-if has('nvim')
- Plug 'puremourning/vimspector'
-endif
Plug 'vim-syntastic/syntastic'
Plug 'rust-lang/rust.vim'
+if has('python')
+ " Enable if required, manually
+ "Plug 'puremourning/vimspector'
+endif
+"TODO add windows check
+if has('win32')
+ Plug 'heaths/vim-msbuild'
+endif
Plug 'mattn/emmet-vim'
diff --git a/.config/vim/plugin/plugin.vim b/.config/vim/plugin/plugin.vim
@@ -17,14 +17,12 @@ call plug#begin($XDG_DATA_HOME."/vim/plugged")
Plug 'ap/vim-css-color'
Plug 'justinmk/vim-sneak'
Plug 'easymotion/vim-easymotion'
- Plug 'SirVer/ultisnips'
+ Plug 'kana/vim-textobj-user' | Plug 'whatyouhide/vim-textobj-xmlattr'
+ Plug 'msanders/snipmate.vim'
Plug 'sainnhe/gruvbox-material'
Plug 'ntpeters/vim-better-whitespace'
Plug 'lpinilla/vim-codepainter'
Plug '907th/vim-auto-save'
- Plug 'christoomey/vim-tmux-navigator'
- Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
- Plug 'junegunn/fzf.vim'
source $XDG_CONFIG_HOME/vim/plugin/development.vim
call plug#end()
@@ -34,8 +32,4 @@ if exists("nowb")
endif
" Plugin Keybindings
-
-" fzf
-nmap <leader>F :GFiles<cr>
-
nnoremap <leader>cc :ChecklistToggleCheckbox<cr>
diff --git a/.config/vim/vimrc b/.config/vim/vimrc
@@ -30,6 +30,7 @@ set mouse=a
set cursorline
syntax on
set exrc
+set scrolloff=8
" Turn backup off
set nobackup
set nowb
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+* text eol=lf
diff --git a/.profile b/.profile
@@ -2,39 +2,45 @@ export GREP_OPTIONS='--color=auto'
export GREP_COLOR='1;35;40'
# XDG
-export XDG_DATA_HOME="$HOME/.local/share"
export XDG_CONFIG_HOME="$HOME/.config"
+export XDG_DATA_HOME="$HOME/.local/share"
export XDG_CACHE_HOME="$HOME/.cache"
# Global programs
-export GNUPGHOME="$XDG_DATA_HOME/gnupg"
export VIMINIT="source $XDG_CONFIG_HOME/vim/vimrc"
export LESSHISTFILE=-
export LYNX_CFG="$XDG_CONFIG_HOME/lynx/lynx.cfg"
export LYNX_LSS="$XDG_CONFIG_HOME/lynx/lynx.lss"
-export NODE_REPL_HISTORY="$XDG_DATA_HOME"/node_repl_history
-export NPM_CONFIG_USERCONFIG=$XDG_CONFIG_HOME/npm/npmrc
-export PASSWORD_STORE_DIR="$XDG_DATA_HOME"/pass
+export GNUPGHOME="$XDG_DATA_HOME/gnupg"
export PSQLRC="$XDG_CONFIG_HOME/pg/psqlrc"
-export PSQL_HISTORY="$XDG_CACHE_HOME/pg/psql_history"
export PGPASSFILE="$XDG_CONFIG_HOME/pg/pgpass"
export PGSERVICEFILE="$XDG_CONFIG_HOME/pg/pg_service.conf"
-export RUSTUP_HOME="$XDG_DATA_HOME"/rustup
export TASKRC="$XDG_CONFIG_HOME/task/taskrc"
-export HISTFILE="$XDG_DATA_HOME"/bash/history
export XINITRC="$XDG_CONFIG_HOME"/X11/xinitrc
export XSERVERRC="$XDG_CONFIG_HOME"/X11/xserverrc
-export XAUTHORITY="$XDG_RUNTIME_DIR"/Xauthority
-export ATOM_HOME="$XDG_DATA_HOME"/atom
+export XAUTHORITY="$XDG_RUNTIME_DIR"/Xauthority
export WGETRC="$XDG_CONFIG_HOME/wgetrc"
export SCREENRC="$XDG_CONFIG_HOME"/screen/screenrc
export DOCKER_CONFIG="$XDG_CONFIG_HOME"/docker
-export MACHINE_STORAGE_PATH="$XDG_DATA_HOME"/docker-machine
-
+export INPUTRC="$XDG_CONFIG_HOME"/readline/inputrc
export NOTMUCH_CONFIG="$XDG_CONFIG_HOME/notmuch/config"
+export NPM_CONFIG_USERCONFIG=$XDG_CONFIG_HOME/npm/npmrc
+export FFMPEG_DATADIR="$XDG_CONFIG_HOME"/ffmpeg
+export EM_CONFIG="$XDG_CONFIG_HOME"/emscripten/config
-# Local programs
+export ATOM_HOME="$XDG_DATA_HOME"/atom
+export NODE_REPL_HISTORY="$XDG_DATA_HOME"/node_repl_history
+export PASSWORD_STORE_DIR="$XDG_DATA_HOME"/pass
+export HISTFILE="$XDG_DATA_HOME"/bash/history
+export RUSTUP_HOME="$XDG_DATA_HOME"/rustup
+export MACHINE_STORAGE_PATH="$XDG_DATA_HOME"/docker-machine
+export GOPATH="$XDG_DATA_HOME"/go
export NB_PATH="$XDG_DATA_HOME/notebook"
+export EM_PORTS="$XDG_DATA_HOME"/emscripten/cache
+
+export PSQL_HISTORY="$XDG_CACHE_HOME/pg/psql_history"
+export NUGET_PACKAGES="$XDG_CACHE_HOME"/NuGetPackages
+export EM_CACHE="$XDG_CACHE_HOME"/emscripten/cache
# Make `history` print timestamp
HISTTIMEFORMAT="%F %T "
@@ -44,7 +50,7 @@ export PATH=${PATH}:~/.local/bin
chance() {
# Hit or miss
- [ -f "${1}" ] && . "${1}"
+ [ -f "${1}" ] && . "${1}"
}
mich() {
