commit 209665698c953ad0afcc8407bcb60573e28346b6
parent a585a9e3d9dca06c07b131670f3e9fdc58b5b2d5
Author: Bharatvaj <bharatvaj@yahoo.com>
Date: Mon, 4 Jul 2022 23:43:32 +0530
Merge branch 'main' of getsh.org:dotfiles
Diffstat:
17 files changed, 72 insertions(+), 128 deletions(-)
diff --git a/.Xresources b/.Xresources
@@ -1,38 +0,0 @@
-URxvt*background: #000000
-URxvt*foreground: #FFFFFF
-URxvt*font: xft:Fira Mono:pixelsize=14
-URxvt*boldFont: xft:Fira Mono:bold:pixelsize=14
-URxvt*saveLines: 12000
-URxvt*scrollBar: false
-URxvt*scrollstyle: rxvt
-URxvt*perl-ext-common: default,matcher,new-window
-URxvt*urlLauncher: firefox
-URxvt.internalBorder: 6
-URxvt.keysym.C-N: perl:new-window
-URxvt*matcher.button: 1
-
-URxvt*colorUL: #86a2be
-! black
-URxvt*color0 : #2E3436
-URxvt*color8 : #555753
-! red
-URxvt*color1 : #CC0000
-URxvt*color9 : #EF2929
-! green
-URxvt*color2 : #4E9A06
-URxvt*color10 : #8AE234
-! yellow
-URxvt*color3 : #C4A000
-URxvt*color11 : #FCE94F
-! blue
-URxvt*color4 : #3465A4
-URxvt*color12 : #729FCF
-! magenta
-URxvt*color5 : #75507B
-URxvt*color13 : #AD7FA8
-! cyan
-URxvt*color6 : #06989A
-URxvt*color14 : #34E2E2
-! white
-URxvt*color7 : #D3D7CF
-URxvt*color15 : #EEEEEC
diff --git a/.config/.gitignore b/.config/.gitignore
@@ -2,8 +2,10 @@
*
!.gitignore
-!X11
-!X11
+!X11/
+!X11/keybindings
+!X11/xinitrc
+!X11/Xresources
!alacritty/
!alacritty/**
!bash/
@@ -27,7 +29,7 @@ cmd/userenv.bat
!sh/
!sh/**
!tmux/
-!tmux/*
+!tmux/tmux.conf
!user-dirs.dirs
!vim/
!vim/**
diff --git a/.config/X11/Xresources b/.config/X11/Xresources
@@ -0,0 +1,38 @@
+URxvt*background: #000000
+URxvt*foreground: #FFFFFF
+URxvt*font: xft:Fira Mono:pixelsize=14 xft:Noto Color Emoji:pixelsize=14
+URxvt*boldFont: xft:Fira Mono:bold:pixelsize=14
+URxvt*saveLines: 12000
+URxvt*scrollBar: false
+URxvt*scrollstyle: rxvt
+URxvt*perl-ext-common: default,matcher,new-window
+URxvt*urlLauncher: firefox
+URxvt.internalBorder: 6
+URxvt.keysym.C-N: perl:new-window
+URxvt*matcher.button: 1
+
+URxvt*colorUL: #86a2be
+! black
+URxvt*color0 : #2E3436
+URxvt*color8 : #555753
+! red
+URxvt*color1 : #CC0000
+URxvt*color9 : #EF2929
+! green
+URxvt*color2 : #4E9A06
+URxvt*color10 : #8AE234
+! yellow
+URxvt*color3 : #C4A000
+URxvt*color11 : #FCE94F
+! blue
+URxvt*color4 : #3465A4
+URxvt*color12 : #729FCF
+! magenta
+URxvt*color5 : #75507B
+URxvt*color13 : #AD7FA8
+! cyan
+URxvt*color6 : #06989A
+URxvt*color14 : #34E2E2
+! white
+URxvt*color7 : #D3D7CF
+URxvt*color15 : #EEEEEC
diff --git a/.config/X11/keybindings b/.config/X11/keybindings
@@ -0,0 +1,7 @@
+__type() {
+ type "$@" >/dev/null 2>/dev/null
+}
+
+__type setxkbmap && setxkbmap -option caps:escape
+__type setxkbmap && setxkbmap -option altwin:swap_alt_win
+__type xbmap && xbmap
diff --git a/.config/X11/xinitrc b/.config/X11/xinitrc
@@ -1,16 +1,13 @@
#!/bin/sh
-__type() {
- type "$@" >/dev/null 2>/dev/null
-}
+. $XDG_CONFIG_HOME/X11/keybindings
-__type i3 || (echo "i3 not found" && exit 1)
+WM=dwm
+
+__type $WM || (echo "$WM not found" && exit 1)
-__type setxkbmap && setxkbmap -option caps:escape
-__type setxkbmap && setxkbmap -option altwin:swap_alt_win
-__type xbmap && xbmap
__type xrdb && xrdb merge ~/.config/X11/Xresources
__type hsetroot && exec hsetroot -solid "#000000" &
__type compton && exec compton &
-exec i3
+exec $WM
diff --git a/.config/cmd/profile.cmd b/.config/cmd/profile.cmd
@@ -5,16 +5,4 @@ prompt $P ∆
@call %XDG_CONFIG_HOME%\cmd\env.bat
@call %XDG_CONFIG_HOME%\cmd\userenv.bat
-
@call %XDG_CONFIG_HOME%\cmd\aliases.bat
-
-set VISUAL=vim
-set EDITOR=%VISUAL%
-set XDG_CONFIG_HOME=%USERPROFILE%\.config
-set XDG_DATA_HOME=%USERPROFILE%\.local\share
-set XDG_CACHE_HOME=%USERPROFILE%\.cache
-
-set MYVIMRC=%XDG_CONFIG_HOME%\vim\vimrc
-set VIMINIT=source $MYVIMRC
-
-%XDG_CONFIG_HOME%\cmd\aliases.cmd
diff --git a/.config/vim/keybindings/keybindings.vim b/.config/vim/keybindings/keybindings.vim
@@ -2,18 +2,19 @@
nmap <leader>F :GFiles<cr>
nnoremap <Leader>l :ls<CR>:b<space>
nnoremap <leader><leader> :grep
+nnoremap <leader>F :GFiles<cr>
nnoremap <leader>co :copen<cr>
-nnoremap <leader>ec :edit ~/.config/vim/vimrc<cr>
-nnoremap <leader>ek :edit ~/.config/vim/keybindings/keybindings.vim<cr>
+nnoremap <leader>ec :edit $XDG_CONFIG_HOME/vim/vimrc<cr>
+nnoremap <leader>ek :edit $XDG_CONFIG_HOME/vim/keybindings/keybindings.vim<cr>
nnoremap <leader>f :find *
nnoremap <leader>gg :grep<space>
+nnoremap <leader>vg :vimgrep<space>
nnoremap <leader>p :Rg<cr>
nnoremap <leader>t :tabnew<cr>
" Behave vim
nnoremap Y y$
-
fun! GitFind()
endfun
@@ -36,7 +37,7 @@ endfunction
nnoremap <leader>tl :call ToggleList()<CR>
" Buffer Creation
-nnoremap <Leader>v :vsplit<enter>
+nnoremap <Leader>vv :vsplit<enter>
nnoremap <Leader>ss :split<enter>
nnoremap <Leader>sc :source ~/.config/vim/vimrc<enter>
@@ -63,8 +64,8 @@ map <leader>c :!ctags -R -f ./.git/tags .<CR>
nnoremap <CR> :noh<CR><CR>:<backspace>
" Plugin keybindings
-source ~/.config/vim/keybindings/vimspector.vim
-source ~/.config/vim/keybindings/markdown.vim
+source $XDG_CONFIG_HOME/vim/keybindings/vimspector.vim
+source $XDG_CONFIG_HOME/vim/keybindings/markdown.vim
" Development keybindings
" TODO Have a default build hotkey keybinding, maybe bb,br?
diff --git a/.config/vim/plugin/plugin.vim b/.config/vim/plugin/plugin.vim
@@ -1,35 +1,2 @@
-" Plugin Management
-function DownloadPlug()
- let data_dir = has('nvim') ? stdpath('data') . '/site' : "${XDG_DATA_HOME}/vim"
- if empty(glob(data_dir . '/autoload/plug.vim'))
- silent execute '!curl -fLo '.data_dir.'/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
- PlugInstall --sync | source $MYVIMRC
- endif
-endfunction
-
-call plug#begin($XDG_DATA_HOME."/vim/plugged")
- Plug 'tpope/vim-commentary'
- Plug 'tpope/vim-surround'
- Plug 'tpope/vim-fugitive'
- Plug 'tpope/vim-repeat'
- Plug 'tpope/vim-unimpaired'
- Plug 'tommcdo/vim-ninja-feet'
- Plug 'ap/vim-css-color'
- Plug 'justinmk/vim-sneak'
- Plug 'easymotion/vim-easymotion'
- 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'
- source $XDG_CONFIG_HOME/vim/plugin/development.vim
-call plug#end()
-
-" Enable auto save only if backups are disabled
-if exists("nowb")
- let g:auto_save = 1
-endif
-
" Plugin Keybindings
nnoremap <leader>cc :ChecklistToggleCheckbox<cr>
diff --git a/.config/vim/vimrc b/.config/vim/vimrc
@@ -1,4 +1,8 @@
-if !has('nvim') | set viminfofile=$XDG_CACHE_HOME/vim/viminfo | endif
+if !has('nvim')
+ if has("&viminfofile")
+ set viminfofile=$XDG_CACHE_DIR/vim/viminfo
+ endif
+endif
" General
set number
@@ -14,7 +18,7 @@ set noswapfile
" Map leader to space
nnoremap <space> <Nop>
-let mapleader = <space>
+let mapleader = " "
" Enable hidden buffers
set hidden
@@ -39,22 +43,10 @@ set shiftwidth=4
let g:netrw_banner = 0
let g:netrw_liststyle = 3
-" Visual Tweaks
-hi VertSplit term=NONE cterm=NONE gui=NONE
-
-"TODO use inverse colors from fg and bg instead of hardcoding black and white values
-hi LineNr ctermbg=Black ctermfg=White
-
-" Prominent Cursor Line
-hi CursorLineNr ctermbg=White ctermfg=Black
-
" Disable status
set laststatus=1
-
-" Keybindings
-source $XDG_CONFIG_HOME/vim/keybindings/keybindings.vim
-
set nowrapscan
+
set lazyredraw
set ttyfast
@@ -107,4 +99,6 @@ if has("win32")
set shellxquote=
endif
-set fillchars+=eob:\
+if exists('+fillchars')
+ set fillchars+=eob:\
+endif
diff --git a/X11.md b/X11.md
@@ -1,12 +0,0 @@
-# X11
-
-```
-# Launch firefox as user without xorg
-# .config/X11/xinitrc file should be cleared for this to work, otherwise it would launch i3
-xinit firefox $* -- :0 vt$XDG_VTNR
-
-
-# Configure xauth manually
-# $HOST was not defined in arch, I added it manually when using it
-xauth add ${HOST}:0 . $(xxd -l 16 -p /dev/urandom)
-```
diff --git a/base b/base
diff --git a/base1 b/base1
diff --git a/base2 b/base2
diff --git a/base3 b/base3
diff --git a/base5 b/base5
diff --git a/base6 b/base6
diff --git a/final_test b/final_test
