Navigation Menu

Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/esphen/dotfiles
Browse files Browse the repository at this point in the history
  • Loading branch information
eliihen committed Oct 29, 2016
2 parents 8bf6618 + 726b01c commit d55fb3d
Show file tree
Hide file tree
Showing 10 changed files with 802 additions and 36 deletions.
80 changes: 49 additions & 31 deletions .Xresources
@@ -1,15 +1,20 @@
! vim: set ft=xdefaults:
! Set $TERM variable
URxvt.termName: rxvt-unicode-256color

! Font
URxvt.font: xft:Liberation Mono for Powerline:size=10:antialias=true:hinting=true
URxvt.font: xft:Literation Mono Powerline:size=10:antialias=true:hinting=true,\
xft:Noto Mono:size=10:antialias=true:hinting=true,\
xft:Noto Color Emoji,\
xft:Unifont,\
9x15
URxvt.letterSpace: -1

! Fugly scrollbar
URxvt.scrollBar: false

!Disables the insanely annoying Ctrl+Shift shortcut that enters ISO14755 mode
URxvt.iso14755: False
URxvt.iso14755: false

! Perl extensions
URxvt.perl-ext-common: default,matcher,selection-to-clipboard
Expand All @@ -18,7 +23,7 @@ URxvt.url-launcher: firefox-developer

! Disable PrtSc-button print so we dont accidentally print all our source code
! several times over on the network printer again
URxvt.print-pipe: cat > /dev/null
URxvt.print-pipe: cat > /dev/null

! Cursor
URxvt.cursorBlink: true
Expand All @@ -31,32 +36,45 @@ URxvt*urgentOnBell: true
! Pointer
URxvt.pointerBlank: true

! "Linux colors" from gentoo wiki
! Colors
URxvt*background: #000000
URxvt*foreground: #B2B2B2
! black
URxvt*color0: #000000
URxvt*color8: #686868
! red
URxvt*color1: #B21818
URxvt*color9: #FF5454
! green
URxvt*color2: #18B218
URxvt*color10: #54FF54
! yellow
URxvt*color3: #B26818
URxvt*color11: #FFFF54
! blue
URxvt*color4: #2245ad
URxvt*color12: #5454FF
! purple
URxvt*color5: #B218B2
URxvt*color13: #FF54FF
! cyan
URxvt*color6: #18B2B2
URxvt*color14: #54FFFF
! white
URxvt*color7: #B2B2B2
URxvt*color15: #FFFFFF

! Colors taken from deterenkelts dotfiles
! https://github.com/deterenkelt/dotfiles/blob/master/.Xresources
!
!! black
URxvt.color0: #000000
URxvt.color8: #555753

!! red
URxvt.color1: #CC0000
URxvt.color9: #EF2929

!! green
URxvt.color2: #4E9A06
URxvt.color10: #8AE234

!! yellow
URxvt.color3: #C4A000
URxvt.color11: #FCE94F

!! blue
URxvt.color4: #3465A4
URxvt.color12: #729FCF

!! magenta
URxvt.color5: #75507B
URxvt.color13: #AD7FA8

!! cyan
URxvt.color6: #06989A
URxvt.color14: #34E2E2

!! white
URxvt.color7: #D3D7CF
URxvt.color15: #EEEEEC

!! misc
URxvt.foreground: #AAAAAA
URxvt.background: #151515
URxvt.colorBD: #ffffff
URxvt.underlineColor: #75507B

148 changes: 148 additions & 0 deletions .config/fish/config.fish
@@ -0,0 +1,148 @@
#######################
# Fish Shell Config #
#######################

set fish_greeting # Disable greeting message
set -g fish_prompt_pwd_dir_length 9 # Set prompt directory name length

fish_vi_key_bindings # Use vi key bindings

########################
# Oh my fish plugins #
########################

# It kind of sucks that there is no pj for fish..
# Recreate pj with jump by using this script
set PROJECT_PATHS \
$HOME/workspace/oms \
$HOME/workspace/vps \
$HOME/workspace/espen \
$HOME/workspace/diverse
function update_markpath
for directory in (find $PROJECT_PATHS -maxdepth 1 -type d)
cd $directory
mark (basename $directory) $directory
end
end

