commit 25178fd866ce74b91c7623f4a22ba0d880cb4ab9 parent 87091d4e04034c90ca36b45b00b5314e21106b5b Author: Paul Longtine <paul@nanner.co> Date: Sat Dec 6 16:32:11 2014 poked stuff Diffstat: .Xdefaults | 30 +----------------------- .Xresources | 5 ++-- .comptonrc | 12 ++++----- bash/.bashrc | 2 ++- cmus/screenshot.theme | 24 +------------------ i3/.conkyrc | 7 ++--- i3/config | 68 +++++++++++++++++++++++++--------------------------- vim/.vimrc | 20 ++++++++++----- 8 files changed, 61 insertions(+), 107 deletions(-)
diff --git a/.Xdefaults b/.Xdefaults @@ -1,30 +0,0 @@ -! xscreensaver --------------------------------------------------------------- - -!font settings -xscreensaver.Dialog.headingFont: -*-dina-bold-r-*-*-10-*-*-*-*-*-*-* -xscreensaver.Dialog.bodyFont: -*-dina-medium-r-*-*-10-*-*-*-*-*-*-* -xscreensaver.Dialog.labelFont: -*-dina-medium-r-*-*-10-*-*-*-*-*-*-* -xscreensaver.Dialog.unameFont: -*-dina-medium-r-*-*-10-*-*-*-*-*-*-* -xscreensaver.Dialog.buttonFont: -*-dina-bold-r-*-*-10-*-*-*-*-*-*-* -xscreensaver.Dialog.dateFont: -*-dina-medium-r-*-*-10-*-*-*-*-*-*-* -xscreensaver.passwd.passwdFont: -*-dina-bold-r-*-*-10-*-*-*-*-*-*-* -!general dialog box (affects main hostname, username, password text) -xscreensaver.Dialog.foreground: #EDEDED -xscreensaver.Dialog.background: #202020 -xscreensaver.Dialog.topShadowColor: #202024 -xscreensaver.Dialog.bottomShadowColor: #202024 -xscreensaver.Dialog.Button.foreground: #EDEDFF -xscreensaver.Dialog.Button.background: #444 -!username/password input box and date text colour -xscreensaver.Dialog.text.foreground: #EDEDFF -xscreensaver.Dialog.text.background: #444 -xscreensaver.Dialog.internalBorderWidth:24 -xscreensaver.Dialog.borderWidth: 20 -xscreensaver.Dialog.shadowThickness: 2 -!timeout bar (background is actually determined by Dialog.text.background) -xscreensaver.passwd.thermometer.foreground: #A9B7C4 -xscreensaver.passwd.thermometer.background: #202020 -xscreensaver.passwd.thermometer.width: 8 -!datestamp format--see the strftime(3) manual page for details -xscreensaver.dateFormat: %I:%M%P %a %b %d, %Y - diff --git a/.Xresources b/.Xresources @@ -1,8 +1,9 @@ +URxvt.termName: xterm-256color URxvt.scrollBar: off !URxvt.font: xft:Neep Alt:size=8 !URxct.boldFont: xft:Neep Alt:size=8 -URxvt*font: neep-alt-iso8859-1-9 -URxvt*boldFont: neep-alt-iso8859-1-bold-9 +URxvt*font: neep-alt-iso8859-1-10 +URxvt*boldFont: neep-alt-iso8859-1-bold-10 URxvt*letterSpace: 0 URxvt.internalBorder: 1 URxvt*selectToClipboard: true diff --git a/.comptonrc b/.comptonrc @@ -3,14 +3,14 @@ menu-opacity = 0.7; #inactive-opacity = 0.9; #0.96; -fading = false; +fading = true; fade-in-step = 0.1; fade-out-step = 0.1; # Blur -blur-background = true; +#blur-background = true; -blur-kern = "15,15,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,"; +#blur-kern = "15,15,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,"; #blur-background-frame = true; @@ -18,6 +18,6 @@ blur-kern = "15,15,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.00000 wintypes: { - dock = { opacity = 0.8 }; - tooltip = { opacity = 0.5 }; -};- \ No newline at end of file +# dock = { opacity = 0.6 }; + tooltip = { opacity = 0.8 }; +}; diff --git a/bash/.bashrc b/bash/.bashrc @@ -28,6 +28,8 @@ if [ -z "$debian_chroot" ] && [ -r /etc/debian_chroot ]; then debian_chroot=$(cat /etc/debian_chroot) fi +export TERM='screen' + # Alias definitions. # You may want to put all your additions into a separate file like # ~/.bash_aliases, instead of adding them here directly. diff --git a/cmus/screenshot.theme b/cmus/screenshot.theme @@ -1,24 +0,0 @@ -# FlyingHigh.org CMus theme -set color_cmdline_bg=default -set color_cmdline_fg=red -set color_error=red -set color_info=lightyellow -set color_separator=default -set color_statusline_bg=default -set color_statusline_fg=white -set color_titleline_bg=default -set color_titleline_fg=lightyellow -set color_win_bg=default -set color_win_cur=red -set color_win_cur_sel_bg=red -set color_win_cur_sel_fg=white -set color_win_dir=blue -set color_win_fg=default -set color_win_inactive_cur_sel_bg=default -set color_win_inactive_cur_sel_fg=lightyellow -set color_win_inactive_sel_bg=default -set color_win_inactive_sel_fg=lightblue -set color_win_sel_bg=red -set color_win_sel_fg=black -set color_win_title_bg=default -set color_win_title_fg=lightyellow- \ No newline at end of file diff --git a/i3/.conkyrc b/i3/.conkyrc @@ -10,11 +10,10 @@ override_utf8_locale yes TEXT ,[\ - {"full_text": " ▲ [${upspeed wlan0}] ", "color":"\#839496"},\ - {"full_text": " ▼ [${downspeed wlan0}] ", "color":"\#839496"},\ - {"full_text": " || [$membar] ", "color":"\#839496"},\ + {"full_text": " ▲ [${upspeed eth0}] ", "color":"\#839496"},\ + {"full_text": " ▼ [${downspeed eth0}] ", "color":"\#839496"},\ + {"full_text": " || [$mem] ", "color":"\#839496"},\ {"full_text": " ■ [$cpubar] ", "color":"\#839496"},\ - {"full_text": " ↯ [$battery] ","color":"\#839496"},\ {"full_text": " ≈ [${hwmon 0 temp 1}°C] ","color":"\#839496"},\ {"full_text": " ⌛ [${time %I:%M %m/%d}] ","color": "\#839496"}\ ] diff --git a/i3/config b/i3/config @@ -3,12 +3,9 @@ set $mod Mod4 #STARTUP -exec xset s off -exec xset -dpms -#Compton the compositor -#exec compton --config ~/.comptonrc --backend glx --vsync opengl-swc --paint-on-overlay -b -exec feh --bg-scale /usr/share/xfce4/backdrops/cloudbreaker.jpg +exec compton --config ~/.comptonrc --backend glx --vsync opengl-swc --paint-on-overlay -b +exec feh --bg-scale ~/pictures/glitch.jpg # hide dem borders hide_edge_borders both @@ -18,14 +15,14 @@ for_window [title="^float$"] floating enable #colors #solarized theme, weird -set $background #839496 -set $back-inact #000000 +set $background #313131 +set $back-inact #313131 set $back-urgen #CB504E -set $border #93A1A1 -set $bor-in #000000 -set $bor-ur #424242 -set $text #000000 -set $t-in #839496 +set $border #313131 +set $bor-in #313131 +set $bor-ur #313131 +set $text #777777 +set $t-in #454545 set $t-ur #B00011 # class border background text indicator @@ -43,8 +40,8 @@ font xft:Neep Alt 8 floating_modifier $mod # start a terminal -bindsym $mod+Return exec i3-sensible-terminal -bindsym $mod+t exec i3-sensible-terminal -T float +bindsym $mod+Return exec urxvt +bindsym $mod+t exec urxvt -T float # kill focused window bindsym $mod+shift+Q kill @@ -105,35 +102,35 @@ bindsym $mod+a focus parent #bindcode $mod+d focus child # switch to workspace -bindsym $mod+1 workspace 1: www -bindsym $mod+2 workspace 2: code -bindsym $mod+3 workspace 3: chat -bindsym $mod+4 workspace 4: misc -bindsym $mod+5 workspace 5: misc -bindsym $mod+6 workspace 6: misc -bindsym $mod+7 workspace 7: misc -bindsym $mod+8 workspace 8: misc -bindsym $mod+9 workspace 9: misc -bindsym $mod+0 workspace 10: misc +bindsym $mod+1 workspace 1 +bindsym $mod+2 workspace 2 +bindsym $mod+3 workspace 3 +bindsym $mod+4 workspace 4 +bindsym $mod+5 workspace 5 +bindsym $mod+6 workspace 6 +bindsym $mod+7 workspace 7 +bindsym $mod+8 workspace 8 +bindsym $mod+9 workspace 9 +bindsym $mod+0 workspace 10 # move focused container to workspace -bindsym $mod+Shift+exclam move workspace 1: www -bindsym $mod+Shift+at move workspace 2: code -bindsym $mod+Shift+numbersign move workspace 3: chat -bindsym $mod+Shift+dollar move workspace 4: misc -bindsym $mod+Shift+percent move workspace 5: misc -bindsym $mod+Shift+asciicircum move workspace 6: misc -bindsym $mod+Shift+ampersand move workspace 7: misc -bindsym $mod+Shift+asterisk move workspace 8: misc -bindsym $mod+Shift+parenleft move workspace 9: misc -bindsym $mod+Shift+parenright move workspace 10: misc +bindsym $mod+Shift+exclam move workspace 1 +bindsym $mod+Shift+at move workspace 2 +bindsym $mod+Shift+numbersign move workspace 3 +bindsym $mod+Shift+dollar move workspace 4 +bindsym $mod+Shift+percent move workspace 5 +bindsym $mod+Shift+asciicircum move workspace 6 +bindsym $mod+Shift+ampersand move workspace 7 +bindsym $mod+Shift+asterisk move workspace 8 +bindsym $mod+Shift+parenleft move workspace 9 +bindsym $mod+Shift+parenright move workspace 10 # reload the configuration file bindsym $mod+Shift+C reload # restart i3 inplace (preserves your layout/session, can be used to upgrade i3) bindsym $mod+Shift+R restart # exit i3 (logs you out of your X session) -bindsym $mod+Shift+E logout +bindsym $mod+Shift+E exec xfce4-session-logout # resize window (you can also use the mouse for that) mode "resize" { @@ -181,6 +178,7 @@ bar { status_command conky-i3bar position top # tray_output none + output DFP2 colors { background $back-inact statusline $text diff --git a/vim/.vimrc b/vim/.vimrc @@ -1,6 +1,6 @@ -set tabstop=4 +set tabstop=8 -set shiftwidth=4 +set shiftwidth=8 set smarttab @@ -13,12 +13,12 @@ set autoindent map <M-Space> <Esc> " Whitespace stuff -"set listchars=tab:»\ ,trail:· -"set list +set listchars=tab:»\ ,trail:· +set list " Switch to alternate file -map <M-f> :bnext<cr> -map <M-b> :bprevious<cr> +map <C-x> :bnext<cr> +map <C-c> :bprevious<cr> map <C-d> <Ins> " Default mapping @@ -28,3 +28,11 @@ let g:multi_cursor_next_key='<C-l>' let g:multi_cursor_prev_key='<C-p>' let g:multi_cursor_skip_key='<C-x>' let g:multi_cursor_quit_key='<Esc>' + +" YAY COLOR +syntax on +hi SpecialKey ctermfg=black cterm=bold +hi Statement ctermfg=yellow cterm=bold +hi Special ctermfg=yellow cterm=none +hi PreProc cterm=none +hi Type cterm=bold
