update dotfiles: nvim, zsh, bash improvements and other stuff
This commit is contained in:
parent
5ef18b7a9d
commit
eccd0efc00
1
.gitignore
vendored
1
.gitignore
vendored
@ -2,6 +2,7 @@
|
||||
/config/nvim/*/
|
||||
# tmux plugins
|
||||
/rc/tmux/tmux/plugins
|
||||
/rc/tmux/tmux/sidebar
|
||||
|
||||
#nextcloud sync stuff
|
||||
/._sync*
|
||||
|
@ -32,7 +32,6 @@ alias tmuxconf="nvim ~/.tmux.conf"
|
||||
alias xres="xrdb ~/.Xresources"
|
||||
|
||||
# General commands
|
||||
alias -g gp='| grep -i'
|
||||
alias pwd='echo $PWD'
|
||||
|
||||
# Git aliases
|
||||
@ -56,16 +55,22 @@ alias gcp="git cherry-pick $1"
|
||||
#alias nrt="npm run test";
|
||||
|
||||
# Pacman
|
||||
alias pacman="pacman --color=auto $@"
|
||||
alias pacman='pacman --color=auto "$@"'
|
||||
alias pm='pacman "$@"'
|
||||
alias pms='pacman -Ss "$@"'
|
||||
alias pmsi='pacman -Sii "$@"'
|
||||
alias pmq='pacman -Qs "$@"'
|
||||
alias pmqi='pacman -Qi "$@"'
|
||||
alias pmqo='pacman -Qo "$@"'
|
||||
alias pmi="sudo pacman -S --color=auto $@"
|
||||
alias pmr="sudo pacman -Rns $@"
|
||||
alias pmr='sudo pacman -Rns "$@"'
|
||||
alias pmu="sudo pacman -Syu $@"
|
||||
alias pmro='sudo pacman -Rns $(pacman -Qtdq)'
|
||||
alias pmcc='pacman -Qii | awk '\''/^MODIFIED/ {print $2}'\''' #list changed config files
|
||||
alias cower="cower --color=auto $@"
|
||||
|
||||
#ps -p "$$"
|
||||
# only for zsh
|
||||
if [[ $(ps -p "$$" | grep "zsh") ]]; then
|
||||
alias -g gp='| grep -i'
|
||||
fi
|
||||
|
0
config/bspwm/bspwmrc
Executable file → Normal file
0
config/bspwm/bspwmrc
Executable file → Normal file
0
config/lemonbar/i3_lemonbar.sh
Executable file → Normal file
0
config/lemonbar/i3_lemonbar.sh
Executable file → Normal file
0
config/lemonbar/i3_lemonbar_parser.sh
Executable file → Normal file
0
config/lemonbar/i3_lemonbar_parser.sh
Executable file → Normal file
0
config/lemonbar/i3_workspaces.py
Executable file → Normal file
0
config/lemonbar/i3_workspaces.py
Executable file → Normal file
0
config/lemonbar/lemonbar.sh
Executable file → Normal file
0
config/lemonbar/lemonbar.sh
Executable file → Normal file
@ -31,12 +31,15 @@ Plug 'simnalamburt/vim-mundo' " undo tree visualizer DOESN'
|
||||
"Plug 'junegunn/limelight.vim', { 'on': 'Limelight' } " focus tool. Dim text. Good for presentating with vim
|
||||
|
||||
"language-specific plugins
|
||||
" html
|
||||
" HTML
|
||||
Plug 'gregsexton/MatchTag' "highlight the current tag
|
||||
|
||||
" latex
|
||||
" LaTex
|
||||
Plug 'lervag/vimtex'
|
||||
|
||||
" R
|
||||
Plug 'jalvesaq/Nvim-R'
|
||||
|
||||
call plug#end()
|
||||
|
||||
|
||||
@ -111,7 +114,9 @@ set autoread " detect when a file is changed
|
||||
au FocusGained * :checktime "workaround for autoread: neovim/#1936
|
||||
set cursorline
|
||||
set mouse=a " mouse function
|
||||
set backspace=indent,eol,start " backspace multiple lines
|
||||
set backspace=indent,eol,start " backspace over multiple lines
|
||||
set ignorecase " ignore case in search
|
||||
set smartcase " switch to case-sensitive search if capital letters are used
|
||||
|
||||
|
||||
" enable global undo
|
||||
|
@ -25,42 +25,40 @@ cursor_shape = block # block, ibeam, underline
|
||||
# "off", "left" or "right"
|
||||
scrollbar = off
|
||||
|
||||
|
||||
[colors]
|
||||
|
||||
# If unset, will reverse foreground and background
|
||||
# highlight = #2f2f2f
|
||||
# special
|
||||
foreground = #ebdbb2
|
||||
foreground_bold = #ebdbb2
|
||||
cursor = #ebdbb2
|
||||
#background = #1d2021
|
||||
background = #1c1c1c
|
||||
# black
|
||||
color0 = #282828
|
||||
color8 = #928374
|
||||
# red
|
||||
color1 = #cc241d
|
||||
color9 = #fb4934
|
||||
# green
|
||||
color2 = #98971a
|
||||
color10 = #b8bb26
|
||||
# yellow
|
||||
color3 = #d79921
|
||||
color11 = #fabd2f
|
||||
# blue
|
||||
color4 = #458588
|
||||
color12 = #83a598
|
||||
# magenta
|
||||
color5 = #b16286
|
||||
color13 = #d3869b
|
||||
# cyan
|
||||
color6 = #689d6a
|
||||
color14 = #8ec07c
|
||||
# white
|
||||
color7 = #a89984
|
||||
color15 = #ebdbb2
|
||||
foreground = #4d4d4c
|
||||
foreground_bold = #4d4d4c
|
||||
cursor = #4d4d4c
|
||||
background = #eeeeee
|
||||
|
||||
# black
|
||||
color0 = #ededed
|
||||
color8 = #969694
|
||||
# red
|
||||
color1 = #d7005f
|
||||
color9 = #d7005f
|
||||
# green
|
||||
color2 = #718c00
|
||||
color10 = #718c00
|
||||
# yellow
|
||||
color3 = #d75f00
|
||||
color11 = #d75f00
|
||||
# blue
|
||||
color4 = #4271ae
|
||||
color12 = #4271ae
|
||||
# magenta
|
||||
color5 = #8959a8
|
||||
color13 = #8959a8
|
||||
# cyan
|
||||
color6 = #3e999f
|
||||
color14 = #3e999f
|
||||
# white
|
||||
color7 = #4d4d4c
|
||||
color15 = #f5f5f5
|
||||
|
||||
|
||||
[hints]
|
||||
|
@ -25,40 +25,42 @@ cursor_shape = block # block, ibeam, underline
|
||||
# "off", "left" or "right"
|
||||
scrollbar = off
|
||||
|
||||
|
||||
[colors]
|
||||
|
||||
# If unset, will reverse foreground and background
|
||||
# highlight = #2f2f2f
|
||||
# special
|
||||
foreground = #4d4d4c
|
||||
foreground_bold = #4d4d4c
|
||||
cursor = #4d4d4c
|
||||
background = #eeeeee
|
||||
|
||||
foreground = #ebdbb2
|
||||
foreground_bold = #ebdbb2
|
||||
cursor = #ebdbb2
|
||||
#background = #1d2021
|
||||
background = #1c1c1c
|
||||
# black
|
||||
color0 = #ededed
|
||||
color8 = #969694
|
||||
color0 = #282828
|
||||
color8 = #928374
|
||||
# red
|
||||
color1 = #d7005f
|
||||
color9 = #d7005f
|
||||
color1 = #cc241d
|
||||
color9 = #fb4934
|
||||
# green
|
||||
color2 = #718c00
|
||||
color10 = #718c00
|
||||
color2 = #98971a
|
||||
color10 = #b8bb26
|
||||
# yellow
|
||||
color3 = #d75f00
|
||||
color11 = #d75f00
|
||||
color3 = #d79921
|
||||
color11 = #fabd2f
|
||||
# blue
|
||||
color4 = #4271ae
|
||||
color12 = #4271ae
|
||||
color4 = #458588
|
||||
color12 = #83a598
|
||||
# magenta
|
||||
color5 = #8959a8
|
||||
color13 = #8959a8
|
||||
color5 = #b16286
|
||||
color13 = #d3869b
|
||||
# cyan
|
||||
color6 = #3e999f
|
||||
color14 = #3e999f
|
||||
color6 = #689d6a
|
||||
color14 = #8ec07c
|
||||
# white
|
||||
color7 = #4d4d4c
|
||||
color15 = #f5f5f5
|
||||
color7 = #a89984
|
||||
color15 = #ebdbb2
|
||||
|
||||
|
||||
|
||||
[hints]
|
@ -35,10 +35,10 @@ normalize_font_size_key="<Control>0"
|
||||
word_chars="-A-Za-z0-9,./?%&#:_"
|
||||
lines=5000
|
||||
max_width=1920
|
||||
max_height=333
|
||||
max_height=368
|
||||
min_width=1
|
||||
min_height=1
|
||||
x_pos=0
|
||||
x_pos=1920
|
||||
y_pos=27
|
||||
tab_pos=0
|
||||
expand_tabs=false
|
||||
@ -103,4 +103,4 @@ confirm_close_tab=false
|
||||
# scroll_background=false
|
||||
# use_image=false
|
||||
transparency=0
|
||||
back_alpha=58975
|
||||
back_alpha=61599
|
||||
|
@ -57,8 +57,6 @@ prompt_on_exit=false
|
||||
palette_scheme=0
|
||||
non_focus_pull_up_behaviour=0
|
||||
cursor_shape=0
|
||||
# show_on_monitor_number=0
|
||||
# title_max_length_flag=false
|
||||
title_max_length=103
|
||||
palette = {60909, 60909, 60909, 55255, 0, 24415, 29041, 35980, 0, 55255, 24415, 0, 16962, 29041, 44718, 35209, 22873, 43176, 15934, 39321, 40863, 19789, 19789, 19532, 38550, 38550, 38036, 55255, 0, 24415, 29041, 35980, 0, 55255, 24415, 0, 16962, 29041, 44718, 35209, 22873, 43176, 15934, 39321, 40863, 62965, 62965, 62965}
|
||||
scrollbar_pos=2
|
||||
@ -74,7 +72,6 @@ cursor_blue=21331
|
||||
scroll_history_infinite=false
|
||||
scroll_on_output=false
|
||||
notebook_border=false
|
||||
antialias=true
|
||||
scrollbar=false
|
||||
grab_focus=true
|
||||
above=true
|
||||
@ -91,7 +88,6 @@ set_as_desktop=false
|
||||
centered_horizontally=false
|
||||
centered_vertically=false
|
||||
enable_transparency=true
|
||||
# double_buffer=false
|
||||
auto_hide_on_focus_lost=true
|
||||
auto_hide_on_mouse_leave=false
|
||||
title_behaviour=2
|
||||
@ -99,8 +95,12 @@ inherit_working_dir=true
|
||||
command_login_shell=false
|
||||
start_fullscreen=false
|
||||
confirm_close_tab=false
|
||||
back_alpha=58975
|
||||
# image=""
|
||||
# show_on_monitor_number=0
|
||||
# transparency=0
|
||||
# title_max_length_flag=false
|
||||
# antialias=false
|
||||
# double_buffer=false
|
||||
# scroll_background=false
|
||||
# use_image=false
|
||||
transparency=0
|
||||
back_alpha=58975
|
||||
|
0
install/link.sh
Normal file → Executable file
0
install/link.sh
Normal file → Executable file
13
rc/bashrc
13
rc/bashrc
@ -30,19 +30,22 @@ source ~/.config/aliases
|
||||
exitstatus()
|
||||
{
|
||||
if [[ $? == 0 ]]; then
|
||||
echo ''
|
||||
#echo -e ''
|
||||
echo -e '\033[0;32m➜\033[0m '
|
||||
else
|
||||
echo '! '
|
||||
#echo -e '\033[0;31m✗ '
|
||||
echo -e '\033[0;31m➜\033[0m '
|
||||
fi
|
||||
}
|
||||
|
||||
user()
|
||||
{
|
||||
if [[ $USER == 'roman' ]]; then
|
||||
echo ''
|
||||
echo -e ''
|
||||
else
|
||||
echo '\u@\h '
|
||||
echo -e '\u@\h '
|
||||
fi
|
||||
}
|
||||
|
||||
PS1='[$(exitstatus)$(user)\w]\$ '
|
||||
#PS1='[$(exitstatus)$(user)\w]\$ '
|
||||
PS1='$(exitstatus) \[\033[1;36m\]\W\[\033[0m\] '
|
||||
|
@ -1,6 +1,6 @@
|
||||
|
||||
# tmux display things in 256 colors
|
||||
set -g default-terminal "tmux"
|
||||
#set -g default-terminal "tmux"
|
||||
|
||||
# set terminfo for termite
|
||||
set -ga terminal-overrides ",xterm-termite:Tc"
|
||||
|
11
rc/zshrc
11
rc/zshrc
@ -1,5 +1,8 @@
|
||||
export ZSH=/home/roman/.oh-my-zsh
|
||||
##################
|
||||
# ZSH Config File
|
||||
#
|
||||
|
||||
# General
|
||||
DEFAULT_USER="roman"
|
||||
ZSH_THEME="robbyrussell" #old=("agnoster")
|
||||
ZSH_TMUX_AUTOSTART="true"
|
||||
@ -18,14 +21,14 @@ plugins=(
|
||||
command-not-found # needs package pkgfile
|
||||
)
|
||||
|
||||
source $ZSH/oh-my-zsh.sh
|
||||
|
||||
# Exports
|
||||
export EDITOR="nvim"
|
||||
export PATH=~/.bin:$PATH
|
||||
export LANG=de_DE.UTF-8
|
||||
export ZSH=/home/roman/.oh-my-zsh
|
||||
|
||||
# load aliases
|
||||
# load stuff
|
||||
source $ZSH/oh-my-zsh.sh
|
||||
source ~/.config/aliases
|
||||
|
||||
# fix for termite VTE Terminal
|
||||
|
0
scripts/touchpad_enable_tapping.sh
Executable file → Normal file
0
scripts/touchpad_enable_tapping.sh
Executable file → Normal file
Loading…
x
Reference in New Issue
Block a user