diff --git a/i3/config b/i3/config new file mode 100644 index 0000000..aa5d417 --- /dev/null +++ b/i3/config @@ -0,0 +1,107 @@ +# ref: http://i3wm.org/docs/userguide.html + +set $mod Mod4 + +# is used in the bar {} block below. ISO 10646 = Unicode +font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1 +# font pango:DejaVu Sans Mono 10 + +# Use Mouse+$mod to drag floating windows to their wanted position +floating_modifier $mod + +#bindsym $mod+Return exec i3-sensible-terminal +bindsym $mod+Return exec urxvt + +bindsym $mod+Shift+apostrophe kill + +bindsym $mod+e exec dmenu_run + +# change focus +bindsym $mod+h focus left +bindsym $mod+t focus down +bindsym $mod+n focus up +bindsym $mod+s focus right + +# move focused window +bindsym $mod+Shift+h move left +bindsym $mod+Shift+t move down +bindsym $mod+Shift+n move up +bindsym $mod+Shift+s move right + +bindsym $mod+d split h +bindsym $mod+k split v +bindsym $mod+u fullscreen + +# change container layout (stacked, tabbed, toggle split) +bindsym $mod+o layout stacking +bindsym $mod+comma layout tabbed +bindsym $mod+period layout toggle split + +# toggle tiling / floating +bindsym $mod+Shift+space floating toggle + +# change focus between tiling / floating windows +bindsym $mod+space focus mode_toggle + +# focus the parent container +bindsym $mod+a focus parent + +# focus the child container +bindsym $mod+shift+a focus child + +# switch to workspace +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+1 move container to workspace 1 +bindsym $mod+Shift+2 move container to workspace 2 +bindsym $mod+Shift+3 move container to workspace 3 +bindsym $mod+Shift+4 move container to workspace 4 +bindsym $mod+Shift+5 move container to workspace 5 +bindsym $mod+Shift+6 move container to workspace 6 +bindsym $mod+Shift+7 move container to workspace 7 +bindsym $mod+Shift+8 move container to workspace 8 +bindsym $mod+Shift+9 move container to workspace 9 +bindsym $mod+Shift+0 move container to workspace 10 + +# reload the configuration file +bindsym $mod+Shift+j reload +# restart i3 inplace (preserves your layout/session, can be used to upgrade i3) +bindsym $mod+Shift+p restart +# exit i3 (logs you out of your X session) +bindsym $mod+Shift+period exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'" + +# resize window (you can also use the mouse for that) +mode "resize" { + # These bindings trigger as soon as you enter the resize mode + + # Pressing left will shrink the window’s width. + # Pressing right will grow the window’s width. + # Pressing up will shrink the window’s height. + # Pressing down will grow the window’s height. + bindsym h resize shrink width 10 px or 10 ppt + bindsym t resize grow height 10 px or 10 ppt + bindsym n resize shrink height 10 px or 10 ppt + bindsym s resize grow width 10 px or 10 ppt + + # back to normal: Enter or Escape + bindsym Return mode "default" + bindsym Escape mode "default" +} + +bindsym $mod+p mode "resize" + +# Start i3bar to display a workspace bar (plus the system information i3status +# finds out, if available) +bar { + status_command i3status +} diff --git a/symlinks.sh b/symlinks.sh index 8087077..80e0535 100644 --- a/symlinks.sh +++ b/symlinks.sh @@ -12,6 +12,7 @@ rm -rf ~/.vim; ln -s ~/dotfiles/vim ~/.vim rm ~/.vimperatorrc; ln -s ~/dotfiles/vimperatorrc ~/.vimperatorrc rm -rf ~/.config/khal; mkdir -p ~/.config/khal; ln -s ~/dotfiles/khal.conf ~/.config/khal/khal.conf rm -rf ~/.vdirsyncer; mkdir ~/.vdirsyncer; ln -s ~/dotfiles/vdirsyncer/config ~/.vdirsyncer/config +rm ~/.zshrc; ln -s ~/dotfiles/zshrc ~/.zshrc # Mail stuff #rm ~/.mbsyncrc; ln -s ~/dotfiles/mbsyncrc ~/.mbsyncrc @@ -25,3 +26,8 @@ rmdir ~/.mail/.notmuch/hooks; mkdir -p ~/.mail/.notmuch/hooks; ln -s ~/dotfiles/ rm ~/.slate.js; ln -s ~/dotfiles/slate.js ~/.slate.js rm ~/.urlview; ln -s ~/dotfiles/urlview.mac ~/.urlview rm ~/Library/KeyBindings/DefaultKeyBinding.dict; cp ~/dotfiles/DefaultKeyBinding.dict ~/Library/KeyBindings/DefaultKeyBinding.dict + +# TODO linux only +rm -rf ~/.i3; mkdir ~/.i3; ln -s ~/dotfiles/i3/config ~/.i3/config +rm -rf ~/.Xresources; ln -s ~/dotfiles/Xresources ~/.Xresources +rm -rf ~/.xinitrc; ln -s ~/dotfiles/xinitrc ~/.xinitrc diff --git a/vimrc b/vimrc index 3c42d82..b2ea6bc 100644 --- a/vimrc +++ b/vimrc @@ -75,7 +75,7 @@ if has("mouse") endif " general goodness -set shell=/bin/bash " Syntastic breaks when trying to write to /var/folders +"set shell=/bin/bash " Syntastic breaks when trying to write to /var/folders syntax enable let mapleader="," let maplocalleader="\\" diff --git a/xinitrc b/xinitrc.arch similarity index 100% rename from xinitrc rename to xinitrc.arch diff --git a/xinitrc.nixos b/xinitrc.nixos new file mode 100644 index 0000000..1862ba3 --- /dev/null +++ b/xinitrc.nixos @@ -0,0 +1,19 @@ +xrdb ~/.Xresources & +#setxkbmap -layout dvorak +# -option ctrl:nocaps +#xmodmap .Xmodmap & +#xcape & +urxvtd -q -o -f & +compton & +xsetroot -solid black -cursor_name left_ptr & + +eval $(gpg-agent --daemon) & + +xscreensaver -no-splash & + +dropbox & + +feh --bg-fill ~/Dropbox/Photos/wallpaper/cycloid.gif +# ~/dotfiles/bin/animated_wallpaper.sh ~/Dropbox/Photos/wallpaper/cycloid.gif & + +#exec xmonad diff --git a/zshrc b/zshrc index ebfb103..f7395e6 100644 --- a/zshrc +++ b/zshrc @@ -47,12 +47,13 @@ export SSL_CERT_FILE=/usr/local/opt/curl-ca-bundle/share/ca-bundle.crt if [[ -e /usr/local/share/chruby ]]; then source /usr/local/share/chruby/chruby.sh source /usr/local/share/chruby/auto.sh + chruby $(cat ~/.ruby-version) fi if [[ -e /usr/share/chruby ]]; then source /usr/share/chruby/chruby.sh source /usr/share/chruby/auto.sh + chruby $(cat ~/.ruby-version) fi -chruby $(cat ~/.ruby-version) # GPG GPG_AGENT=$(which gpg-agent)