Merge branch 'master' into ranger

This commit is contained in:
Ian Adam Naval 2015-04-24 13:31:32 -04:00
commit 96791b14a4
9 changed files with 303 additions and 21 deletions

View File

@ -9,8 +9,9 @@ URxvt.depth: 32
URxvt.background: [100]#252525
URxvt.scrollstyle: plain
URxvt.font: xft:meslo lg s dz:size=10
URxvt.boldFont: xft:meslo lg s dz:size=10
URxvt.boldFont: xft:meslo lg s dz:size=10:style=bold
URxvt.letterSpace: -1
URxvt.cursorBlink: 0
URxvt.scrollBar_right: true
URxvt.scrollBar: false
URxvt.scrollTtyOutput: false
@ -44,6 +45,42 @@ xterm*toolBar: false
xterm*metaSendsEscape: true
xterm*borderWidth: 0
rofi.modi: window,run,ssh
rofi.opacity: 100
rofi.width: 720
rofi.lines: 5
rofi.columns: 1
rofi.font: Meslo LG S DZ 10
rofi.fg: #f8f8f2
rofi.bg: #252525
rofi.bgalt: #252525
rofi.hlfg: #f8f8f2
rofi.hlbg: #600
rofi.bc: #252525
rofi.bw: 0
rofi.location: 2
rofi.padding: 0
rofi.yoffset: 26
rofi.xoffset: 0
rofi.fixed-num-lines: false
rofi.terminal: urxvt
rofi.ssh-client: ssh
rofi.ssh-command: {terminal} -e {ssh-client} {host}
rofi.run-command: {cmd}
rofi.run-list-command:
rofi.run-shell-command: {terminal} -e {cmd}
rofi.disable-history: false
rofi.levenshtein-sort: false
rofi.case-sensitive: false
rofi.sidebar-mode: false
rofi.lazy-filter-limit: 5000
rofi.eh: 1
rofi.auto-select: false
rofi.pid: /run/user/1000/rofi.pid
rofi.key-window:
rofi.key-run:
rofi.key-ssh:
*.cursorBlink: true
*.foreground: #f8f8f2
*.background: #252525

View File

@ -1,5 +1,6 @@
awesome
awesome-gnome
i3-gaps-git
sublime-text-nightly
thunar
file-roller
git
sudo

View File

@ -0,0 +1,10 @@
.window-frame, .window-frame:backdrop {
box-shadow: 0 0 0 black;
border-style: none;
margin: 0;
border-radius: 0;
}
.titlebar {
border-radius: 0;
}

View File

@ -0,0 +1,16 @@
[Settings]
gtk-theme-name=iris
gtk-icon-theme-name=Numix-Circle
gtk-font-name=Cantarell 11
gtk-cursor-theme-name=Adwaita
gtk-cursor-theme-size=0
gtk-toolbar-style=GTK_TOOLBAR_BOTH
gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
gtk-button-images=0
gtk-menu-images=0
gtk-enable-event-sounds=1
gtk-enable-input-feedback-sounds=1
gtk-xft-antialias=1
gtk-xft-hinting=1
gtk-xft-hintstyle=hintslight
gtk-xft-rgba=rgb

View File