set -gx MARKPATH $HOME/.config/markpath # Marks for jump

set -g theme_powerline_fonts no


###########################
# Environment variables #
###########################

set -gx PATH \
/usr/local/bin \
/usr/bin \
/bin \
/usr/local/sbin \
/usr/sbin \
$HOME/bin \
$HOME/workspace/oms/deploy \
$HOME/workspace/oms/util \
/local/collect/default/product/bin \
$HOME/.fzf/bin \
$HOME/.cargo/bin

set -gx EDITOR nvim
set -gx LANG en_US.UTF-8
set -gx BROWSER firefox-nightly
set -gx TERM rxvt-unicode-256color

# Work VPN is old
set -gx NSS_HASH_ALG_SUPPORT +MD5
set -gx OPENSSL_ENABLE_MD5_VERIFY 1

# Fix java apps for non-re-parenting window managers (like sway)
set -gx _JAVA_AWT_WM_NONREPARENTING 1

# Taskwarrior config file
set -gx TASKRC $HOME/.config/task/config

set -gx PASSWORD_STORE_DIR $HOME/ownCloud/Documents/passwords/password_store


###################
# Abbrebiations #
###################

abbr -a "work cd $HOME/workspace/oms"
abbr -a "j jump"
abbr -a "s sudo"

# Git abbreviations
abbr -a "g git"
abbr -a "gst git status"
abbr -a "glg git log --stat --show-signature"
abbr -a "gd git diff"
abbr -a "gds git diff --staged"
abbr -a "gu git up"
abbr -a "gcm git checkout master"
abbr -a "gcd git checkout develop"
abbr -a "gc- git checkout -"

# yadm abbreviations
abbr -a "yst yadm status"
abbr -a "ya yadm add"
abbr -a "yd yadm diff"
abbr -a "yds yadm diff --staged"
abbr -a "yc yadm commit"
abbr -a "yp yadm push"


#############
# Aliases #
#############

# Not all servers support rxvt-unicode-256color,
# use something safe instead
alias ssh="TERM=xterm ssh"

alias java8='export JAVA_HOME=/local/java/jdk1.8.0_51'
alias java7='export JAVA_HOME=/local/java/jdk1.7.0_79'
alias java6='export JAVA_HOME=/local/java/jdk1.6.0_31'


###############
# gpg-agent #
###############

set -gx GPG_KEY 0E25CFCC
set -gx GPG_TTY (tty)

set -gx SSH_AUTH_SOCK /run/user/$UID/gnupg/S.gpg-agent.ssh

# ssh does not auto-launch gpg-agent, we do it manually
gpgconf --launch gpg-agent


#######################
# Load key bindings #
#######################

function fish_user_key_bindings
fzf_key_bindings
end


#####################
# Print to prompt #
#####################

#export todo() {
# # Print taskwarrior todos
# if hash task 2>/dev/null; then
# task next
# fi
#
# # Print today's CalDav appointments
# if hash khal 2>/dev/null; then
# khal agenda
# fi
#}
#
#todo
#
57 changes: 57 additions & 0 deletions .config/ncmpcpp/bindings
@@ -0,0 +1,57 @@
# Taken from https://gist.github.com/Soft/959188
def_key "/"
find
def_key "/"
find_item_forward

def_key "+"
show_clock
def_key "="
volume_up

def_key "j"
scroll_down
def_key "k"
scroll_up

def_key "ctrl-j"
scroll_down
scroll_down
scroll_down
scroll_down
scroll_down
def_key "ctrl-k"
scroll_up
scroll_up
scroll_up
scroll_up
scroll_up

def_key "ctrl-u"
page_up
def_key "ctrl-d"
page_down

def_key "h"
previous_column
def_key "l"
next_column

def_key "."
show_lyrics

def_key "n"
next_found_item
def_key "N"
previous_found_item

def_key "J"
move_sort_order_down
def_key "K"
move_sort_order_up

def_key "g"
move_home
def_key "G"
move_end

0 comments on commit d55fb3d

Please sign in to comment.