Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:k3mm0tar/dotfiles

  • Loading branch information...
commit eb87e9e4c6983b92de03d28860ddba276cfae61d 2 parents fd8d2cb + c84a498
@yuriihabrusiev yuriihabrusiev authored
View
2  home/.bash_aliases
@@ -0,0 +1,2 @@
+alias g='git'
+alias gst='git status'
View
103 home/.conky/aoa
@@ -1,103 +0,0 @@
-# vim: set ft=conkyrc:
-
-alignment bottom_right
-background no
-
-draw_borders no
-draw_graph_borders yes
-draw_outline no
-draw_shades no
-
-use_xft yes
-xftfont Terminus:size=8
-
-gap_x 6
-gap_y 6
-maximum_width 200
-minimum_size 100 5
-
-update_interval 3.0
-
-top_name_width 13
-
-own_window yes
-own_window_transparent yes
-own_window_type override
-own_window_class Conky
-
-default_color 839496
-color1 cb4b16 #orange
-color2 b58900 #yellow
-color3 859900 #green
-color4 268bd2 #blue
-
-TEXT
-LINUX: $alignr${color2}$kernel
-${color2}UPTIME: $alignr$color$uptime_short
-###########
-# WLAN
-###########
-${color1}WLAN $hr
-${color2}WLAN: $color4${wireless_link_qual_perc wlan0}%$color $alignr${wireless_link_bar 4,75 wlan0}
-${wireless_essid wlan0} ${wireless_bitrate wlan0} $alignr${wireless_link_qual wlan0}/${wireless_link_qual_max wlan0}
-${color2}IP: $alignr$color4${addr wlan0}$color
-${color2}UPLOAD:
-$color${upspeed wlan0} $alignr${totalup wlan0}
-${color2}DOWNLOAD:
-$color${downspeed wlan0} $alignr${totaldown wlan0}
-###########
-# PPP
-###########
-#${color1}PPP0 $hr${if_up ppp0}
-#${color2}IP: $alignr$color${addr ppp0}
-#${color2}UPLOAD:
-#$color${upspeed ppp0} $alignr${totalup ppp0}
-#${color2}DOWNLOAD:
-#$color${downspeed ppp0} $alignr${totaldown ppp0}${else}
-#$alignc${color2}PPP0 DOWN${endif}
-###########
-# BAT
-###########
-${color1}BAT $hr
-${color2}BAT1: $color${battery_percent BAT1}% $alignr${battery_bar 4, 75 BAT1}
-${battery BAT1} ${acpiacadapter ACAD}$alignr${battery_time BAT1}
-###########
-# TOP CPU
-###########
-${color1}CPU $hr
-${color2}CPU1: $color4${cpu cpu1}%$color $alignr${cpubar cpu1 4, 75}
-${color2}CPU2: $color4${cpu cpu2}%$color $alignr${cpubar cpu2 4, 75}
-${color2}Name PID CPU% $color
- ${top name 1}$color3${top pid 1}$color4${top cpu 1}$color
- ${top name 2}$color3${top pid 2}$color4${top cpu 2}$color
- ${top name 3}$color3${top pid 3}$color4${top cpu 3}$color
- ${top name 4}$color3${top pid 4}$color4${top cpu 4}$color
-###########
-# TOP MEM
-###########
-${color1}MEM $hr
-${color2}RAM: $color4$memperc%$color $alignr${membar 4, 75}
-$alignr$color$mem/$memmax
-${color2}Name PID MEM% $color
- ${top_mem name 1}$color3${top_mem pid 1}$color4${top_mem mem 1}$color
- ${top_mem name 2}$color3${top_mem pid 2}$color4${top_mem mem 2}$color
- ${top_mem name 3}$color3${top_mem pid 3}$color4${top_mem mem 3}$color
- ${top_mem name 4}$color3${top_mem pid 4}$color4${top_mem mem 4}$color
-###########
-# FILE SYSTEMS
-###########
-${color1}FS $hr
-${color2}ROOT: $color4${fs_used_perc /}%$color $color$alignr${fs_bar 4, 75 /}
-$alignr${fs_used /}/${fs_size /}
-${if_mounted /media/SD}${color2}SDHC: $color4${fs_used_perc /media/SD}%$color $alignr${fs_bar 4, 75 /media/SD}
-$alignr${fs_used /media/SD}/${fs_size /media/SD}${else}Mount SD
-$endif
-###########
-# SWAP
-###########
-${color1}SWAP $hr
-${color2}SWAP: $color$swapperc% $alignr${swapbar 4, 75}
-$alignr$swap/$swapmax
-###########
-# TEST
-###########
View
103 home/.conky/arch-pc
@@ -1,103 +0,0 @@
-# vim: set ft=conkyrc:
-
-alignment bottom_right
-background no
-border_width 0
-cpu_avg_samples 2
-
-draw_borders no
-draw_graph_borders yes
-draw_outline no
-draw_shades no
-
-use_xft yes
-xftfont Terminus:size=8
-
-gap_x 9
-gap_y 9
-maximum_width 190
-minimum_size 111 5
-
-net_avg_samples 2
-no_buffers yes
-
-out_to_console no
-out_to_stderr no
-extra_newline no
-own_window no
-own_window_class Conky
-own_window_type desktop
-stippled_borders 0
-update_interval 3.0
-uppercase no
-use_spacer none
-show_graph_scale no
-show_graph_range no
-top_name_width 13
-
-default_color white
-default_outline_color white
-default_shade_color white
-color1 b5bd68
-color2 81a2be
-
-TEXT
-$color$uptime_short$alignr${color2}$kernel
-
-###########
-# ETH
-###########
-${color1}ETH $hr
-${color2}IP: $alignr$color${addr eth0}
-${color2}UPLOAD:
-$color${upspeed eth0} $alignr${totalup eth0}
-${color2}DOWNLOAD:
-$color${downspeed eth0} $alignr${totaldown eth0}
-
-###########
-# TOP CPU
-###########
-${color1}CPU $hr
-${color2}CPU1: $color${cpu cpu1}% $alignr${cpubar cpu1 4, 75}
-${color2}CPU2: $color${cpu cpu2}% $alignr${cpubar cpu2 4, 75}
-${color2}CPU3: $color${cpu cpu3}% $alignr${cpubar cpu3 4, 75}
-${color2}CPU4: $color${cpu cpu4}% $alignr${cpubar cpu4 4, 75}
-${color2}Name PID CPU% $color
- ${top name 1}${top pid 1}${top cpu 1}
- ${top name 2}${top pid 2}${top cpu 2}
- ${top name 3}${top pid 3}${top cpu 3}
- ${top name 4}${top pid 4}${top cpu 4}
- ${top name 5}${top pid 5}${top cpu 5}
- ${top name 6}${top pid 6}${top cpu 6}
-
-###########
-# TOP MEM
-###########
-${color1}MEM $hr
-${color2}RAM: $color$memperc% $alignr${membar 4, 75}
-$alignr$color$mem/$memmax
-${color2}Name PID MEM% $color
- ${top_mem name 1}${top_mem pid 1}${top_mem mem 1}
- ${top_mem name 2}${top_mem pid 2}${top_mem mem 2}
- ${top_mem name 3}${top_mem pid 3}${top_mem mem 3}
- ${top_mem name 4}${top_mem pid 4}${top_mem mem 4}
- ${top_mem name 5}${top_mem pid 5}${top_mem mem 5}
- ${top_mem name 6}${top_mem pid 6}${top_mem mem 6}
-
-###########
-# FILE SYSTEMS
-###########
-${color1}FS $hr
-${color2}ROOT: $color${fs_used_perc /}% $color$alignr${fs_bar 4, 75 /}
-$alignr${fs_used /}/${fs_size /}
-${color2}HOME: $color${fs_used_perc /home}% $color$alignr${fs_bar 4, 75 /home}
-$alignr${fs_used /home}/${fs_size /home}
-###########
-# SWAP
-###########
-${color1}SWAP $hr
-${color2}SWAP: $color$swapperc% $alignr${swapbar 4, 75}
-$alignr$swap/$swapmax
-###########
-# TEST
-###########
View
111 home/.conky/conky-big
@@ -1,111 +0,0 @@
-alignment bottom_right
-background no
-border_width 0
-cpu_avg_samples 2
-default_color white
-default_outline_color white
-default_shade_color white
-draw_borders no
-draw_graph_borders yes
-draw_outline no
-draw_shades no
-use_xft yes
-#xftfont DejaVu Sans Mono:size=8
-#xftfont Liberation Mono:size=8
-xftfont Terminus:size=8
-gap_x 6
-gap_y 6
-maximum_width 190
-minimum_size 100 5
-net_avg_samples 2
-no_buffers yes
-out_to_console no
-out_to_stderr no
-extra_newline no
-own_window no
-own_window_class Conky
-own_window_type desktop
-stippled_borders 0
-update_interval 3.0
-uppercase no
-use_spacer none
-show_graph_scale no
-show_graph_range no
-top_name_width 13
-color1 404040
-color2 grey
-
-# ${font DejaVu Sans:size=16}${time %H.%M}${font DejaVu Sans:size=12}$alignr${time %D}
-# $font
-# $color$uptime_short$alignr${color2}$kernel
-
-###########
-# MOC
-###########
-# ${color1}MOC $hr
-# $color$alignc$moc_curtime / $moc_timeleft / $moc_totaltime
-# $moc_artist - $moc_song
-
-# $moc_rate $moc_bitrate
-# $moc_state
-# $moc_title
-# $moc_file
-
-
-TEXT
-$color$uptime_short$alignr${color2}$kernel
-###########
-# WLAN
-###########
-${color1}WLAN $hr
-${color2}WLAN: $color${wireless_link_qual_perc wlan0}% $alignr${wireless_link_bar 4,75 wlan0}
-${wireless_essid wlan0} ${wireless_bitrate wlan0} $alignr${wireless_link_qual wlan0}/${wireless_link_qual_max wlan0}
-$alignr${addr wlan0}
-${color2}UP: $color${upspeed wlan0} ${alignr}${color2}DOWN: $color${downspeed wlan0}
-###########
-# BAT
-###########
-${color1}BAT $hr
-${color2}BAT1: $color${battery_percent BAT1}% $alignr${battery_bar 4, 75 BAT1}
-${battery_short BAT1}$alignr${battery_time BAT1}
-###########
-# TOP CPU
-###########
-${color1}CPU $hr
-${color2}CPU1: $color${cpu cpu1}% $alignr${cpubar cpu1 4, 75}
-${color2}CPU2: $color${cpu cpu2}% $alignr${cpubar cpu2 4, 75}
-${color2}Name PID CPU% $color
- ${top name 1}${top pid 1}${top cpu 1}
- ${top name 2}${top pid 2}${top cpu 2}
- ${top name 3}${top pid 3}${top cpu 3}
- ${top name 4}${top pid 4}${top cpu 4}
-###########
-# TOP MEM
-###########
-${color1}MEM $hr
-${color2}RAM: $color$memperc% $alignr${membar 4, 75}
-$alignr$color$mem/$memmax
-${color2}Name PID MEM% $color
- ${top_mem name 1}${top_mem pid 1}${top_mem mem 1}
- ${top_mem name 2}${top_mem pid 2}${top_mem mem 2}
- ${top_mem name 3}${top_mem pid 3}${top_mem mem 3}
- ${top_mem name 4}${top_mem pid 4}${top_mem mem 4}
-###########
-# FILE SYSTEMS
-###########
-${color1}FS $hr
-${color2}ROOT: $color${fs_used_perc /}% $color$alignr${fs_bar 4, 75 /}
-$alignr${fs_used /}/${fs_size /}
-
-${if_mounted /media/SD}${color2}SDHC: $color${fs_used_perc /media/SD}% $alignr${fs_bar 4, 75 /media/SD}
-$alignr${fs_used /media/SD}/${fs_size /media/SD}${else}Mount SD
-$endif
-###########
-# SWAP
-###########
-${color1}SWAP $hr
-${color2}SWAP: $color$swapperc% $alignr${swapbar 4, 75}
-$alignr$swap/$swapmax
-###########
-# TEST
-###########
View
15 home/.conky/statusbar
@@ -1,15 +0,0 @@
-# vim: set ft=conkyrc:
-
-out_to_console yes
-out_to_x no
-background no
-update_interval 2
-total_run_times 0
-use_spacer none
-
-TEXT
-[CPU ${cpu}%] \
-[MEM ${memperc}%] \
-[BAT ${battery_percent BAT1}%] \
-[VOL ${execi 10 ~/sh/conky-volume.sh} ] \
-${time %a %d %b %H:%M}
View
105 home/.conky/wallmon-laptop
@@ -1,105 +0,0 @@
-# vim: set ft=conkyrc:
-
-alignment top_left
-background no
-border_width 0
-cpu_avg_samples 2
-
-default_color white
-default_outline_color white
-default_shade_color white
-
-draw_borders no
-draw_graph_borders yes
-draw_outline no
-draw_shades no
-
-use_xft yes
-xftfont Terminus:size=8
-
-gap_x 480
-gap_y 187
-maximum_width 328
-minimum_size 326 5
-
-net_avg_samples 2
-no_buffers yes
-out_to_console no
-out_to_stderr no
-extra_newline no
-own_window no
-own_window_class Conky
-own_window_type desktop
-stippled_borders 0
-update_interval 3.0
-uppercase no
-use_spacer none
-show_graph_scale no
-show_graph_range no
-top_name_width 13
-
-color1 grey
-
-TEXT
-${color1}Uptime: $alignr$color$uptime_short
-#${color1}Load: $alignr$color$loadavg
-${color1}Kernel: $alignr$color Linux $kernel
-
-###########
-# CPU
-###########
-${color1}CPU1: $alignr$color${cpu cpu1}% $color1${cpubar cpu1 4, 75}
-${color1}CPU2: $alignr$color${cpu cpu2}% $color1${cpubar cpu2 4, 75}
-
-###########
-# MEM
-###########
-${color1}RAM:$alignr $color$mem/$memmax $memperc% $color1${membar 4, 75}
-###########
-# SWAP
-###########
-${color1}SWAP:$alignr $color$swap/$swapmax $swapperc% $color1${swapbar 4, 75}
-
-###########
-# FILE SYSTEMS
-###########
-${color1}ROOT:$alignr $color${fs_used /}/${fs_size /} ${fs_used_perc /}% $color1${fs_bar 4, 75 /}
-${color1}HOME:$alignr $color${fs_used /home}/${fs_size /home} ${fs_used_perc /home}% $color1${fs_bar 4, 75 /home}
-
-###########
-# BAT
-###########
-${color1}BAT:$alignr $color${battery_time BAT0} ${battery BAT0} ${color1}${battery_bar 4, 75 BAT0}
-
-###########
-# NET
-###########
-${if_up ppp0}Interface: $alignr${color}PPP0
-${color1}Upload: $alignr$color${upspeed ppp0} $color1 Total: $color${totalup ppp0}
-${color1}Download: $alignr$color${downspeed ppp0} $color1 Total: $color${totaldown ppp0}
-${color1}IP: $alignr$color${addr ppp0}
-${endif}
-
-###########
-# TEST
-###########
-#МЕРЕЖА
-#${if_up eth0}
-#Передача: ${upspeed eth0} ${upspeedgraph eth0 8,60 CD646B F56F6E}
-#Всього: ${totalup eth0}
-#Прийом: ${downspeed eth0} ${downspeedgraph eth0 8,60 CD646B F56F6E}
-#Всього: ${totaldown eth0}
-#Локальна IP: ${alignr}${addr eth0}
-##Публічна IP: ${alignr}${color2}${execi 10800 ~/.config/conky/conf.sh -ip}${color}
-## |--WLAN0
-#${else}${if_up wlan0}
-#${voffset -13}${color0}${font VariShapes Solid:size=14}q${font}${color}${goto 32}${voffset -6}Envío: ${font Droid Sans:style=Bold:size=8}${color1}${upspeed wlan0}${color}${font} ${alignr}${color2}${upspeedgraph wlan0 8,60 CD646B F56F6E}${color}
-#${goto 32}Total: ${font Droid Sans:style=Bold:size=8}${color2}${totalup wlan0}${color}${font}
-#${voffset -2}${color0}${font VariShapes Solid:size=14}Q${font}${color}${goto 32}${voffset -6}Recibo: ${font Droid Sans:style=Bold:size=8}${color1}${downspeed wlan0}${color}${font} ${alignr}${color2}${downspeedgraph wlan0 8,60 CD646B F56F6E}${color}
-#${goto 32}Total: ${font Droid Sans:style=Bold:size=8}${color2}${totaldown wlan0}${color}${font}
-#${voffset -2}${color0}${font Poky:size=14}Y${font}${color}${goto 32} ${voffset -2}Señal: ${font Droid Sans:style=Bold:size=8}${color1}${wireless_link_qual wlan0}%${color}${font} ${alignr}${color2}${wireless_link_bar 8,60 wlan0}${color}
-#${voffset 4}${color0}${font Poky:size=13}w${font}${color}${goto 32}${voffset -8}Ip Local: ${alignr}${color2}${addr wlan0}${color}
-#${goto 32}Ip Pública: ${alignr}${color2}${execi 10800 /home/dinlinux/.conkycolors/bin/conkyIp}${color}
-# |--PPP0
-#${else}${if_up ppp0}
-#${else}NO NET${endif}${endif}${endif}
View
11 home/.pryrc
@@ -1,9 +1,8 @@
Pry.config.editor = "vim"
-#Pry.prompt = [
-# proc { |obj, nest_level| "#{RUBY_VERSION} #{Pry.config.prompt_name} (#{obj}):#{nest_level} > " },
-# proc { |obj, nest_level| "#{RUBY_VERSION} #{Pry.config.prompt_name} (#{obj}):#{nest_level} * " }
-#]
-
-#Pry.config.prompt_name = File.basename(Dir.pwd)
+Pry.config.prompt_name = File.basename(Dir.pwd)
+Pry.prompt = [
+ Proc.new { |obj, nest_level, _| "#{Pry.config.prompt_name} (#{obj}):#{nest_level} > " },
+ Proc.new { |obj, nest_level, _| "#{Pry.config.prompt_name} (#{obj}):#{nest_level} * " }
+]
View
48 home/.tmux.conf
@@ -3,12 +3,16 @@ setw -g mode-keys vi
setw -g xterm-keys on
unbind C-b
-set -g prefix C-a
-bind-key a send-prefix
+set -g prefix C-j
+bind-key C-j send-prefix
# ctrl+left/right cycles thru windows
+bind-key -n M-left prev
bind-key -n M-right next
-bind-key -n M-left prev
+
+# Split window
+# bind-key s split-window -h
+# bind-key S split-window -v
set -g mode-mouse on
set -g mouse-resize-pane on
@@ -20,7 +24,7 @@ bind-key r source-file ~/.tmux.conf \; display-message "Configuration reloaded"
set -g base-index 1
set -g set-titles on
-set -g set-titles-string "tmux"
+set -g set-titles-string "#H - #S - tmux"
set -g default-terminal screen-256color
@@ -34,37 +38,41 @@ set -g status-bg default
set -g status-justify centre
-set -g status-left ' #S '
-set -g status-left-fg black
-set -g status-left-bg white
+set -g status-left ' #S '
+set -g status-left-fg blue
+set -g status-left-bg default
-set -g status-right '#[reverse] #H #[default] %R '
-set -g status-right-fg black
-set -g status-right-bg white
+set -g status-right ' #H | %R '
+set -g status-right-fg brightblack
+set -g status-right-bg default
# window tab content
-set-window-option -g window-status-format "#[bg=black] #I #[default] #W "
-set-window-option -g window-status-current-format "#[fg=black,bg=white] #I #[default] #W "
+set-window-option -g window-status-format " #I #W "
+set-window-option -g window-status-current-format "[ #I #W ]"
# default window title colors
-set-window-option -g window-status-fg white
+set-window-option -g window-status-fg brightblack
set-window-option -g window-status-bg default
# active window title colors
-set-window-option -g window-status-current-fg white
-set-window-option -g window-status-current-bg black
+set-window-option -g window-status-current-fg green
+set-window-option -g window-status-current-bg default
+
+set-window-option -g monitor-activity on
+set-window-option -g window-status-activity-bg yellow
+set-window-option -g window-status-activity-fg black
# command/message line colors
-set -g message-fg black
-set -g message-bg white
+set -g message-fg yellow
+set -g message-bg default
set -g message-command-fg red
-set -g message-command-bg black
+set -g message-command-bg blue
# pane colors and time
+set -g pane-active-border-fg green
set -g pane-active-border-bg default
-set -g pane-active-border-fg white
-set -g pane-border-bg default
set -g pane-border-fg black
+set -g pane-border-bg default
set -g display-panes-active-colour brightwhite
set -g display-panes-colour white
View
106 script/bootstrap
@@ -0,0 +1,106 @@
+#! /bin/bash
+
+set -e
+shopt -s dotglob
+
+echo ''
+
+DOTFILES_ROOT="`pwd`"
+DOTFILES_HOME=$DOTFILES_ROOT/home
+
+info () {
+ printf " [ \033[00;34m..\033[0m ] $1"
+}
+
+user () {
+ printf "\r [ \033[0;33m?\033[0m ] $1"
+}
+
+success () {
+ printf "\r\033[2K [ \033[00;32mOK\033[0m ] $1\n"
+}
+
+fail () {
+ printf "\r\033[2K [\033[0;31mFAIL\033[0m] $1\n"
+ echo ''
+ exit
+}
+
+link_files () {
+ ln -s $1 $2
+ success "linked $1 to $2"
+}
+
+install_dotfiles () {
+ info 'installing dotfiles'
+
+ overwrite_all=false
+ backup_all=false
+ skip_all=false
+
+ for dotfile in $DOTFILES_HOME/*
+ do
+ dest="$HOME/`basename $dotfile`"
+
+ if [ -f $dest ] || [ -d $dest ]
+ then
+
+ overwrite=false
+ backup=false
+ skip=false
+
+ if [ "$overwrite_all" == "false" ] && [ "$backup_all" == "false" ] && [ "$skip_all" == "false" ]
+ then
+
+ user "File already exists: `basename $dotfile`, what do you want to do? [s]kip, [S]kip all, [o]verwrite, [O]verwrite all, [b]ackup, [B]ackup all?"
+ read -n 1 action
+
+ case "$action" in
+ o )
+ overwrite=true;;
+ O )
+ overwrite_all=true;;
+ b )
+ backup=true;;
+ B )
+ backup_all=true;;
+ s )
+ skip=true;;
+ S )
+ skip_all=true;;
+ * )
+ ;;
+ esac
+ fi
+
+ if [ "$overwrite" == "true" ] || [ "$overwrite_all" == "true" ]
+ then
+ rm -rf $dest
+ success "removed $dest"
+ fi
+
+ if [ "$backup" == "true" ] || [ "$backup_all" == "true" ]
+ then
+ mv $dest $dest\.backup
+ success "moved $dest to $dest.backup"
+ fi
+
+ if [ "$skip" == "false" ] && [ "$skip_all" == "false" ]
+ then
+ link_files $dotfile $dest
+ else
+ success "skipped $dotfile"
+ fi
+
+ else
+ link_files $dotfile $dest
+ fi
+
+ done
+
+}
+
+install_dotfiles
+
+echo ''
+echo ' All installed!'
Please sign in to comment.
Something went wrong with that request. Please try again.