@ -10,7 +10,6 @@
set $mod Mod4
set $lock lock
set $run_passmenu ~/.i3/passmenu --type -i -sb '#800' -nb '#252525' -fn 'Meslo LG S DZ-10' -hist ~/.passmenu_history -h 26
# Font for window titles. Will also be used by the bar unless a different font
# is used in the bar {} block below. ISO 10646 = Unicode
@ -33,10 +32,12 @@ bindsym $mod+Shift+Return exec terminator
bindsym $mod+q kill
# start dmenu (a program launcher)
#bindsym $mod+d exec dmenu_run -sb "#880000"
bindsym $mod+d exec --no-startup-id j4-dmenu-desktop --dmenu="dmenu -i -sb '#800' -nb '#252525' -fn 'Meslo LG S DZ-10' -hist ~/.dmenu_history -h 26"
bindsym $mod+Shift+d exec --no-startup-id dmenu_run -i -sb '#800' -nb '#252525' -fn 'Meslo LG S DZ-10' -hist ~/.dmenu_history -h 26
bindsym $mod+p exec --no-startup-id $run_passmenu
bindsym $mod+Shift+p exec --no-startup-id ~/.i3/passmenu -i -sb '#800' -nb '#252525' -fn 'Meslo LG S DZ-10' -hist ~/.passmenu_history -h 26
#bindsym $mod+d exec --no-startup-id j4-dmenu-desktop --dmenu="dmenu -i -sb '#800' -nb '#252525' -fn 'Meslo LG S DZ-10' -hist ~/.dmenu_history -h 26"
bindsym $mod+d exec --no-startup-id rofi -show run
bindsym $mod+Shift+d exec --no-startup-id j4-dmenu-desktop --dmenu="rofi -dmenu -p run"
bindsym $mod+p exec --no-startup-id ~/.i3/passmenu --type
bindsym $mod+Shift+p exec --no-startup-id ~/.i3/passmenu
bindsym $mod+n exec --no-startup-id nmcli_dmenu -i -sb '#800' -nb '#252525' -fn 'Meslo LG S DZ-10' -h 26
# There also is the (new) i3-dmenu-desktop which only displays applications
# shipping a .desktop file. It is a wrapper around dmenu, so you need that
# installed.
@ -137,12 +138,13 @@ bindsym XF86MonBrightnessDown exec xbacklight -dec 5 # decrease screen brightnes
bindsym Shift+XF86MonBrightnessUp exec xbacklight -inc 1 # increase screen brightness
bindsym Shift+XF86MonBrightnessDown exec xbacklight -dec 1 # decrease screen brightness
bindsym XF86Tools exec --no-startup-id j4-dmenu-desktop --dmenu="dmenu -i -sb '#800' -nb '#252525' -fn 'Meslo LG S DZ-8' -hist ~/.dmenu_history -h 24"
bindsym XF86Search exec --no-startup-id j4-dmenu-desktop --dmenu="dmenu -i -sb '#800' -nb '#252525' -fn 'Meslo LG S DZ-8' -hist ~/.dmenu_history -h 24"
bindsym XF86LaunchA exec --no-startup-id $run_passmenu
bindsym XF86Explorer exec --no-startup-id j4-dmenu-desktop --dmenu="dmenu -i -sb '#800' -nb '#252525' -fn 'Meslo LG S DZ-8' -hist ~/.dmenu_history -h 24"
bindsym XF86Tools exec --no-startup-id rofi -show ssh
bindsym XF86Search exec --no-startup-id rofi -show fm -switchers 'fm:fmenu-rofi'
bindsym XF86LaunchA exec --no-startup-id rofi -show window
bindsym XF86Explorer exec --no-startup-id rofi -show run
bindsym Mod1+Tab exec --no-startup-id rofi -show window
bindsym Print exec gnome-screenshot -i
bindsym Print exec teiler
# resize window (you can also use the mouse for that)
mode "resize" {
@ -198,13 +200,52 @@ bindsym $mod+Shift+e mode "$quit_msg"
bindsym $mod+r mode "resize"
new_window pixel 2
new_float normal 2
new_window pixel 1
new_float normal 1
smart_borders on
set $mode_gaps Gaps: (o) outer, (i) inner
set $mode_gaps_outer Outer Gaps: +|-|0 (local), Shift + +|-|0 (global)
set $mode_gaps_inner Inner Gaps: +|-|0 (local), Shift + +|-|0 (global)
bindsym $mod+Shift+g mode "$mode_gaps"
mode "$mode_gaps" {
bindsym o mode "$mode_gaps_outer"
bindsym i mode "$mode_gaps_inner"
bindsym Return mode "default"
bindsym Escape mode "default"
}
mode "$mode_gaps_inner" {
bindsym plus gaps inner current plus 5
bindsym minus gaps inner current minus 5
bindsym 0 gaps inner current set 0
bindsym Shift+plus gaps inner all plus 5
bindsym Shift+minus gaps inner all minus 5
bindsym Shift+0 gaps inner all set 0
bindsym Return mode "default"
bindsym Escape mode "default"
}
mode "$mode_gaps_outer" {
bindsym plus gaps outer current plus 5
bindsym minus gaps outer current minus 5
bindsym 0 gaps outer current set 0
bindsym Shift+plus gaps outer all plus 5
bindsym Shift+minus gaps outer all minus 5
bindsym Shift+0 gaps outer all set 0
bindsym Return mode "default"
bindsym Escape mode "default"
}
for_window [class="feh"] floating enable
# border background text indicator
client.focused #660000 #880000 #ffffff #ff0000
client.focused_inactive #252525 #252525 #222222 #000000
client.focused #660000 #880000 #f8f8f2 #ff0000
client.focused_inactive #252525 #252525 #f8f8f2 #000000
client.unfocused #252525 #252525 #888888 #000000
# Start i3bar to display a workspace bar (plus the system information i3status
@ -229,7 +270,6 @@ exec --no-startup-id compton -b --vsync opengl-swc --backend glx -f -D 5 --confi
exec --no-startup-id feh --bg-scale /home/ian/Pictures/Wallpapers/wallpaper.jpg
exec --no-startup-id seafile-applet
exec --no-startup-id xrdb -merge ~/.Xresources
exec --no-startup-id nm-applet
bindsym $mod+u exec setxkbmap us
bindsym $mod+c exec setxkbmap us -variant colemak

View File

@ -8,12 +8,14 @@ if [[ $1 == "--type" ]]; then
shift
fi
prompt="pass"
prefix=${PASSWORD_STORE_DIR-~/.password-store}
password_files=( "$prefix"/**/*.gpg )
password_files=( "${password_files[@]#"$prefix"/}" )
password_files=( "${password_files[@]%.gpg}" )
password=$(printf '%s\n' "${password_files[@]}" | dmenu "$@")
password=$(printf '%s\n' "${password_files[@]}" | rofi -dmenu -p "$prompt" "$@")
[[ -n $password ]] || exit

View File

@ -29,7 +29,7 @@ COLORS = {
}
status.register("clock",
format="%a %Y-%m-%d %H:%M:%S",
format="%a %m/%d %H:%M",
color=COLORS['Magenta'])
status.register("load",
@ -82,13 +82,22 @@ if os.path.exists("/sys/class/power_supply/BAT1"):
if os.path.exists("/sys/class/net/wlp3s0"):
status.register("wireless",
interface="wlp3s0",
format_up="{essid}",
format_up="{essid} {quality:.0f}%",
format_down="",
color_up=COLORS['Green'],
color_down=COLORS['Red'])
if os.path.exists("/sys/class/net/enp0s25"):
status.register("network",
interface="enp0s25",
format_down="",
color_up=COLORS['Green'],
color_down=COLORS['Red'])
if os.path.exists("/sys/class/net/enp0s20u2c2"):
status.register("network",
interface="enp0s20u2c2",
format_down="",
color_up=COLORS['Green'],
color_down=COLORS['Red'])

View File

@ -0,0 +1,104 @@
##### teiler configuration file ######
# general variables
backend=rofi
slop_color="255,0,0"
slop_border=2
hidecursor=yes
# the path where images, videos and pastes should be saved
img_path=$HOME/Pictures/Screenshots
vid_path=$HOME/Videos/Screencasts
paste_path=$HOME/Pictures/Paste
# some distibutions rename the gdbar binary to dzen2-gdbar
# set it here, accordingly
gdbar=gdbar
# editor to be used
editor=gimp
# Uploading & archiving options
# Possible Choices for ul: fb, scp, s3, imgur (imgur does not support videos)
# Possible Choices for paste_ul: fb, scp, ix
#
# If you don't want a local history of images/videos,
# set archive_img/archive_vid to "0"
# keep in mind, that imgur does not support videos
ul=scp
paste_ul=scp
archive_vid=1
archive_img=1
archive_paste=0
upload_vid=0
# filebin history
# for filebin history to work, you need to set your host here:
filebin_host=https://host.example.com
# For scp you need to provide the actual path on your server
# where your files should be stored
# this path normally should be within a http domain.
# also set the actual URL to the directory
scp_host=ratte
scp_path_img=/srv/sites/ianonavy.com/files
scp_path_vid=/srv/sites/ianonavy.com/files
scp_path_paste=/srv/sites/ianonavy.com/files
http_img=http://files.ianonavy.com
http_vid=http://files.ianonavy.com
http_paste=http://files.ianonavy.com
# s3 options
# same as scp options. set an actual path within your bucket, where
# files should be stored. Also set the URL to your directories.
s3_bucket=
s3_path_img=path/to/images
s3_path_vid=path/to/videos
s3_path_paste=path/to/pastes
s3_http_img=http://rasi-teiler.s3-website-eu-west-1.amazonaws.com/path/to/images
s3_http_vid=http://rasi-teiler.s3-website-eu-west-1.amazonaws.com/path/to/videos
s3_http_paste=http://rasi-teiler.s3-website-eu-west-1.amazonaws.com/path/to/pastes
# Screencast options
# Resolution to change to when recording:
res=800x600
# Ffmpeg settings
# Possible encoder options: libav and ffmpeg
encoder=ffmpeg
encopts="-r 30 -vcodec libx264 -pix_fmt yuv420p -s $res -acodec libmp3lame"
rect_encopts="-r 30 -c:v libx264 -preset slow -crf 18 -c:a libvorbis"
ffaudio="-f alsa -ac 2 -i pulse"
# record indicator
rec_text="capturing..."
rec_w=100
rec_x=3400
rec_y=0
rec_font=PragmataPro-10
rec_nf=\#FFFFFF
rec_sf=\#000000
# Normally you don't want to change anything here!
SCREENCAST_PIDFILE=/tmp/$USER-teiler-screencast.pid
INDICATOR_PIDFILE=/tmp/$USER-teiler-indicator.pid
time=1000
namekey=teiler
random_string=$(date +%s | sha256sum | base64 | head -c 4 ; echo)
img_filemask=$random_string
vid_filemask=$random_string
paste_filemask=$random_string
###### rofi options ######
# here you can override options for rofi. normally rofi options
# are read from ~/.Xresources, so setting options there is recommended.
# you can dump options for ~/.Xresources with "rofi -dump-xresources"
rofiopts="-lines 25"

View File

@ -0,0 +1,63 @@
"3.9 (created: 2015/02/15 15:49:05)
source! /home/ian/.vimperatorrc.local
set editor="urxvt -e vim"
set gui=nonavigation
set hc=hjklasdfgyuiopqwertnmzxcvb
nnoremap j 3j
nnoremap k 3k
nnoremap h 3h
nnoremap l 3l
nnoremap J gt
nnoremap K gT
noremap m :set gui=invnavigation<CR>
" Hide status bar when fullscreen mode is detected
autocmd Fullscreen .* js updateBottomBar()
" Re-enable bottom bar during certain commands.
noremap : :js updateBottomBar(false)<CR>:
noremap o :js updateBottomBar(false)<CR>o
noremap O :js updateBottomBar(false)<CR>O
noremap t :js updateBottomBar(false)<CR>t
noremap T :js updateBottomBar(false)<CR>t
noremap / :js updateBottomBar(false)<CR>/
cnoremap <CR> <CR>:js updateBottomBar()<CR>
cnoremap <Esc> <Esc>:js updateBottomBar()<CR>
:js << EOF
let hlContentSepValue = highlight.get('ContentSeparator').value
function updateBottomBar(close = window.fullScreen) {
let bb = document.getElementById('liberator-bottombar')
if (! bb) return
if (close) {
bb.style.height = '0px'
bb.style.overflow = 'hidden'
liberator.execute('highlight ContentSeparator display: none;')
}
else {
bb.style.height = ''
bb.style.overflow = ''
liberator.execute('highlight ContentSeparator ' + hlContentSepValue)
}
}
updateBottomBar()
EOF
hi Normal color: #f8f8f2; background: #252525
hi CompItem[selected] background: #800
hi CmdLine background: #252525; color: #f8f8f2; font-family: "Meslo LG S DZ"; font-size: 12px;
hi StatusLine background: #252525; color: #f8f8f2; font-family: "Meslo LG S DZ"; border-color: #252525; font-size: 12px
hi ContentSeparator border-top: none; display: -moz-box;
hi ModeMsg color: #f8f8f2; background: #252525; font-family: "Meslo LG S DZ"; font-size: 12px;
hi MoreMsg color: #f8f8f2; background: #252525; font-family: "Meslo LG S DZ"; font-size: 12px;
hi Message color: #f8f8f2; background: #252525; font-family: "Meslo LG S DZ"; font-size: 12px; min-width: 100%;
hi PromptText color: #f8f8f2; font-family: "Meslo LG S DZ"; font-size: 12px;
" vim: set ft=vimperator: