summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Xdefaults8
-rw-r--r--bashrc4
-rwxr-xr-xconfig/herbstluftwm/autostart37
-rw-r--r--screenrc1
-rw-r--r--vimrc18
5 files changed, 42 insertions, 26 deletions
diff --git a/Xdefaults b/Xdefaults
index 037a693..0d7dd4e 100644
--- a/Xdefaults
+++ b/Xdefaults
@@ -1,9 +1,11 @@
Xft.dpi: 96
+URxvt*font: xft:Monospace:size=10
URxvt*foreground: #ffffff
URxvt*background: #000000
+URxvt*internalBorder: 1
+URxvt*scrollBar: false
-URxvt*font: xft:Monospace:size=10
+URxvt*saveLines: 10000
+URxvt*urgentOnBell: true
URxvt*searchable-scrollback: CM-s
-URxvt*scrollBar: false
-URxvt*saveLines: 10000
diff --git a/bashrc b/bashrc
index a6633df..c178f82 100644
--- a/bashrc
+++ b/bashrc
@@ -40,3 +40,7 @@ rbpm() { source <(~/dev/rbpm/rbpm.sh "${@}"); }
mkcd() {
mkdir "${1}" && cd "${1}"
}
+
+fnsize() {
+ printf '\e]710;%s\007' "xft:Monospace:size=${1}"
+}
diff --git a/config/herbstluftwm/autostart b/config/herbstluftwm/autostart
index 659b97d..493a930 100755
--- a/config/herbstluftwm/autostart
+++ b/config/herbstluftwm/autostart
@@ -13,27 +13,31 @@ hc keyunbind --all
hc mouseunbind --all
-hc set default_frame_layout 3
+hc set default_frame_layout grid
+hc set show_frame_decorations all
-hc set always_show_frame 1
-hc set smart_frame_surroundings 0
-hc set smart_window_surroundings 0
-
-hc set frame_border_active_color '#9fbc00'
+hc set frame_border_active_color '#909090'
hc set frame_border_normal_color '#454545'
-hc set frame_bg_active_color '#000000'
-hc set frame_bg_normal_color '#000000'
hc set window_border_active_color '#9fbc00'
hc set window_border_normal_color '#454545'
-hc set window_border_urgent_color '#454545'
+hc set window_border_urgent_color '#a03000'
hc set frame_border_width 2
+hc set frame_padding -1
hc set frame_gap 2
-hc set frame_padding 0
-hc set window_border_width 2
-hc set window_gap -2
+hc set window_border_width 1
+hc set window_gap 0
hc set snap_gap 2
-hc set snap_distance 10
+
+hc attr theme.tab_color '#222222'
+hc attr theme.tab_title_color '#909090'
+hc attr theme.title_color '#ffffff'
+hc attr theme.title_height 14
+hc attr theme.title_depth 4
+hc attr theme.title_font 'Monospace:size=10'
+hc attr theme.title_when one_tab
+hc attr theme.active.title_color '#000000'
+hc attr theme.floating.title_when always
hc pad 0 -2 -2 -2 -2
@@ -60,6 +64,7 @@ hc keybind $Mod-comma use_index -1
hc keybind $Mod-Shift-period move_index +1
hc keybind $Mod-Shift-comma move_index -1
+hc keybind $Mod-a attr clients.focus.floating toggle
hc keybind $Mod-s floating toggle
hc keybind $Mod-f fullscreen toggle
hc keybind $Mod-p pseudotile toggle
@@ -101,6 +106,8 @@ hc keybind $Mod-Control-Right resize right +0.01
hc keybind $Mod-Tab cycle +1
hc keybind $Mod-Shift-Tab cycle -1
+hc keybind $Mod-q cycle_all +1
+hc keybind $Mod-Shift-q cycle_all -1
hc keybind $Mod-Shift-c close
@@ -116,9 +123,9 @@ hc mousebind $Mod-Button3 resize
hc rule focus=off
-hc rule class='Chromium' focus=on
-hc rule class='MPlayer' focus=on
hc rule class='URxvt' focus=on
+hc rule class='firefox' focus=on
+hc rule class='mpv' focus=on
hc rule windowtype='_NET_WM_WINDOW_TYPE_DIALOG' pseudotile=on focus=on
hc rule windowtype='_NET_WM_WINDOW_TYPE_SPLASH' pseudotile=on
diff --git a/screenrc b/screenrc
index 0dcfa60..2471094 100644
--- a/screenrc
+++ b/screenrc
@@ -2,6 +2,7 @@ defutf8 on
defscrollback 10000
startup_message off
+vbell off
hardstatus alwayslastline
hardstatus string '%{= bc}%-w%50>%{= bw}%{+b}%n%{-} %t%{-}%+w%<'
diff --git a/vimrc b/vimrc
index 57a2a76..3f3f30e 100644
--- a/vimrc
+++ b/vimrc
@@ -1,10 +1,8 @@
-let g:inkpot_black_background = 1
-
if &term =~ 'screen'
set t_Co=256
endif
-colorscheme inkpot
+colorscheme mop
filetype on
syntax on
@@ -20,11 +18,11 @@ set showcmd
set ttyfast
set autoindent
-set shiftwidth=4
-set softtabstop=4
-set tabstop=4
+set shiftwidth=8
+set softtabstop=8
+set tabstop=8
"set textwidth=79
-set cinoptions=(s,U1
+set cinoptions=(s,U1,l1,:0
set ignorecase
set incsearch
@@ -35,4 +33,8 @@ set foldenable
autocmd FileType haml setlocal sw=2 sts=2 ts=2 et
autocmd FileType ruby setlocal sw=2 sts=2 ts=2 et
-autocmd FileType sh setlocal et
+autocmd FileType javascript setlocal inde= cin cino+=J1
+
+let g:c_syntax_for_h = 1
+let g:ruby_indent_assignment_style = 'variable'
+let g:ruby_indent_hanging_elements = 0