diff --git a/.gitignore b/.gitignore index 6b9b2b9..950921c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,9 @@ # nvim folders /config/nvim/*/ # tmux plugins -/rc/tmux/tmux +/rc/tmux/tmux/plugins -#nextcloud stuff +#nextcloud sync stuff /._sync* /.owncloud* diff --git a/config/aliases b/config/aliases index 6a94556..cba3be4 100644 --- a/config/aliases +++ b/config/aliases @@ -1,4 +1,3 @@ - # # aliases # @@ -6,12 +5,14 @@ alias setclip='xclip -selection c' alias getclip='xclip -selection clipboard -o' alias open='xdg-open $1' +alias v='nvim' alias vi='nvim' alias vim='nvim' alias l="ls -lFh" alias la="ls -lAFh" alias ll="ls -l" +alias l1="ls -1" alias ls='ls --color=auto' alias j="jump" @@ -21,13 +22,21 @@ alias zshrc="nvim ~/.zshrc" alias bashrc="nvim ~/.bashrc" alias aliases="nvim ~/.config/aliases" alias nviminit="nvim ~/.config/nvim/init.vim" +alias termiteconf="nvim ~/.config/termite/config" alias i3conf="nvim ~/.i3/config" alias bspwmconf="nvim ~/.config/bspwm/bspwmrc" alias sxhkdconf="nvim ~/.config/sxhkd/sxhkdrc" alias tmuxconf="nvim ~/.tmux.conf" +# reload .Xreseources +alias xres="xrdb ~/.Xresources" + +# General commands +alias -g gp='| grep -i' +alias pwd='echo $PWD' + # Git aliases -alias gs="git status" +alias gst="git status" alias gd="git diff" alias gdh="git diff HEAD" alias gc="git clone $1 $2" @@ -46,13 +55,17 @@ alias gcp="git cherry-pick $1" #alias nrb="npm run build"; #alias nrt="npm run test"; -alias xres="xrdb ~/.Xresources" - # Pacman alias pacman="pacman --color=auto $@" -alias pm="pacman $@" -alias pms="pacman -Ss $@" +alias pm='pacman "$@"' +alias pms='pacman -Ss "$@"' +alias pmsi='pacman -Sii "$@"' +alias pmq='pacman -Qs "$@"' +alias pmqi='pacman -Qi "$@"' alias pmi="sudo pacman -S --color=auto $@" +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 $@" diff --git a/config/nvim/init.vim b/config/nvim/init.vim index 19b38e3..aeb4ac6 100644 --- a/config/nvim/init.vim +++ b/config/nvim/init.vim @@ -5,12 +5,11 @@ " Plugins call plug#begin('~/.config/nvim/plugged') -Plug 'vim-airline/vim-airline' " fancy statusline -Plug 'vim-airline/vim-airline-themes' " themes for vim-airline +Plug 'NLKNguyen/papercolor-theme' " PaperColor Theme (old: [vim-colors-solarized]) +Plug 'itchyny/lightline.vim' Plug 'scrooloose/nerdtree' " file tree browser Plug 'ctrlpvim/ctrlp.vim' " fuzzy file finder Plug 'bronson/vim-trailing-whitespace' -Plug 'altercation/vim-colors-solarized' Plug 'ryanoasis/vim-devicons' " awesome icons Plug 'tiagofumo/vim-nerdtree-syntax-highlight' Plug 'ashisha/image.vim' " Display images in vim @@ -40,21 +39,22 @@ Plug 'lervag/vimtex' call plug#end() + " Theme syntax enable -"set background=dark -colorscheme solarized +colorscheme PaperColor -if has('gui_running') +" set dark/light background based on time +if (strftime("%H") < 20 && strftime("%H") > 7 ) set background=light else set background=dark endif - -" Enable snipMate compatibility feature. -"let g:neosnippet#enable_snipmate_compatibility = 1 -"let g:neosnippet#snippets_directory='~/.vim/bundle/vim-snippets/snippets' +" always light background if gui is running +if has('gui_running') + set background=light +endif "deoplete settings let g:deoplete#enable_at_startup = 1 @@ -103,15 +103,16 @@ endif " toggle gundo nnoremap u :MundoToggle -" Toggle number lines -map :set number!:set relativenumber! +" general set relativenumber set number - set history=200 "set Ex command history 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 + " enable global undo set undofile @@ -170,8 +171,8 @@ nnoremap j gj nnoremap k gk " fast movement -nnoremap J 5j -nnoremap K 5k +map J 5j +map K 5k " cursor to begin or end of line nnoremap B ^ @@ -181,9 +182,11 @@ nnoremap E $ vmap < >gv -" Faster delete. Doesnt work actually -inoremap db -inoremap dw +" Faster delete. +nmap +nmap db +nmap dw +imap dwi " turn off last search highlight map :noh @@ -194,22 +197,28 @@ nnoremap gV `[v`] " jk is escape inoremap jk -call togglebg#map("") "Toggle background dark/light -map :IndentLinesToggle +" Toggle background dark/light +map :let &background = ( &background == "dark"? "light" : "dark" ) +" Toggle number lines +map :set number!:set relativenumber! +" Toggle | for indent lines +map :IndentLinesToggle -" vim-airline +" lightline +let g:lightline = { 'colorscheme': 'PaperColor' } -let g:airline_theme='badwolf' -let g:airline_left_sep = '' -let g:airline_left_alt_sep = '' -let g:airline_right_sep = '' -let g:airline_right_alt_sep = '' -let g:airline_symbols_branch = '' -let g:airline_symbols_readonly = '' -let g:airline_symbols_linenr = '' -let g:airline_powerline_fonts = 1 "required for devicons +" vim-airline (old, now using lightline) +"let g:airline_theme='papercolor' +"let g:airline_left_sep = '' +"let g:airline_left_alt_sep = '' +"let g:airline_right_sep = '' +"let g:airline_right_alt_sep = '' +"let g:airline_symbols_branch = '' +"let g:airline_symbols_readonly = '' +"let g:airline_symbols_linenr = '' +"let g:airline_powerline_fonts = 1 "required for devicons " Enable Airline Tabbar -let g:airline#extensions#tabline#enabled = 1 +"let g:airline#extensions#tabline#enabled = 1 set encoding=utf8 set guifont=DroidSansMonoForPowerline\ Nerd\ Font diff --git a/config/termite/config b/config/termite/config new file mode 100644 index 0000000..e613b2f --- /dev/null +++ b/config/termite/config @@ -0,0 +1,79 @@ +[options] +allow_bold = true +clickable_url = true +dynamic_title = true + +font = Monospace 16 +font = Roboto-Medium 11 +font = DejaVuSansMono 11 +font = Roboto Mono Light for Powerline 11 +font = DejaVu Sans Mono for Powerline 11 +font = Roboto Mono for Powerline 11 + +#geometry = 640x480 +#icon_name = terminal +scroll_on_output = false +scroll_on_keystroke = true + +# "system", "on" or "off" +cursor_blink = system # system, on, off +cursor_shape = block # block, ibeam, underline + +# set size hints for the window +#size_hints = false + +# "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 + + + +[hints] +#font = Monospace 12 +#foreground = #dcdccc +#background = #3f3f3f +#active_foreground = #e68080 +#active_background = #3f3f3f +#padding = 2 +#border = #3f3f3f +#border_width = 0.5 +#roundness = 2.0 + +# vim: ft=dosini cms=#%s + + diff --git a/config/termite/light.config b/config/termite/light.config new file mode 100644 index 0000000..23f22b2 --- /dev/null +++ b/config/termite/light.config @@ -0,0 +1,77 @@ +[options] +allow_bold = true +clickable_url = true +dynamic_title = true + +font = Monospace 16 +font = Roboto-Medium 11 +font = DejaVuSansMono 11 +font = Roboto Mono Light for Powerline 11 +font = DejaVu Sans Mono for Powerline 11 +font = Roboto Mono for Powerline 11 + +#geometry = 640x480 +#icon_name = terminal +scroll_on_output = false +scroll_on_keystroke = true + +# "system", "on" or "off" +cursor_blink = system # system, on, off +cursor_shape = block # block, ibeam, underline + +# set size hints for the window +#size_hints = false + +# "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 + +# 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] +#font = Monospace 12 +#foreground = #dcdccc +#background = #3f3f3f +#active_foreground = #e68080 +#active_background = #3f3f3f +#padding = 2 +#border = #3f3f3f +#border_width = 0.5 +#roundness = 2.0 + +# vim: ft=dosini cms=#%s + + diff --git a/config/tilda/config_0 b/config/tilda/config_0 new file mode 100644 index 0000000..aeda2ea --- /dev/null +++ b/config/tilda/config_0 @@ -0,0 +1,106 @@ +tilda_config_version="1.4.1" +command="tmux new-session -As tilda" +font="Monospace 11" +key="grave" +addtab_key="t" +fullscreen_key="F11" +toggle_transparency_key="F12" +toggle_searchbar_key="f" +closetab_key="w" +nexttab_key="Page_Down" +prevtab_key="Page_Up" +movetableft_key="Page_Up" +movetabright_key="Page_Down" +gototab_1_key="1" +gototab_2_key="2" +gototab_3_key="3" +gototab_4_key="4" +gototab_5_key="5" +gototab_6_key="6" +gototab_7_key="7" +gototab_8_key="8" +gototab_9_key="9" +gototab_10_key="0" +copy_key="c" +paste_key="v" +quit_key="q" +title="Tilda" +background_color="white" +# working_dir="" +web_browser="xdg-open" +increase_font_size_key="equal" +decrease_font_size_key="minus" +normalize_font_size_key="0" +# show_on_monitor="" +word_chars="-A-Za-z0-9,./?%&#:_" +lines=5000 +max_width=1920 +max_height=333 +min_width=1 +min_height=1 +x_pos=0 +y_pos=27 +tab_pos=0 +expand_tabs=false +show_single_tab=false +backspace_key=0 +delete_key=1 +d_set_title=3 +command_exit=1 +scheme=0 +slide_sleep_usec=5000 +animation_orientation=0 +timer_resolution=200 +auto_hide_time=0 +on_last_terminal_exit=0 +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 +back_red=61166 +back_green=61166 +back_blue=61166 +text_red=19789 +text_green=19789 +text_blue=19532 +cursor_red=21845 +cursor_green=22359 +cursor_blue=21331 +scroll_history_infinite=false +scroll_on_output=false +notebook_border=false +antialias=true +scrollbar=false +grab_focus=true +above=true +notaskbar=true +bold=true +blinks=true +scroll_on_key=true +bell=true +run_command=true +pinned=true +animation=true +hidden=true +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 +inherit_working_dir=true +command_login_shell=false +start_fullscreen=false +confirm_close_tab=false +# image="" +# scroll_background=false +# use_image=false +transparency=0 +back_alpha=58975 diff --git a/config/tilda/config_1 b/config/tilda/config_1 new file mode 100644 index 0000000..c592725 --- /dev/null +++ b/config/tilda/config_1 @@ -0,0 +1,106 @@ +tilda_config_version="1.4.1" +command="tmux new-session -As tilda" +font="Monospace 11" +key="grave" +addtab_key="t" +fullscreen_key="F11" +toggle_transparency_key="F12" +toggle_searchbar_key="f" +closetab_key="w" +nexttab_key="Page_Down" +prevtab_key="Page_Up" +movetableft_key="Page_Up" +movetabright_key="Page_Down" +gototab_1_key="1" +gototab_2_key="2" +gototab_3_key="3" +gototab_4_key="4" +gototab_5_key="5" +gototab_6_key="6" +gototab_7_key="7" +gototab_8_key="8" +gototab_9_key="9" +gototab_10_key="0" +copy_key="c" +paste_key="v" +quit_key="q" +title="Tilda" +background_color="white" +# working_dir="" +web_browser="xdg-open" +increase_font_size_key="equal" +decrease_font_size_key="minus" +normalize_font_size_key="0" +# show_on_monitor="" +word_chars="-A-Za-z0-9,./?%&#:_" +lines=5000 +max_width=1366 +max_height=368 +min_width=1 +min_height=1 +x_pos=0 +y_pos=27 +tab_pos=0 +expand_tabs=false +show_single_tab=false +backspace_key=0 +delete_key=1 +d_set_title=3 +command_exit=1 +scheme=0 +slide_sleep_usec=5000 +animation_orientation=0 +timer_resolution=200 +auto_hide_time=0 +on_last_terminal_exit=0 +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 +back_red=61166 +back_green=61166 +back_blue=61166 +text_red=19789 +text_green=19789 +text_blue=19532 +cursor_red=21845 +cursor_green=22359 +cursor_blue=21331 +scroll_history_infinite=false +scroll_on_output=false +notebook_border=false +antialias=true +scrollbar=false +grab_focus=true +above=true +notaskbar=true +bold=true +blinks=true +scroll_on_key=true +bell=true +run_command=true +pinned=true +animation=true +hidden=true +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 +inherit_working_dir=true +command_login_shell=false +start_fullscreen=false +confirm_close_tab=false +# image="" +# scroll_background=false +# use_image=false +transparency=0 +back_alpha=58975 diff --git a/install/install.sh b/install/install.sh index a34071c..7d1fe4a 100755 --- a/install/install.sh +++ b/install/install.sh @@ -16,7 +16,6 @@ source install/link.sh echo "Configuring zsh as default shell" chsh -s $(which zsh) -source $HOME/.config/base16-shell/base16-brewer.dark.sh diff --git a/rc/Xresources b/rc/Xresources new file mode 100644 index 0000000..19b618a --- /dev/null +++ b/rc/Xresources @@ -0,0 +1,100 @@ +!!!!!!!!!!!!!!!!!! +!URxvt settings +! + +!General +URxvt.geometry: 120x28 +URxvt.secondaryScreen: true +URxvt.secondaryScroll: true +URxvt.secondaryWheel: true +URxvt.scrollBar: off +URxvt*scrollTtyOutput: false +URxvt*scrollWithBuffer: true +URxvt*scrollTtyKeypress: true +URxvt.jumpScroll: false +URxvt.saveLines: 10000 +URxvt.letterSpace: -1 +URxvt.internalBorder: 0 +URxvt*loginShell: true +URxvt.intensityStyles: false +URxvt.cursorBlink: true + + +!Fonts +#define fonts xft:DejaVuSansMono:size=11, \ + xft:PowerlineSymbols:size=11, \ + xft:DejaVu Sans Mono for Powerline:size=11, \ + xft:Roboto Mono Light for Powerline:size=11 +URxvt.font: fonts +URxvt.boldFont: fonts +URxvt.italicFont: fonts +URxvt.boldItalicFont: fonts + +! Perl stuff +URxvt.perl-ext-common: default,clipboard,url-select,keyboard-select,fullscreen,font-size,tabbedex +URxvt.url-select.launcher: firefox +URxvt.url-select.underline: true +URxvt.keysym.M-u: perl:url-select:select_next +URxvt.keysym.M-Escape: perl:keyboard-select:activate +URxvt.keysym.M-s: perl:keyboard-select:search + +!Copy to clipboard using Ctrl-Shift-c +URxvt.iso14755 : false +URxvt.clipboard.autocopy: true +URxvt.keysym.Shift-Control-V: eval:paste_clipboard +URxvt.keysym.Shift-Control-C: eval:selection_to_clipboard + +URxvt.keysym.C-plus: perl:font-size:increase +URxvt.keysym.C-underscore: perl:font-size:decrease +URxvt.keysym.C-S-Up: perl:font-size:incglobal +URxvt.keysym.C-S-Down: perl:font-size:decglobal + +!Fullscreen +URxvt.keysym.F11: perl:fullscreen:switch + + +! PaperColor Theme +URxvt.foreground: #4D4D4C +URxvt.background: #EEEEEE +! black +URxvt.color0: #EDEDED +URxvt.color8: #969694 +! red +URxvt.color1: #D7005F +URxvt.color9: #D7005F +! green +URxvt.color2: #718C00 +URxvt.color10: #718C00 +! yellow / orange +URxvt.color3: #D75F00 +URxvt.color11: #D75F00 +! blue +URxvt.color4: #4271AE +URxvt.color12: #4271AE +! magenta +URxvt.color5: #8959A8 +URxvt.color13: #8959A8 +! cyan +URxvt.color6: #3E999F +URxvt.color14: #3E999F +! white +URxvt.color7: #4D4D4C +URxvt.color15: #F5F5F5 +!!PaperColor Theme END + +!Tab colors +URxvt.tabbed.tabbar-fg: 244 +URxvt.tabbed.tabbar-bg: 234 +URxvt.tabbed.title-fg: 238 +URxvt.tabbed.title-bg: 234 +URxvt.tabbed.bell-fg: 253 +URxvt.tabbed.bell-bg: 166 +URxvt.tabbed.bell-tab-fg: 253 +URxvt.tabbed.bell-tab-bg: 244 +URxvt.tabbed.tab-fg: 249 +URxvt.tabbed.tab-bg: 238 +URxvt.tabbed.autohide: false +URxvt.keysym.Control-t: perl:tabbedex:new_tab +URxvt.keysym.M-Shift-L: perl:tabbedex:next_tab +URxvt.keysym.M-Shift-H: perl:tabbedex:prev_tab + diff --git a/rc/tmux/tmux.conf b/rc/tmux/tmux.conf index 80a87e7..7d66ad8 100644 --- a/rc/tmux/tmux.conf +++ b/rc/tmux/tmux.conf @@ -1,6 +1,9 @@ # tmux display things in 256 colors -set -g default-terminal "screen-256color" +set -g default-terminal "tmux" + +# set terminfo for termite +set -ga terminal-overrides ",xterm-termite:Tc" # set new history limit set -g history-limit 30000 @@ -89,8 +92,8 @@ unbind [ bind Escape copy-mode unbind p bind p paste-buffer -bind -t vi-copy 'v' begin-selection -bind -t vi-copy 'y' copy-selection +#bind -t vi-copy 'v' begin-selection +#bind -t vi-copy 'y' copy-selection ############################## ### Color & Style Settings ### @@ -102,6 +105,8 @@ source ~/.tmux/theme.sh ############################## ### Plugins ### ############################## +# Install +# Update # List of plugins set -g @plugin 'tmux-plugins/tpm' diff --git a/rc/tmux/tmux/theme.sh b/rc/tmux/tmux/theme.sh new file mode 100644 index 0000000..c64a341 --- /dev/null +++ b/rc/tmux/tmux/theme.sh @@ -0,0 +1,60 @@ +#### COLOUR + +tm_icon="☀" +tm_color_active=colour32 +tm_color_inactive=colour59 +tm_color_feature=colour25 +tm_color_music=colour25 +tm_active_border_color=colour25 + +# separators +tm_separator_left_bold="◀" +tm_separator_left_thin="❮" +tm_separator_right_bold="▶" +tm_separator_right_thin="❯" + +set -g status-left-length 32 +set -g status-right-length 150 +set -g status-interval 5 + + +# default statusbar colors +# set-option -g status-bg colour0 +set-option -g status-fg $tm_color_active +set-option -g status-bg default +set-option -g status-attr default + +# default window title colors +set-window-option -g window-status-fg $tm_color_inactive +set-window-option -g window-status-bg default +set -g window-status-format "#I #W" + +# active window title colors +set-window-option -g window-status-current-fg $tm_color_active +set-window-option -g window-status-current-bg default +set-window-option -g window-status-current-format "#[bold]#I #W" + +# pane border +set-option -g pane-border-fg $tm_color_inactive +set-option -g pane-active-border-fg $tm_active_border_color + +# message text +set-option -g message-bg default +set-option -g message-fg $tm_color_active + +# pane number display +set-option -g display-panes-active-colour $tm_color_active +set-option -g display-panes-colour $tm_color_inactive + +# clock +set-window-option -g clock-mode-colour $tm_color_active + +tm_tunes="#[fg=$tm_color_music]#(~/.dotfiles/scripts/tunes.sh)" +tm_battery="#(~/.dotfiles/scripts/battery.sh)" + +tm_date="#[fg=$tm_color_inactive] %R %d-%m" +tm_host="#[fg=$tm_color_feature,bold]#h" +tm_session_name="#[fg=$tm_color_feature,bold]$tm_icon #S" + +set -g status-left '#{prefix_highlight}'$tm_session_name' ' +set -g status-right "$tm_tunes$tm_battery |$tm_date $tm_host" diff --git a/rc/zshrc b/rc/zshrc index 0d51f1f..e1d2e71 100644 --- a/rc/zshrc +++ b/rc/zshrc @@ -1,33 +1,38 @@ export ZSH=/home/roman/.oh-my-zsh DEFAULT_USER="roman" -ZSH_THEME="agnoster" -COMPLETION_WAITING_DOTS="true" +ZSH_THEME="robbyrussell" #old=("agnoster") ZSH_TMUX_AUTOSTART="true" ZSH_TMUX_AUTOQUIT="true" - -plugins=(tmux jump) CASE_SENSITIVE="true" +COMPLETION_WAITING_DOTS="true" -#set dircolor to solarized-dark -eval `dircolors ~/.dotfiles/gnome-terminal/dircolors-solarized/dircolors.ansi-dark` - -#export PATH=~/bin:$PATH +# Plugin list +plugins=( + tmux + jump + systemd + docker + ptyhon + colored-man-pages + 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 # load aliases source ~/.config/aliases - -#BASE16_SHELL="$HOME/.config/base16-shell/base16-brewer.dark.sh" -#[[ -s $BASE16_SHELL ]] && source $BASE16_SHELL - -#export NVM_DIR="/home/booker/.nvm" -#[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # This loads nvm +# fix for termite VTE Terminal +if [[ $TERM == xterm-termite ]]; then + . /etc/profile.d/vte.sh + __vte_osc7 +fi # add ruby to path -PATH="$(ruby -e 'print Gem.user_dir')/bin:$PATH" - +#PATH="$(ruby -e 'print Gem.user_dir')/bin:$PATH" diff --git a/scripts/battery.sh b/scripts/battery.sh index 667ca90..19169f7 100755 --- a/scripts/battery.sh +++ b/scripts/battery.sh @@ -1,13 +1,17 @@ #!/bin/bash -STATUS="$(cat /sys/class/power_supply/BAT1/status)" -BAT="$(cat /sys/class/power_supply/BAT1/capacity)" +STATUS="/sys/class/power_supply/BAT1/status" +BAT="/sys/class/power_supply/BAT1/capacity" + +if [ ! -f "$STATUS" ] || [ ! -f "$BAT" ]; then + exit +fi OUTPUT="♥ " -if [ "$STATUS" == "charging" ] +if [ "$(cat $STATUS)" == "charging" ] then - OUTPUT=$OUTPUT"l" + OUTPUT="$OUTPUTl" fi -echo "$OUTPUT$BAT%" +echo " | $OUTPUT$(cat $BAT)%" diff --git a/scripts/bin/change_termite_colorscheme b/scripts/bin/change_termite_colorscheme new file mode 100755 index 0000000..2eb093b --- /dev/null +++ b/scripts/bin/change_termite_colorscheme @@ -0,0 +1,16 @@ +#!/bin/bash + +termite_conf=~/.config/termite + +if [ -f "$termite_conf"/light.config ]; then + mv "$termite_conf/config" "$termite_conf/dark.config" + mv "$termite_conf/light.config" "$termite_conf/config" +elif [ -f "$termite_conf"/dark.config ]; then + mv "$termite_conf/config" "$termite_conf/light.config" + mv "$termite_conf/dark.config" "$termite_conf/config" +else + echo "Error while changing colorscheme!" + return -1 +fi + +killall -USR1 termite diff --git a/scripts/bin/spotify b/scripts/bin/spotify_adfree similarity index 100% rename from scripts/bin/spotify rename to scripts/bin/spotify_adfree diff --git a/scripts/tunes.sh b/scripts/tunes.sh index 964eecf..bf2d8b3 100755 --- a/scripts/tunes.sh +++ b/scripts/tunes.sh @@ -30,10 +30,10 @@ if [ -n "$ARTIST" ] length=$((${#ARTIST} - $index + 2)) ARTIST=${ttest::-$length} fi - OUTPUT="$SYMBOL $ARTIST - $TITLE" + OUTPUT=" | $SYMBOL $ARTIST - $TITLE" if [ ${#OUTPUT} -gt 35 ] then - OUTPUT="$SYMBOL $TITLE" + OUTPUT=" | $SYMBOL $TITLE" fi else OUTPUT="" diff --git a/workarounds/inc_max_user_watches.sh b/scripts/workarounds/inc_max_user_watches.sh similarity index 100% rename from workarounds/inc_max_user_watches.sh rename to scripts/workarounds/inc_max_user_watches.sh