Merge tower shit with laptop shit
This commit is contained in:
commit
eaad617db1
6 changed files with 103 additions and 69 deletions
13
.Xresources
13
.Xresources
|
@ -1,2 +1,13 @@
|
||||||
! *.font: DejaVu Sans Mono:style=Book:pixelsize=10:antialias=true:autohint=true;
|
;term*background: black
|
||||||
|
;term*foreground: lightgray
|
||||||
|
;term*faceName: monospace:pixelsize=14
|
||||||
|
|
||||||
|
;URxvt.font: xft:monospace:pixelsize=14,xft:Font Awesome 5 Free:minspace=False
|
||||||
|
;URxvt.background: [75]black
|
||||||
|
;URxvt.foreground: lightgray
|
||||||
|
;URxvt.depth: 32
|
||||||
|
|
||||||
|
;st.foreground: lightgray
|
||||||
|
|
||||||
|
;*.font: DejaVu Sans Mono:style=Book:pixelsize=10:antialias=true:autohint=true;
|
||||||
|
|
||||||
|
|
|
@ -2,6 +2,13 @@
|
||||||
# ~/.bash_profile
|
# ~/.bash_profile
|
||||||
#
|
#
|
||||||
|
|
||||||
|
# ----[Standard Environment Vars]----
|
||||||
|
export PATH="$PATH:$(du "$HOME/.local/bin" | cut -f2 | tr '\n' ':' | sed 's/:*$//')"
|
||||||
|
export EDITOR="nvim"
|
||||||
|
export TERMINAL="st"
|
||||||
|
export SHELL="/bin/bash"
|
||||||
|
|
||||||
|
# ----[less/man colors]----
|
||||||
export LESS=-R
|
export LESS=-R
|
||||||
export LESS_TERMCAP_mb=$'\E[1;31m' # begin blink
|
export LESS_TERMCAP_mb=$'\E[1;31m' # begin blink
|
||||||
export LESS_TERMCAP_md=$'\E[1;36m' # begin bold
|
export LESS_TERMCAP_md=$'\E[1;36m' # begin bold
|
||||||
|
@ -11,12 +18,10 @@ export LESS_TERMCAP_se=$'\E[0m' # reset reverse video
|
||||||
export LESS_TERMCAP_us=$'\E[1;32m' # begin underline
|
export LESS_TERMCAP_us=$'\E[1;32m' # begin underline
|
||||||
export LESS_TERMCAP_ue=$'\E[0m' # reset underline
|
export LESS_TERMCAP_ue=$'\E[0m' # reset underline
|
||||||
|
|
||||||
export PATH="$PATH:$(du "$HOME/.local/bin" | cut -f2 | tr '\n' ':' | sed 's/:*$//')"
|
# ----[ls colors]----
|
||||||
export EDITOR="nvim"
|
|
||||||
export TERMINAL="st"
|
|
||||||
export SHELL="/bin/bash"
|
|
||||||
export LS_COLORS='rs=0:di=01;34:ln=01;36:mh=00:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:mi=00:su=37;41:sg=30;43:ca=30;41:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arc=01;31:*.arj=01;31:*.taz=01;31:*.lha=01;31:*.lz4=01;31:*.lzh=01;31:*.lzma=01;31:*.tlz=01;31:*.txz=01;31:*.tzo=01;31:*.t7z=01;31:*.zip=01;31:*.z=01;31:*.dz=01;31:*.gz=01;31:*.lrz=01;31:*.lz=01;31:*.lzo=01;31:*.xz=01;31:*.zst=01;31:*.tzst=01;31:*.bz2=01;31:*.bz=01;31:*.tbz=01;31:*.tbz2=01;31:*.tz=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.war=01;31:*.ear=01;31:*.sar=01;31:*.rar=01;31:*.alz=01;31:*.ace=01;31:*.zoo=01;31:*.cpio=01;31:*.7z=01;31:*.rz=01;31:*.cab=01;31:*.wim=01;31:*.swm=01;31:*.dwm=01;31:*.esd=01;31:*.jpg=01;35:*.jpeg=01;35:*.mjpg=01;35:*.mjpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.svg=01;35:*.svgz=01;35:*.mng=01;35:*.pcx=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.m2v=01;35:*.mkv=01;35:*.webm=01;35:*.ogm=01;35:*.mp4=01;35:*.m4v=01;35:*.mp4v=01;35:*.vob=01;35:*.qt=01;35:*.nuv=01;35:*.wmv=01;35:*.asf=01;35:*.rm=01;35:*.rmvb=01;35:*.flc=01;35:*.avi=01;35:*.fli=01;35:*.flv=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.yuv=01;35:*.cgm=01;35:*.emf=01;35:*.ogv=01;35:*.ogx=01;35:*.aac=00;36:*.au=00;36:*.flac=00;36:*.m4a=00;36:*.mid=00;36:*.midi=00;36:*.mka=00;36:*.mp3=00;36:*.mpc=00;36:*.ogg=00;36:*.ra=00;36:*.wav=00;36:*.oga=00;36:*.opus=00;36:*.spx=00;36:*.xspf=00;36:';
|
export LS_COLORS='rs=0:di=01;34:ln=01;36:mh=00:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:mi=00:su=37;41:sg=30;43:ca=30;41:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arc=01;31:*.arj=01;31:*.taz=01;31:*.lha=01;31:*.lz4=01;31:*.lzh=01;31:*.lzma=01;31:*.tlz=01;31:*.txz=01;31:*.tzo=01;31:*.t7z=01;31:*.zip=01;31:*.z=01;31:*.dz=01;31:*.gz=01;31:*.lrz=01;31:*.lz=01;31:*.lzo=01;31:*.xz=01;31:*.zst=01;31:*.tzst=01;31:*.bz2=01;31:*.bz=01;31:*.tbz=01;31:*.tbz2=01;31:*.tz=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.war=01;31:*.ear=01;31:*.sar=01;31:*.rar=01;31:*.alz=01;31:*.ace=01;31:*.zoo=01;31:*.cpio=01;31:*.7z=01;31:*.rz=01;31:*.cab=01;31:*.wim=01;31:*.swm=01;31:*.dwm=01;31:*.esd=01;31:*.jpg=01;35:*.jpeg=01;35:*.mjpg=01;35:*.mjpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.svg=01;35:*.svgz=01;35:*.mng=01;35:*.pcx=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.m2v=01;35:*.mkv=01;35:*.webm=01;35:*.ogm=01;35:*.mp4=01;35:*.m4v=01;35:*.mp4v=01;35:*.vob=01;35:*.qt=01;35:*.nuv=01;35:*.wmv=01;35:*.asf=01;35:*.rm=01;35:*.rmvb=01;35:*.flc=01;35:*.avi=01;35:*.fli=01;35:*.flv=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.yuv=01;35:*.cgm=01;35:*.emf=01;35:*.ogv=01;35:*.ogx=01;35:*.aac=00;36:*.au=00;36:*.flac=00;36:*.m4a=00;36:*.mid=00;36:*.midi=00;36:*.mka=00;36:*.mp3=00;36:*.mpc=00;36:*.ogg=00;36:*.ra=00;36:*.wav=00;36:*.oga=00;36:*.opus=00;36:*.spx=00;36:*.xspf=00;36:';
|
||||||
|
|
||||||
|
# ----[Source bashrc and start X]----
|
||||||
[[ -f ~/.bashrc ]] && . ~/.bashrc
|
[[ -f ~/.bashrc ]] && . ~/.bashrc
|
||||||
|
|
||||||
if [[ ! $DISPLAY && $XDG_VTNR -eq 1 ]]; then
|
if [[ ! $DISPLAY && $XDG_VTNR -eq 1 ]]; then
|
||||||
|
|
64
.bashrc
64
.bashrc
|
@ -2,26 +2,48 @@
|
||||||
# ~/.bashrc
|
# ~/.bashrc
|
||||||
#
|
#
|
||||||
|
|
||||||
|
# ----[Bootstrapping Stuff]----
|
||||||
# If not running interactively, don't do anything
|
# If not running interactively, don't do anything
|
||||||
[[ $- != *i* ]] && return
|
[[ $- != *i* ]] && return
|
||||||
|
|
||||||
stty -ixon # Disable ctrl-s/ctrl-q
|
# Disable ctrl-s/ctrl-q
|
||||||
|
stty -ixon
|
||||||
|
|
||||||
HISTSIZE= HISTFILESIZE= # Infinite history
|
# Infinite history
|
||||||
|
HISTSIZE= HISTFILESIZE=
|
||||||
alias ls='ls --color=auto --group-directories-first'
|
|
||||||
alias grep='grep --color=auto'
|
|
||||||
alias diff='diff --color=auto'
|
|
||||||
|
|
||||||
|
# TODO: Idk?
|
||||||
# [ -n "$XTERM_VERSION" ] && transset-df --id "$WINDOWID" > /dev/null
|
# [ -n "$XTERM_VERSION" ] && transset-df --id "$WINDOWID" > /dev/null
|
||||||
|
|
||||||
|
# ----[Aliases]----
|
||||||
|
# TODO: Move to .bash_aliases?
|
||||||
|
alias diff='diff --color=auto'
|
||||||
|
alias grep='grep --color=auto'
|
||||||
|
alias ls='ls --color=auto --group-directories-first'
|
||||||
|
# TODO: Does this go here?
|
||||||
|
alias make="make -j$(nproc)"
|
||||||
|
alias rm="rm -I"
|
||||||
|
alias sl="sl | lolcat"
|
||||||
|
alias vim="nvim"
|
||||||
|
|
||||||
|
# ----[Macros]----
|
||||||
|
alias clean_packages="sudo pacman -Rsn $(pacman -Qdtq)"
|
||||||
|
alias creationdate="stat -c '%w'"
|
||||||
|
alias fixdirectories='find . -type d -exec chmod 755 {} \;'
|
||||||
|
alias fixfiles='find . -type f -exec chmod 644 {} \;'
|
||||||
|
alias reload_wallpaper="xwallpaper --stretch .config/wallpaper.png"
|
||||||
|
alias stealyt='youtube-dl "`xclip -o | sed s/\&.*$//`"'
|
||||||
|
|
||||||
|
# ----[Docker Machine and PS1]----
|
||||||
source /usr/share/bash-completion/completions/docker-machine-prompt
|
source /usr/share/bash-completion/completions/docker-machine-prompt
|
||||||
source /usr/share/bash-completion/completions/docker-machine-wrapper
|
source /usr/share/bash-completion/completions/docker-machine-wrapper
|
||||||
|
|
||||||
#PS1='[\e[0;32m\u@\h \W\e[m] $(__docker_machine_ps1 " [%s]")\$ '
|
|
||||||
PS1='[\u@\h \W] $(__docker_machine_ps1 " [%s]")\$ '
|
PS1='[\u@\h \W] $(__docker_machine_ps1 " [%s]")\$ '
|
||||||
|
# PS1='[\e[0;32m\u@\h \W\e[m] $(__docker_machine_ps1 " [%s]")\$ '
|
||||||
|
# PS1='[\u@\h \W]\$ '
|
||||||
# PS1='[\u@cock-and-ball-torture-(_)_)----D~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ \W] $(__docker_machine_ps1 " [%s]")\$ '
|
# PS1='[\u@cock-and-ball-torture-(_)_)----D~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ \W] $(__docker_machine_ps1 " [%s]")\$ '
|
||||||
|
|
||||||
|
# ----[SSH Agent]----
|
||||||
if ! pgrep -u "$USER" ssh-agent > /dev/null; then
|
if ! pgrep -u "$USER" ssh-agent > /dev/null; then
|
||||||
ssh-agent > "$XDG_RUNTIME_DIR/ssh-agent.env"
|
ssh-agent > "$XDG_RUNTIME_DIR/ssh-agent.env"
|
||||||
fi
|
fi
|
||||||
|
@ -29,37 +51,17 @@ if [[ ! "$SSH_AUTH_SOCK" ]]; then
|
||||||
eval "$(<"$XDG_RUNTIME_DIR/ssh-agent.env")"
|
eval "$(<"$XDG_RUNTIME_DIR/ssh-agent.env")"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
alias vim="nvim"
|
# ----[Zoom Bullshit]----
|
||||||
alias sl="sl | lolcat"
|
|
||||||
alias reload_wallpaper="xwallpaper --stretch .config/wallpaper.png"
|
|
||||||
alias clean_packages="sudo pacman -Rsn $(pacman -Qdtq)"
|
|
||||||
|
|
||||||
function zoomer {
|
function zoomer {
|
||||||
echo $1
|
echo $1
|
||||||
xdg-open "zoommtg://zoom.us/join?action=join&confno=$1&zc=2&pwd=$2"
|
xdg-open "zoommtg://zoom.us/join?action=join&confno=$1&zc=2&pwd=$2"
|
||||||
}
|
}
|
||||||
|
|
||||||
# alias kepuska="zoomer 8464845351"
|
# ----[Weather]----
|
||||||
alias kepuska="zoomer 95949273670"
|
|
||||||
alias hum="zoomer 98445205966"
|
|
||||||
alias osdev="zoomer 99279196522"
|
|
||||||
#alias junior="zoomer 82351096705 MDhwUXBrWU5MbXBxVVlEZlF3NTB2UT09"
|
|
||||||
alias protocol="zoomer 91261928071 OWNWWXAyeEROdmN4Nng1dXQrT21ZUT09"
|
|
||||||
|
|
||||||
alias make="make -j12"
|
|
||||||
alias rm="rm -I"
|
|
||||||
|
|
||||||
alias weather="curl wttr.in"
|
alias weather="curl wttr.in"
|
||||||
# alias radar="wget https://www.weather.gov/images/mlb/88d/KMLB_radar_loop.gif -O/tmp/radar.gif; mpv --no-osc /tmp/radar.gif"
|
# alias radar="wget https://www.weather.gov/images/mlb/88d/KMLB_radar_loop.gif -O/tmp/radar.gif; mpv --no-osc /tmp/radar.gif"
|
||||||
alias radar="wget https://www.weather.gov/images/mlb/88d/KMLB_radar_loop.gif -O- | mpv --no-osc --loop=yes -"
|
alias radar="wget https://www.weather.gov/images/mlb/88d/KMLB_radar_loop.gif -O- | mpv --no-osc --loop=yes -"
|
||||||
|
|
||||||
alias fixdirectories='find . -type d -exec chmod 755 {} \;'
|
# ----[Memes]----
|
||||||
alias fixfiles='find . -type f -exec chmod 644 {} \;'
|
|
||||||
|
|
||||||
alias creationdate="stat -c '%w'"
|
|
||||||
|
|
||||||
alias thonkstream="ffmpeg -i thonksphere.gif -r 200 -filter_complex loop=loop=-1:size=200 -pix_fmt yuv420p -f v4l2 -s 1920x1080 /dev/video50"
|
alias thonkstream="ffmpeg -i thonksphere.gif -r 200 -filter_complex loop=loop=-1:size=200 -pix_fmt yuv420p -f v4l2 -s 1920x1080 /dev/video50"
|
||||||
|
alias record_audio="ffmpeg -f alsa -ac 2 -i default out.mp3"
|
||||||
alias stealyt='youtube-dl "`xclip -o | sed s/\&.*$//`"'
|
|
||||||
|
|
||||||
# sl
|
|
||||||
|
|
17
.gitignore
vendored
Normal file
17
.gitignore
vendored
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
*
|
||||||
|
|
||||||
|
# This file
|
||||||
|
!.gitignore
|
||||||
|
|
||||||
|
# Bash
|
||||||
|
!.bashrc
|
||||||
|
!.bash_profile
|
||||||
|
!.bash_logout
|
||||||
|
|
||||||
|
# XOrg
|
||||||
|
!.xinitrc
|
||||||
|
!.xprofile
|
||||||
|
!.Xresources
|
||||||
|
|
||||||
|
# Vim
|
||||||
|
!.vimrc
|
50
.vimrc
50
.vimrc
|
@ -1,16 +1,8 @@
|
||||||
set nocompatible
|
set nocompatible
|
||||||
filetype off
|
filetype off
|
||||||
|
|
||||||
" Vundle shit
|
" ----[Plugins]----
|
||||||
"set rtp+=~/.vim/bundle/Vundle.vim
|
call plug#begin()
|
||||||
"call vundle#begin()
|
|
||||||
|
|
||||||
"Plugin 'VundleVim/Vundle.vim'
|
|
||||||
"Plugin 'https://github.com/ycm-core/YouCompleteMe.git'
|
|
||||||
|
|
||||||
"call vundle#end() " required
|
|
||||||
|
|
||||||
call plug#begin('~/.vim/plugged')
|
|
||||||
|
|
||||||
Plug 'ms-jpq/coq_nvim', {'branch': 'coq'}
|
Plug 'ms-jpq/coq_nvim', {'branch': 'coq'}
|
||||||
|
|
||||||
|
@ -20,12 +12,7 @@ Plug 'ms-jpq/coq.thirdparty', {'branch': '3p'}
|
||||||
|
|
||||||
call plug#end()
|
call plug#end()
|
||||||
|
|
||||||
" Indents
|
" ----[Look and Feel]----
|
||||||
filetype plugin indent on " required
|
|
||||||
set tabstop=4
|
|
||||||
set shiftwidth=4
|
|
||||||
set softtabstop=4 expandtab
|
|
||||||
|
|
||||||
" Syntax hilighting and line numbers
|
" Syntax hilighting and line numbers
|
||||||
syntax on
|
syntax on
|
||||||
set encoding=utf-8
|
set encoding=utf-8
|
||||||
|
@ -34,26 +21,47 @@ set number relativenumber
|
||||||
set wildmode=longest,list,full
|
set wildmode=longest,list,full
|
||||||
autocmd FileType * setlocal formatoptions-=c formatoptions-=r formatoptions-=o
|
autocmd FileType * setlocal formatoptions-=c formatoptions-=r formatoptions-=o
|
||||||
|
|
||||||
nnoremap S :%s//g<Left><Left>
|
" Indents
|
||||||
|
filetype plugin indent on
|
||||||
|
|
||||||
|
" Tabbing
|
||||||
|
set tabstop=4
|
||||||
|
set shiftwidth=4
|
||||||
|
set softtabstop=4 expandtab
|
||||||
|
|
||||||
" Splits below and right
|
" Splits below and right
|
||||||
set splitbelow splitright
|
set splitbelow splitright
|
||||||
|
|
||||||
|
" Block cursor
|
||||||
|
set guicursor=i:block
|
||||||
|
|
||||||
|
" ----[File Specific Stuff]----
|
||||||
|
" yml
|
||||||
|
autocmd FileType yaml setlocal ts=2 sts=2 sw=2 expandtab
|
||||||
|
autocmd FileType yml setlocal ts=2 sts=2 sw=2 expandtab
|
||||||
|
|
||||||
|
" ----[Macros]----
|
||||||
|
" Find and replace macro
|
||||||
|
nnoremap S :%s//g<Left><Left>
|
||||||
|
|
||||||
" Copy paste
|
" Copy paste
|
||||||
vnoremap <C-c> "+y
|
vnoremap <C-c> "+y
|
||||||
map <C-p> "+P
|
map <C-p> "+P
|
||||||
|
|
||||||
" Get rid of extra whitespace
|
|
||||||
autocmd BufWritePre * %s/\s\+$//e
|
|
||||||
|
|
||||||
" Markers
|
" Markers
|
||||||
inoremap <leader><leader> <Esc>/<++><Enter>"_c4l
|
inoremap <leader><leader> <Esc>/<++><Enter>"_c4l
|
||||||
vnoremap <leader><leader> <Esc>/<++><Enter>"_c4l
|
vnoremap <leader><leader> <Esc>/<++><Enter>"_c4l
|
||||||
map <leader><leader> <Esc>/<++><Enter>"_c4l
|
map <leader><leader> <Esc>/<++><Enter>"_c4l
|
||||||
|
|
||||||
command W :execute ':silent w !sudo tee % > /dev/null' | :edit!
|
" sudo write, TODO: make this not fuck things up
|
||||||
|
" command W :execute ':silent w !sudo tee % > /dev/null' | :edit!
|
||||||
|
|
||||||
|
" ----[Pre / Post Write]----
|
||||||
|
" Get rid of extra whitespace
|
||||||
|
autocmd BufWritePre * %s/\s\+$//e
|
||||||
|
|
||||||
" Run xrdb when Xresources or Xdefaults are changed
|
" Run xrdb when Xresources or Xdefaults are changed
|
||||||
autocmd BufWritePost *Xresources,*Xdefaults !xrdb %
|
autocmd BufWritePost *Xresources,*Xdefaults !xrdb %
|
||||||
|
|
||||||
" Reload sxhkd when config is edited
|
" Reload sxhkd when config is edited
|
||||||
autocmd BufWritePost sxhkdrc :silent !pkill sxhkd; sxhkd &
|
autocmd BufWritePost sxhkdrc :silent !pkill sxhkd; sxhkd &
|
||||||
|
|
11
.xprofile
11
.xprofile
|
@ -5,13 +5,4 @@ export QT_QPA_PLATFORMTHEME=qt5ct
|
||||||
xset r rate 200 150 &
|
xset r rate 200 150 &
|
||||||
|
|
||||||
.screenlayout/default.sh
|
.screenlayout/default.sh
|
||||||
xwallpaper --stretch .config/wallpaper.png
|
xwallpaper --zoom $HOME/.config/wallpaper.png
|
||||||
|
|
||||||
xcompmgr &
|
|
||||||
dunst &
|
|
||||||
sxhkd &
|
|
||||||
|
|
||||||
# TODO: Move this shit
|
|
||||||
keepassxc &
|
|
||||||
gnome-keyring-daemon &
|
|
||||||
lxqt-policykit-agent &
|
|
||||||
|
|
Loading…
Reference in a new issue