From bbbdafee9c0688cb9b22dc15ba9e1eef18c1045f Mon Sep 17 00:00:00 2001 From: Shubham Saini Date: Sat, 4 Jul 2020 10:12:52 +0530 Subject: re tux --- bash/.bashrc | 5 +- bin/.local/bin/fetch | 76 ---------------------------- nvim/.config/nvim/init.vim | 62 +++++++---------------- spectrwm/.config/spectrwm/spectrwm.conf | 4 +- tmux/.tmux.conf | 90 ++++++++++----------------------- 5 files changed, 54 insertions(+), 183 deletions(-) delete mode 100755 bin/.local/bin/fetch diff --git a/bash/.bashrc b/bash/.bashrc index 4f6c961..3e0bccb 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -33,7 +33,6 @@ alias f="ranger" alias weather="curl wttr.in" alias py="/usr/bin/python" alias pg="ping google.com" -alias pubip="curl ipinfo.io/ip" alias m="cmus" alias vimrc="vim $HOME/.config/nvim/init.vim" alias v="nvim" @@ -48,6 +47,10 @@ dict() { curl dict://dict.org/d:$* | less } +sip() { + curl https://ipinfo.io/$* +} + # prompt red="\e[31m" green="\e[32m" diff --git a/bin/.local/bin/fetch b/bin/.local/bin/fetch deleted file mode 100755 index 05cb71e..0000000 --- a/bin/.local/bin/fetch +++ /dev/null @@ -1,76 +0,0 @@ -#!/bin/sh -# -# ufetch-void - tiny system info for void - -## INFO - -# user is already defined -host="$(hostname)" -os='Void Linux' -kernel="$(uname -sr)" -uptime="$(uptime -p | sed 's/up //')" -packages="$(xbps-query -l | wc -l)" -shell="$(basename "$SHELL")" - -## UI DETECTION - -if [ -n "${DE}" ]; then - ui="${DE}" - uitype='DE' -elif [ -n "${WM}" ]; then - ui="${WM}" - uitype='WM' -elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then - ui="${XDG_CURRENT_DESKTOP}" - uitype='DE' -elif [ -n "${DESKTOP_SESSION}" ]; then - ui="${DESKTOP_SESSION}" - uitype='DE' -elif [ -f "${HOME}/.xinitrc" ]; then - ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)" - uitype='WM' -elif [ -f "${HOME}/.xsession" ]; then - ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)" - uitype='WM' -else - ui='unknown' - uitype='UI' -fi - -## DEFINE COLORS - -# probably don't change these -if [ -x "$(command -v tput)" ]; then - bold="$(tput bold)" - black="$(tput setaf 0)" - red="$(tput setaf 1)" - green="$(tput setaf 2)" - yellow="$(tput setaf 3)" - blue="$(tput setaf 4)" - magenta="$(tput setaf 5)" - cyan="$(tput setaf 6)" - white="$(tput setaf 7)" - reset="$(tput sgr0)" -fi - -# you can change these -lc="${reset}${bold}${green}" # labels -nc="${reset}${bold}${green}" # user and hostname -ic="${reset}" # info -c0="${reset}${bold}${green}" # first color -c1="${reset}${green}" # second color - -## OUTPUT - -cat < BujoAddnormal +imap BujoAddinsert +nmap BujoChecknormal +imap BujoCheckinsert + " deoplete let g:deoplete#enable_at_startup = 1 @@ -50,72 +56,42 @@ let g:gitgutter_sign_removed = '-' let g:gitgutter_sign_removed_first_line = '^' let g:gitgutter_sign_modified_removed = '#' -" markdown preview -let g:mkdp_auto_start = 0 -let g:mkdp_auto_close = 1 -let g:mkdp_refresh_slow = 0 -let g:mkdp_command_for_global = 0 -let g:mkdp_open_to_the_world = 0 -let g:mkdp_open_ip = '' -let g:mkdp_browser = 'firefox' -let g:mkdp_echo_preview_url = 0 -let g:mkdp_browserfunc = '' -let g:mkdp_preview_options = { - \ 'mkit': {}, - \ 'katex': {}, - \ 'uml': {}, - \ 'maid': {}, - \ 'disable_sync_scroll': 0, - \ 'sync_scroll_type': 'middle', - \ 'hide_yaml_meta': 1, - \ 'sequence_diagrams': {} - \ } -let g:mkdp_markdown_css = '' -let g:mkdp_highlight_css = '' -let g:mkdp_port = '' -let g:mkdp_page_title = '「${name}」' - " rainbow let g:rainbow_active = 1 " vim-markdown let g:vim_markdown_no_default_key_mappings=1 let g:vim_markdown_toml_frontmatter=1 -let g:vim_markdown_yaml_fromtmatter=1 +let g:vim_markdown_yaml_frontmatter=1 let g:vim_markdown_folding_disabled=1 - - -" keysound -let g:keysound_enable = 1 -let g:keysound_volume = 1000 -let g:keysound_py_version = 3 -let g:keysound_theme = 'default' +let g:vim_markdown_conceal=0 " nerdtree let g:NERDTreeWinPos = "right" -map :NERDTreeToggle -nnoremap :FZF +map :NERDTreeToggle autocmd StdinReadPre * let s:std_in=1 autocmd VimEnter * if argc() == 0 && !exists("s:std_in") | NERDTree | endif autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif -"insert centered +" insert centered autocmd InsertEnter * norm zz -"shortcut split navigation +" shortcut split navigation map h map j map k map l -"replace all using S +" replace all using S nnoremap S :%s//gI -"statusbar +" italic comments +hi Comment cterm=italic + +" statusbar scriptencoding utf-8 " statusline - let g:currentmode={ \ 'n' : 'NORMAL ', \ 'no' : 'N·OPERATOR PENDING ', diff --git a/spectrwm/.config/spectrwm/spectrwm.conf b/spectrwm/.config/spectrwm/spectrwm.conf index 5ccdd54..b4716e3 100644 --- a/spectrwm/.config/spectrwm/spectrwm.conf +++ b/spectrwm/.config/spectrwm/spectrwm.conf @@ -112,8 +112,9 @@ program[shut] = ~/.local/bin/shut program[pnext] = cmus-remote -n program[pprev] = cmus-remote -r program[pplay] = cmus-remote -u -program[notes] = st -e nvim /home/x/todo +program[notes] = st -e nvim /home/x/.cache/bujo/todo.md program[files] = st -e ranger +program[pass] = passmenu # program[search] = dmenu $dmenu_bottom -i -fn $bar_font -nb $bar_color -nf $bar_font_color -sb $bar_color_selected -sf $bar_font_color_selected # program[name_workspace] = dmenu $dmenu_bottom -p Workspace -fn $bar_font -nb $bar_color -nf $bar_font_color -sb $bar_color_selected -sf $bar_font_color_selected @@ -132,6 +133,7 @@ bind[pprev] = XF86AudioPrev bind[pplay] = XF86AudioPlay bind[notes] = MOD+n bind[files] = MOD+Shift+f +bind[pass] = MOD+Shift+p # Optional default programs that will only be validated if you override: program[screenshot_all] = ~/.local/bin/screenshot full # optional diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index fadd29e..f2c781a 100644 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -1,77 +1,43 @@ -set-option -g allow-rename off - -# remap prefix from 'C-b' to 'C-a' -unbind C-b -set-option -g prefix C-a +set -g prefix C-a +unbind-key C-b bind-key C-a send-prefix -# reload config file (change file location to your the tmux.conf you want to use) -bind r source-file ~/.tmux.conf \; display-message "config reloaded!" +# start with window 1 (instead of 0) +set -g base-index 1 -# switch panes using Alt-arrow without prefix -bind -n M-Left select-pane -L -bind -n M-Right select-pane -R -bind -n M-Up select-pane -U -bind -n M-Down select-pane -D +# start with pane 1 +set -g pane-base-index 1 -# also can use vim like movement hjkl pane traversal -bind -n M-h select-pane -L -bind -n M-j select-pane -D -bind -n M-k select-pane -U -bind -n M-l select-pane -R +# history +set -g history-limit 4096 -# in case want to use mouse +# mouse set -g mouse on -#setw -g monitor-activity on -#set -g visual-activity on - -###################### -### DESIGN CHANGES ### -###################### +# allow terminal scrolling +set-option -g terminal-overrides 'xterm*:smcup@:rmcup@' -## Status bar design -# status line -set -g status-justify left -set -g status-bg default -set -g status-fg colour12 -set -g status-interval 2 +# resizing +setw -g aggressive-resize on # window status -setw -g window-status-format " #F#I:#W#F " -setw -g window-status-current-format " #F#I:#W#F " -setw -g window-status-format "#[fg=magenta]#[bg=black] #I #[bg=cyan]#[fg=colour8] #W " -setw -g window-status-current-format "#[bg=brightmagenta]#[fg=colour8] #I #[fg=colour8]#[bg=colour14] #W " - -# Info on left (I don't have a session display for now) -set -g status-left '' - -# loud or quiet? -set-option -g visual-activity off -set-option -g visual-bell off -set-option -g visual-silence off -set-window-option -g monitor-activity off -set-option -g bell-action none - -set -g default-terminal "screen-256color" - -# The modes { -setw -g clock-mode-colour colour135 +set-option -g status-position bottom +set -g status-bg default -# } -# The statusbar { +# info on right (no session display) +set-option -g status-right "" +set-option -g status-left "" -set -g status-position bottom -set -g status-bg colour234 -set -g status-fg colour137 -#set -g status-left '#[fg=green]#($TMUX_PLUGIN_MANAGER_PATH/tmux-mem-cpu-load/tmux-mem-cpu-load --colors --powerline-right --interval 2)#[default]' -set -g status-left '' -set -g status-right '#[fg=colour233,bg=colour238] #{battery_icon} #{battery_percentage} #[fg=colour233,bg=colour241] online #{online_status} #[fg=colour233,bg=colour244] #{cpu_icon}#{cpu_percentage} #[fg=colour233,bg=colour247,bold] %a %d/%h #[fg=colour233,bg=colour250,bold] %H:%M:%S ' -set -g status-right-length 50 -set -g status-left-length 50 +# toggle status bar visibility +bind t set status -set-option -g @cpu_icon "💪" +# navigate throught windows +bind-key -n S-Left previous-window +bind-key -n S-Right next-window -setw -g window-status-current-format ' #I#[fg=colour250]:#[fg=colour255]#W#[fg=colour50]#F ' +# colors +setw -g window-status-format "#[fg=colour8]#W " +setw -g window-status-current-format "#[fg=colour6]#W " +# set -g pane-border-fg colour0 +# set -g pane-active-border-fg colour0 -setw -g window-status-format ' #I#[fg=colour237]:#[fg=colour250]#W#[fg=colour244]#F ' -- cgit v1.2.3