diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3819313 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +*.swp +*.swo diff --git a/2015_05_14_installed_packages b/2015_05_14_installed_packages deleted file mode 100644 index 7f7fe52..0000000 --- a/2015_05_14_installed_packages +++ /dev/null @@ -1,622 +0,0 @@ -acl 2.2.52-2 -acpi 1.7-1 -acpid 2.0.23-4 -adwaita-icon-theme 3.16.0-2 -alsa-lib 1.0.29-1 -alsa-plugins 1.0.29-2 -alsa-utils 1.0.29-1 -arandr 0.1.7.1-3 -archlinux-keyring 20150212-1 -asciidoc 8.6.9-2 -at-spi2-atk 2.16.0-1 -at-spi2-core 2.16.0-1 -atk 2.16.0-1 -atkmm 2.22.7-1 -attr 2.4.47-1 -autoconf 2.69-2 -automake 1.15-1 -avahi 0.6.31-15 -bash 4.3.033-1 -bc 1.06.95-1 -binutils 2.25-2 -bison 3.0.4-1 -broadcom-wl 6.30.223.248-6 -bzip2 1.0.6-5 -ca-certificates 20150402-1 -ca-certificates-cacert 20140824-2 -ca-certificates-mozilla 3.18-3 -ca-certificates-utils 20150402-1 -cairo-infinality-ultimate 1.14.2-1 -cairomm 1.10.0-3 -chromium 42.0.2311.135-1 -colord 1.2.9-2 -compositeproto 0.4.2-3 -compton 0.1_beta2-5 -coreutils 8.23-1 -cracklib 2.9.4-1 -cryptsetup 1.6.6-1 -curl 7.42.0-1 -damageproto 1.2.1-3 -db 5.3.28-2 -dbus 1.8.16-2 -dbus-glib 0.102-2 -dconf 0.24.0-1 -desktop-file-utils 0.22-1 -device-mapper 2.02.116-1 -dhcpcd 6.8.2-1 -dialog 1:1.2_20150225-1 -diffutils 3.3-2 -dmenu 4.5.13.5ed5e90-1 -dmidecode 2.12-2 -dmxproto 2.3.1-3 -dnssec-anchors 20150403-1 -docbook-xml 4.5-6 -docbook-xsl 1.78.1-1 -dotconf 1.3-4 -dri2proto 2.8-2 -dri3proto 1.0-1 -e2fsprogs 1.42.12-2 -elfutils 0.161-3 -enca 1.16-1 -exo 0.10.4-3 -expat 2.1.0-4 -fakeroot 1.20.2-1 -ffmpeg 1:2.6.2-1 -fftw 3.3.4-1 -file 5.22-1 -filesystem 2015.02-1 -findutils 4.4.2-6 -fixesproto 5.0-3 -flac 1.3.1-1 -flex 2.5.39-1 -fontconfig-infinality-ultimate 2.11.1-27 -fontsproto 2.1.3-1 -freetype2-infinality-ultimate 2.5.5-5 -fribidi 0.19.6-2 -gawk 4.1.2-1 -gc 7.4.2-2 -gcc 4.9.2-4 -gcc-libs 4.9.2-4 -gconf 3.2.6-3 -gdbm 1.11-1 -gdk-pixbuf2 2.31.3-1 -gettext 0.19.4-1 -ghc 7.10.1-1 -git 2.4.0-1 -glib-networking 2.44.0-2 -glib2 2.44.0-1 -glibc 2.21-3 -glibmm 2.44.0-1 -glproto 1.4.17-1 -gmp 6.0.0-2 -gnome-icon-theme 3.12.0-3 -gnome-icon-theme-symbolic 3.12.0-3 -gnupg 2.1.3-3 -gnutls 3.4.1-1 -google-chrome 42.0.2311.135-1 -gpgme 1.5.4-1 -gpm 1.20.7-4 -graphite 1:1.2.4-1 -grep 2.21-2 -groff 1.22.3-3 -gsettings-desktop-schemas 3.16.1-1 -gsm 1.0.13-8 -gstreamer 1.4.5-1 -gstreamer0.10 0.10.36-4 -gstreamer0.10-base 0.10.36-3 -gtk-update-icon-cache 2.24.27-2 -gtk2 2.24.27-2 -gtk3 3.16.2-1 -gtkmm3 3.16.0-1 -guile 2.0.11-2 -gummiboot 48-1 -gvim 7.4.712-1 -gzip 1.6-1 -harfbuzz 0.9.40-2 -harfbuzz-icu 0.9.40-2 -haskell-data-default 0.5.3-7 -haskell-data-default-class 0.0.1-6 -haskell-data-default-instances-base 0.0.1-8 -haskell-data-default-instances-containers 0.0.1-6 -haskell-data-default-instances-dlist 0.0.1-7 -haskell-data-default-instances-old-locale 0.0.1-6 -haskell-dlist 0.7.1.1-1 -haskell-extensible-exceptions 0.1.1.4-9 -haskell-mtl 2.2.1-2 -haskell-old-locale 1.0.0.7-4 -haskell-old-time 1.1.0.3-4 -haskell-random 1.1-2 -haskell-utf8-string 1-1 -haskell-x11 1.6.1.2-3 -haskell-x11-xft 0.3.1-13 -hdparm 9.45-1 -hicolor-icon-theme 0.13-1 -hipchat 2.2.1373-1 -htop 1.0.3-2 -hwids 20150129-1 -iana-etc 2.30-4 -ibfonts-meta-base 1-6 -ibfonts-meta-extended 1-18 -ibfonts-meta-extended-lt 1-17 -icu 55.1-1 -inetutils 1.9.2-2 -inputproto 2.3.1-1 -iproute2 3.19.0-1 -iptables 1.4.21-3 -iputils 20121221-3 -irssi 0.8.17-1 -iw 3.17-1 -jasper 1.900.1-13 -jfsutils 1.1.15-4 -js17 17.0.0-1 -json-c 0.12-2 -json-glib 1.0.2-1 -kbd 2.0.2-1 -kbdlight 1.3-1 -kbproto 1.0.7-1 -keyutils 1.5.9-1 -kmod 20-1 -krb5 1.13.1-1 -lame 3.99.5-2 -lcms2 2.6-1 -ldns 1.6.17-2 -lemonbar-git 172.a9f285f-1 -less 471-1 -lib32-alsa-lib 1.0.29-1 -lib32-alsa-plugins 1.0.29-2 -lib32-attr 2.4.47-1 -lib32-bzip2 1.0.6-2 -lib32-cairo-infinality-ultimate 1.14.2-1 -lib32-curl 7.41.0-1 -lib32-e2fsprogs 1.42.12-1 -lib32-elfutils 0.161-2 -lib32-expat 2.1.0-2 -lib32-flac 1.3.1-1 -lib32-fontconfig-infinality-ultimate 2.11.1-5 -lib32-freetype2-infinality-ultimate 2.5.5-5 -lib32-gcc-libs 5.1.0-3 -lib32-glib2 2.44.0-1 -lib32-glibc 2.21-4 -lib32-harfbuzz 0.9.40-2 -lib32-icu 55.1-1 -lib32-json-c 0.12-1 -lib32-keyutils 1.5.9-1 -lib32-krb5 1.13.1-1 -lib32-lcms2 2.6-1 -lib32-libasyncns 0.8-7 -lib32-libcap 2.24-1 -lib32-libdbus 1.8.16-1 -lib32-libdrm 2.4.61-1 -lib32-libffi 3.2.1-1 -lib32-libgcrypt 1.6.3-1 -lib32-libgpg-error 1.18-1 -lib32-libice 1.0.9-1 -lib32-libjpeg-turbo 1.4.0-1 -lib32-libldap 2.4.40-1 -lib32-libmng 2.0.2-1 -lib32-libogg 1.3.2-1 -lib32-libpciaccess 0.13.4-1 -lib32-libpng 1.6.16-1 -lib32-libpulse 6.0-1 -lib32-libsm 1.2.2-1 -lib32-libsndfile 1.0.25-3 -lib32-libssh2 1.5.0-1 -lib32-libtiff 4.0.3-3 -lib32-libtxc_dxtn 1.0.1-5 -lib32-libvorbis 1.3.5-1 -lib32-libx11 1.6.3-1 -lib32-libxau 1.0.8-1 -lib32-libxcb 1.11-1 -lib32-libxcursor 1.1.14-1 -lib32-libxdamage 1.1.4-2 -lib32-libxdmcp 1.1.2-1 -lib32-libxext 1.3.3-1 -lib32-libxfixes 5.0.1-1 -lib32-libxi 1.7.4-1 -lib32-libxrandr 1.4.2-1 -lib32-libxrender 0.9.8-1 -lib32-libxshmfence 1.2-1 -lib32-libxss 1.2.2-2 -lib32-libxtst 1.2.2-1 -lib32-libxv 1.0.10-1 -lib32-libxxf86vm 1.1.4-1 -lib32-llvm-libs 3.6.0-1 -lib32-mesa 10.5.4-1 -lib32-mesa-libgl 10.5.4-1 -lib32-openssl 1.0.2.a-1 -lib32-pcre 8.36-1 -lib32-pixman 0.32.6-1 -lib32-qt4 4.8.6-4 -lib32-sqlite 3.8.9-1 -lib32-systemd 219-1 -lib32-util-linux 2.26.1-1 -lib32-v4l-utils 1.6.0-1 -lib32-wayland 1.7.0-1 -lib32-xz 5.2.1-1 -lib32-zlib 1.2.8-1 -libaio 0.3.110-1 -libao 1.2.0-1 -libarchive 3.1.2-8 -libass 0.12.2-1 -libassuan 2.2.0-1 -libasyncns 0.8-5 -libatomic_ops 7.4.2-1 -libbluray 0.8.0-1 -libcanberra 0.30-5 -libcanberra-pulse 0.30-5 -libcap 2.24-2 -libconfig 1.4.9-2 -libcroco 0.6.8-2 -libcups 2.0.2-4 -libdaemon 0.14-3 -libdatrie 0.2.8-1 -libdbus 1.8.16-2 -libdmx 1.1.3-1 -libdrm 2.4.61-1 -libedit 20150325_3.1-1 -libepoxy 1.2-2 -libevdev 1.4.2-1 -libevent 2.0.22-1 -libexif 0.6.21-2 -libffi 3.2.1-1 -libfontenc 1.1.3-1 -libgcrypt 1.6.3-2 -libglade 2.6.4-5 -libgpg-error 1.19-1 -libgusb 0.2.4-1 -libice 1.0.9-1 -libidn 1.30-1 -libinput 0.15.0-1 -libjpeg-turbo 1.4.0-1 -libksba 1.3.3-1 -libldap 2.4.40-2 -libmng 2.0.2-3 -libmodplug 0.8.8.5-1 -libmpc 1.0.3-1 -libnl 3.2.25-1 -libnotify 0.7.6-1 -libogg 1.3.2-1 -libomxil-bellagio 0.9.3-1 -libpciaccess 0.13.4-1 -libpipeline 1.4.0-1 -libpng 1.6.16-1 -libproxy 0.4.11-5 -libpulse 6.0-1 -librsvg 1:2.40.9-2 -libsamplerate 0.1.8-3 -libsasl 2.1.26-7 -libseccomp 2.2.0-1 -libsecret 0.18.2-1 -libsigc++ 2.4.1-1 -libsm 1.2.2-2 -libsndfile 1.0.25-3 -libsoup 2.50.0-1 -libssh 0.6.5-1 -libssh2 1.5.0-1 -libsystemd 219-6 -libtasn1 4.5-1 -libthai 0.1.21-1 -libtheora 1.1.1-3 -libtiff 4.0.3-5 -libtirpc 0.3.0-1 -libtool 2.4.6-1 -libtxc_dxtn 1.0.1-6 -libunistring 0.9.5-1 -libunwind 1.1-2 -libusb 1.0.19-1 -libutempter 1.1.6-2 -libutil-linux 2.26.1-3 -libva 1.5.1-1 -libvdpau 1.1-1 -libvorbis 1.3.5-1 -libvpx 1.4.0-2 -libx11 1.6.3-1 -libx264 2:144.20150223-1 -libxau 1.0.8-2 -libxaw 1.0.13-1 -libxcb 1.11-1 -libxcomposite 0.4.4-2 -libxcursor 1.1.14-2 -libxdamage 1.1.4-2 -libxdmcp 1.1.2-1 -libxext 1.3.3-1 -libxfce4ui 4.12.1-1 -libxfce4util 4.12.1-1 -libxfixes 5.0.1-1 -libxfont 1.5.1-1 -libxft 2.3.2-1 -libxi 1.7.4-1 -libxinerama 1.1.3-2 -libxkbcommon 0.5.0-1 -libxkbfile 1.0.9-1 -libxml2 2.9.2-2 -libxmu 1.1.2-1 -libxpm 3.5.11-1 -libxrandr 1.4.2-2 -libxrender 0.9.9-1 -libxshmfence 1.2-1 -libxslt 1.1.28-3 -libxss 1.2.2-2 -libxt 1.1.5-1 -libxtst 1.2.2-1 -libxv 1.0.10-1 -libxvmc 1.0.9-1 -libxxf86dga 1.1.4-1 -libxxf86vm 1.1.4-1 -libyaml 0.1.6-1 -licenses 20140629-1 -linux 4.0.1-1 -linux-api-headers 3.18.5-1 -linux-firmware 20150410.ec89525-1 -llvm-libs 3.6.0-5 -lm_sensors 3.3.5-1 -logrotate 3.8.9-1 -lua 5.2.4-1 -lvm2 2.02.116-1 -lz4 128-1 -lzo 2.09-1 -m4 1.4.17-1 -make 4.1-1 -man-db 2.7.1-1 -man-pages 4.00-1 -mcpp 2.7.2-5 -mdadm 3.3.2-1 -mesa 10.5.4-1 -mesa-libgl 10.5.4-1 -mkinitcpio 18-2 -mkinitcpio-busybox 1.21.1-2 -mpfr 3.1.2.p11-1 -mtdev 1.1.5-1 -nano 2.4.1-1 -ncurses 5.9-7 -netctl 1.10-2 -nettle 3.1.1-1 -npth 1.2-1 -nspr 4.10.8-1 -nss 3.18-3 -opencore-amr 0.1.3-2 -openjpeg 1.5.2-1 -openresolv 3.6.1-1 -openssh 6.8p1-2 -openssl 1.0.2.a-1 -opus 1.1-1 -orc 0.4.23-1 -otf-cantarell-ib 0.0.16-2 -otf-oswald-ib 3.0-7 -otf-quintessential-ib 1.000-5 -otf-tex-gyre-ib 2.005-7 -p11-kit 0.23.1-2 -package-query 1.5-2 -pacman 4.2.1-1 -pacman-mirrorlist 20150315-1 -pam 1.1.8-5 -pambase 20130928-1 -pango 1.36.8-1 -pangomm 2.36.0-1 -pasystray-git 0.5.2.r0.g6709fc1-2 -patch 2.7.5-1 -pavucontrol 3.0-1 -pciutils 3.3.1-1 -pcmciautils 018-7 -pcre 8.37-1 -perl 5.20.2-1 -perl-error 0.17023-1 -perl-file-basedir 0.07-1 -perl-ipc-system-simple 1.25-1 -perl-uri 1.67-1 -physlock-git 0.71.v0.4.5.3.gb64dccc-1 -pianobar 2014.09.28-2 -pinentry 0.9.1-1 -pipes-git 20121205-1 -pixman 0.32.6-1 -pkg-config 0.28-2 -polkit 0.112-2 -popt 1.16-7 -powertop 2.7-2 -presentproto 1.0-1 -procps-ng 3.3.10-2 -psmisc 22.21-2 -pth 2.0.7-5 -pulseaudio 6.0-1 -pulseaudio-alsa 2-3 -pulseaudio-ctl 1.61-1 -pygobject2-devel 2.28.6-11 -pygtk 2.24.0-5 -python 3.4.3-2 -python-pip 6.1.1-1 -python-setuptools 1:15.2-1 -python-xdg 0.25-2 -python2 2.7.9-1 -python2-cairo 1.10.0-2 -python2-gobject2 2.28.6-11 -qt4 4.8.6-6 -randrproto 1.4.1-1 -readline 6.3.008-1 -recode 3.6-8 -recordproto 1.14.2-2 -reiserfsprogs 3.6.24-1 -renderproto 0.11.1-3 -resourceproto 1.2.0-3 -rest 0.7.93-1 -rfkill 0.5-1 -rtkit 0.11-5 -ruby 2.2.2-1 -rxvt-unicode 9.21-1 -rxvt-unicode-terminfo 9.21-1 -s-nail 14.8.0-1 -sbc 1.3-1 -schroedinger 1.0.11-2 -scrnsaverproto 1.2.2-2 -sdl 1.2.15-7 -sed 4.2.2-3 -shadow 4.2.1-3 -shared-mime-info 1.4-1 -skype 4.3.0.37-3 -sl 5.02-3 -snappy 1.1.1-1 -sound-theme-freedesktop 0.8-2 -speech-dispatcher 0.8.1-1 -speex 1.2rc2-1 -speexdsp 1.2rc3-1 -sqlite 3.8.9-1 -startup-notification 0.12-4 -steam 1.0.0.49-3 -sudo 1.8.13-1 -sysfsutils 2.1.0-9 -sysstat 11.1.3-1 -systemd 219-6 -systemd-sysvcompat 219-6 -t1-cursor-ib 1.0.2-4 -t1-urw-fonts-ib 20150122-2 -tar 1.28-1 -tdb 1.3.4-1 -texinfo 5.2-3 -thin-provisioning-tools 0.4.1-1 -thunar 1.6.8-1 -tlp 0.7-2 -tmux 2.0-1 -tree 1.7.0-1 -ttf-bitstream-vera 1.10-10 -ttf-caladea-ib 20130214-6 -ttf-cantoraone-ib 1.001-6 -ttf-carlito-ib 20130920-7 -ttf-courier-prime-ib 1.203-6 -ttf-ddc-uchen-ib 1.000-6 -ttf-dejavu-ib 2.34-13 -ttf-droid-ib 20121017-11 -ttf-gelasio-ib 1.00-6 -ttf-heuristica-ib 1.0.2-3 -ttf-liberation-ib 2.00.1-12 -ttf-lohit-odia-ib 2.5.5-5 -ttf-lohit-punjabi-ib 2.5.3-6 -ttf-merriweather-ib 1.003-8 -ttf-merriweather-sans-ib 1.003-8 -ttf-noto-sans-ib 2014.12-4 -ttf-noto-sans-multilang-ib 2014.12-2 -ttf-noto-serif-ib 2014.12-4 -ttf-noto-serif-multilang-ib 2014.12-2 -ttf-opensans-ib 1.2-17 -ttf-signika-family-ib 1.0001-7 -ttf-symbola-ib 7.21-1 -ttf-ubuntu-font-family-ib 0.80-11 -tzdata 2015d-1 -unclutter 8-10 -unzip 6.0-10 -usbutils 008-1 -util-linux 2.26.1-3 -v4l-utils 1.6.2-1 -vi 1:070224-1 -videoproto 2.3.2-1 -vim-runtime 7.4.712-1 -virtualbox 4.3.26-3 -virtualbox-host-modules 4.3.26-6 -vpnc 0.5.3.svn550-1 -wayland 1.7.0-1 -webrtc-audio-processing 0.1-2 -which 2.21-1 -wpa_actiond 1.4-2 -wpa_supplicant 1:2.3-1 -x265 1.6-1 -xcb-proto 1.11-1 -xcb-util 0.4.0-1 -xcb-util-keysyms 0.4.0-1 -xclip 0.12-4 -xdg-utils 1.1.0.git20150323-1 -xextproto 7.3.0-1 -xf86-input-evdev 2.9.2-1 -xf86-input-joystick 1.6.2-5 -xf86-input-keyboard 1.8.1-1 -xf86-input-libinput 0.9.0-1 -xf86-input-mouse 1.9.1-1 -xf86-input-mtrack-git 0.3.1.r0.geb94a05-1 -xf86-input-vmmouse 13.0.0-5 -xf86-input-void 1.4.1-1 -xf86-video-ark 0.7.5-6 -xf86-video-ati 1:7.5.0-2 -xf86-video-dummy 0.3.7-4 -xf86-video-fbdev 0.4.4-4 -xf86-video-glint 1.2.8-6 -xf86-video-i128 1.3.6-6 -xf86-video-intel 2.99.917-5 -xf86-video-mach64 6.9.5-1 -xf86-video-neomagic 1.2.9-1 -xf86-video-nouveau 1.0.11-3 -xf86-video-nv 2.1.20-6 -xf86-video-openchrome 0.3.3-5 -xf86-video-r128 6.10.0-1 -xf86-video-savage 2.3.8-1 -xf86-video-siliconmotion 1.7.8-1 -xf86-video-sis 0.10.7-7 -xf86-video-tdfx 1.4.5-6 -xf86-video-trident 1.3.7-1 -xf86-video-vesa 2.3.2-6 -xf86-video-vmware 13.1.0-2 -xf86-video-voodoo 1.2.5-6 -xf86dgaproto 2.1-3 -xf86driproto 2.1.1-3 -xf86vidmodeproto 2.3.1-3 -xfconf 4.12.0-1 -xfsprogs 3.2.2-1 -xineramaproto 1.2.1-3 -xkeyboard-config 2.14-1 -xmonad 0.11.1-2 -xmonad-contrib 0.11.4-2 -xorg-bdftopcf 1.0.5-1 -xorg-docs 1.7.1-1 -xorg-font-util 1.3.1-1 -xorg-font-utils 7.6-4 -xorg-fonts-100dpi 1.0.3-2 -xorg-fonts-75dpi 1.0.3-2 -xorg-fonts-alias 1.0.3-1 -xorg-fonts-encodings 1.0.4-4 -xorg-fonts-misc 1.0.3-3 -xorg-iceauth 1.0.7-1 -xorg-luit 1.1.1-2 -xorg-mkfontdir 1.0.7-2 -xorg-mkfontscale 1.1.2-1 -xorg-server 1.17.1-5 -xorg-server-common 1.17.1-5 -xorg-server-devel 1.17.1-5 -xorg-sessreg 1.1.0-1 -xorg-setxkbmap 1.3.1-1 -xorg-smproxy 1.0.6-1 -xorg-util-macros 1.19.0-1 -xorg-x11perf 1.6.0-1 -xorg-xauth 1.0.9-1 -xorg-xbacklight 1.2.1-1 -xorg-xcmsdb 1.0.5-1 -xorg-xcursorgen 1.0.6-1 -xorg-xdpyinfo 1.3.2-1 -xorg-xdriinfo 1.0.5-1 -xorg-xev 1.2.2-1 -xorg-xgamma 1.0.6-1 -xorg-xhost 1.0.7-1 -xorg-xinit 1.3.4-2 -xorg-xinput 1.6.1-1 -xorg-xkbcomp 1.3.0-1 -xorg-xkbevd 1.1.4-1 -xorg-xkbutils 1.0.4-2 -xorg-xkill 1.0.4-1 -xorg-xlsatoms 1.1.2-1 -xorg-xlsclients 1.1.3-1 -xorg-xmodmap 1.0.9-1 -xorg-xpr 1.0.4-2 -xorg-xprop 1.2.2-1 -xorg-xrandr 1.4.3-1 -xorg-xrdb 1.1.0-1 -xorg-xrefresh 1.0.5-1 -xorg-xset 1.2.3-1 -xorg-xsetroot 1.1.1-2 -xorg-xvinfo 1.1.3-1 -xorg-xwd 1.0.6-1 -xorg-xwininfo 1.1.3-1 -xorg-xwud 1.0.4-2 -xproto 7.0.27-1 -xvidcore 1.3.3-1 -xz 5.2.1-1 -yajl 2.1.0-1 -yaourt 1.5-1 -zenity 3.14.0-1 -zlib 1.2.8-3 -zsh 5.0.7-1 -zsh-completions 0.12.0-1 diff --git a/README.md b/README.md new file mode 100644 index 0000000..e6c4eae --- /dev/null +++ b/README.md @@ -0,0 +1,71 @@ +# Linux Essentials + +This repository contains everything essential to getting a running Arch Linux installation going with xmonad, tmux, +lemonbar, and many other configurations. This repository is based almost entirely on [Alex McArther's](http://github.com/acmcarther) +repository for the same thing. The directory structure is as follows: + +1. *dotfiles/* - This contains any related dotfiles +2. *scripts/* - This directory contains most of the important things to get the installation running + 1. *scripts/sysinstall/* - This directory contains a number of scripts for configuring the system + 2. *scripts/sysinit/* - This directory contains anything needed for system initialization + 3. *scripts/solutions/* - This directory contains any fixes that can be run for various packages + 4. *scripts/lemonbar/* - This directory contains any related lemonbar scripts + 5. *scripts/diagnostics/* - This directory contains scripts for helping to diagnose problems +3. *installation_instructions* - This file contains a series of command you copy and paste during install of Arch + +Take care with the dotfiles. My configurations change the terminal colors to be solarized dark. If you do not like them +they can be easily changed in the Xresources dotfile. + + + +# Issues + +There are of course a things that aren't covered (yet). + +1. Thinkpad T440s function keys don't work (in the works) +2. Thinkpad T440s mousepad right-click and gestures do not work +3. No automated way to setup locker +4. No automated way to setup suspend on lid close +5. No chef script to do everything for you + +# Software To Install + +Below is a not comprehensive list of software you should install and configure + + +## Package Management +1. Yaourt + +## Wallpaper +1. Feh + +## Terminal +1. rxvt-unicode-256color + +## Display +1. xorg +2. xorg-xinit +3. xmonad +4. xmonad-contrib +5. bar + +## Screen Locking +1. Physlock + +## Compositing +1. Compton + +## Fonts +1. infinality-bundle +2. ibfonts-meta-base +3. ttf-inconsolata (for the terminal) + +## Mousepad +1. Synaptic + +## Editing +1. GVim + +## Browsing +1. Google Chrome (With a dark theme) + diff --git a/dotfiles/Xresources b/dotfiles/Xresources index b2c53d0..f6f00c8 100644 --- a/dotfiles/Xresources +++ b/dotfiles/Xresources @@ -35,36 +35,63 @@ URxvt*loginShell: true ! URxvt*pointerBlank: boolean !URxvt*background: rgba:1000/2a00/3b00/ffff -!URxvt*background: #0A1924 -URxvt*background: #000000 -URxvt*foreground: #DEDEDE - -URxvt*colorUL: #86a2b0 - -! black -URxvt*color0 : #2E3436 -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 + +#define S_base03 #002b36 +#define S_base02 #073642 +#define S_base01 #586e75 +#define S_base00 #657b83 +#define S_base0 #839496 +#define S_base1 #93a1a1 +#define S_base2 #eee8d5 +#define S_base3 #fdf6e3 + +*background: S_base03 +*foreground: S_base0 +*fadeColor: S_base03 +*cursorColor: S_base1 +*pointerColorBackground:S_base01 +*pointerColorForeground:S_base1 + +#define S_yellow #b58900 +#define S_orange #cb4b16 +#define S_red #dc322f +#define S_magenta #d33682 +#define S_violet #6c71c4 +#define S_blue #268bd2 +#define S_cyan #2aa198 +#define S_green #859900 + +!! black dark/light +*color0: S_base02 +*color8: S_base03 + +!! red dark/light +*color1: S_red +*color9: S_orange + +!! green dark/light +*color2: S_green +*color10: S_base01 + +!! yellow dark/light +*color3: S_yellow +*color11: S_base00 + +!! blue dark/light +*color4: S_blue +*color12: S_base0 + +!! magenta dark/light +*color5: S_magenta +*color13: S_violet + +!! cyan dark/light +*color6: S_cyan +*color14: S_base1 + +!! white dark/light +*color7: S_base2 +*color15: S_base3 !urxvt extensions: @@ -109,10 +136,12 @@ xterm*faceName: Liberation Mono xterm*faceSize: 7 7 7 7 7 7 7 !URxvt*font: xft:Liberation Mono-8 !URxvt*boldFont: xft:Liberation Mono:bold -URxvt*font: xft:Ubuntu Mono-8 +URxvt*font: xft:Inconsolata:size=8:antialias=true:hinting=true URxvt*boldFont: xft:Ubuntu Mono:bold URxvt.letterSpace: -1 +URxvt*termName: rxvt-unicode + URxvt.urgentOnBell: true ! URxvt*foreground: color ! URxvt*color0: color @@ -158,7 +187,7 @@ URxvt.urgentOnBell: true ! URxvt*iconName: string ! URxvt*saveLines: number ! URxvt*buffered: boolean -URxvt*depth: 0 +URxvt*depth: 0 ! URxvt*visual: number ! URxvt*transient-for: windowid ! URxvt*override-redirect: boolean @@ -207,3 +236,7 @@ URxvt*depth: 0 ! URxvt*tabbar-bg: colour ! URxvt*tabbar-fg: colour ! URxvt*url-launcher: string +! +! +! +! diff --git a/dotfiles/irssi/config b/dotfiles/irssi/config deleted file mode 100644 index c543ffe..0000000 --- a/dotfiles/irssi/config +++ /dev/null @@ -1,386 +0,0 @@ -servers = ( -  { address = "irc.dal.net"; chatnet = "DALnet"; port = "6667"; }, -  { address = "irc.efnet.org"; chatnet = "EFNet"; port = "6667"; }, -  { address = "irc.esper.net"; chatnet = "EsperNet"; port = "6667"; }, -  { -    address = "chat.freenode.net"; -    chatnet = "Freenode"; -    port = "6667"; -  }, -  { -    address = "irc.gamesurge.net"; -    chatnet = "GameSurge"; -    port = "6667"; -  }, -  { address = "eu.irc6.net"; chatnet = "IRCnet"; port = "6667"; }, -  { address = "open.ircnet.net"; chatnet = "IRCnet"; port = "6667"; }, -  { -    address = "irc.ircsource.net"; -    chatnet = "IRCSource"; -    port = "6667"; -  }, -  { address = "irc.netfuze.net"; chatnet = "NetFuze"; port = "6667"; }, -  { address = "irc.oftc.net"; chatnet = "OFTC"; port = "6667"; }, -  { -    address = "irc.quakenet.org"; -    chatnet = "QuakeNet"; -    port = "6667"; -  }, -  { address = "irc.rizon.net"; chatnet = "Rizon"; port = "6667"; }, -  { address = "silc.silcnet.org"; chatnet = "SILC"; port = "706"; }, -  { -    address = "irc.undernet.org"; -    chatnet = "Undernet"; -    port = "6667"; -  }, -  { -    address = "chicago.iximeow.net"; -    chatnet = "andynet"; -    port = "6697"; -    use_ssl = "yes"; -    ssl_verify = "no"; -    autoconnect = "yes"; -  } -); - -chatnets = { -  DALnet = { -    type = "IRC"; -    max_kicks = "4"; -    max_msgs = "20"; -    max_whois = "30"; -  }; -  EFNet = { -    type = "IRC"; -    max_kicks = "1"; -    max_msgs = "4"; -    max_whois = "1"; -  }; -  EsperNet = { -    type = "IRC"; -    max_kicks = "1"; -    max_msgs = "4"; -    max_whois = "1"; -  }; -  Freenode = { -    type = "IRC"; -    max_kicks = "1"; -    max_msgs = "4"; -    max_whois = "1"; -  }; -  GameSurge = { -    type = "IRC"; -    max_kicks = "1"; -    max_msgs = "1"; -    max_whois = "1"; -  }; -  IRCnet = { -    type = "IRC"; -    max_kicks = "1"; -    max_msgs = "1"; -    max_whois = "1"; -  }; -  IRCSource = { -    type = "IRC"; -    max_kicks = "1"; -    max_msgs = "4"; -    max_whois = "1"; -  }; -  NetFuze = { -    type = "IRC"; -    max_kicks = "1"; -    max_msgs = "1"; -    max_whois = "1"; -  }; -  OFTC = { type = "IRC"; max_kicks = "1"; max_msgs = "1"; max_whois = "1"; }; -  QuakeNet = { -    type = "IRC"; -    max_kicks = "1"; -    max_msgs = "1"; -    max_whois = "1"; -  }; -  Rizon = { -    type = "IRC"; -    max_kicks = "1"; -    max_msgs = "1"; -    max_whois = "1"; -  }; -  SILC = { type = "SILC"; }; -  Undernet = { -    type = "IRC"; -    max_kicks = "1"; -    max_msgs = "1"; -    max_whois = "1"; -  }; -  andynet = { type = "IRC"; nick = "sanders"; }; -}; - -channels = ( -  { name = "#lobby"; chatnet = "EsperNet"; autojoin = "No"; }, -  { name = "#freenode"; chatnet = "Freenode"; autojoin = "No"; }, -  { name = "#irssi"; chatnet = "Freenode"; autojoin = "No"; }, -  { name = "#gamesurge"; chatnet = "GameSurge"; autojoin = "No"; }, -  { name = "#irssi"; chatnet = "IRCNet"; autojoin = "No"; }, -  { name = "#ircsource"; chatnet = "IRCSource"; autojoin = "No"; }, -  { name = "#netfuze"; chatnet = "NetFuze"; autojoin = "No"; }, -  { name = "#oftc"; chatnet = "OFTC"; autojoin = "No"; }, -  { name = "silc"; chatnet = "SILC"; autojoin = "No"; }, -  { name = "#devs"; chatnet = "andynet"; autojoin = "yes"; } -); - -aliases = { -  ATAG = "WINDOW SERVER"; -  ADDALLCHANS = "SCRIPT EXEC foreach my \\$channel (Irssi::channels()) { Irssi::command(\"CHANNEL ADD -auto \\$channel->{name} \\$channel->{server}->{tag} \\$channel->{key}\")\\;}"; -  B = "BAN"; -  BACK = "AWAY"; -  BANS = "BAN"; -  BYE = "QUIT"; -  C = "CLEAR"; -  CALC = "EXEC - if command -v bc >/dev/null 2>&1\\; then printf '%s=' '$*'\\; echo '$*' | bc -l\\; else echo bc was not found\\; fi"; -  CHAT = "DCC CHAT"; -  CUBES = "SCRIPT EXEC Irssi::active_win->print(\"%_bases\", MSGLEVEL_CLIENTCRAP) \\; Irssi::active_win->print( do { join '', map { \"%x0\\${_}0\\$_\" } '0'..'9','A'..'F' }, MSGLEVEL_NEVER | MSGLEVEL_CLIENTCRAP) \\; Irssi::active_win->print(\"%_cubes\", MSGLEVEL_CLIENTCRAP) \\; Irssi::active_win->print( do { my \\$y = \\$_*6 \\; join '', map { my \\$x = \\$_ \\; map { \"%x\\$x\\$_\\$x\\$_\" } @{['0'..'9','A'..'Z']}[\\$y .. \\$y+5] } 1..6 }, MSGLEVEL_NEVER | MSGLEVEL_CLIENTCRAP) for 0..5 \\; Irssi::active_win->print(\"%_grays\", MSGLEVEL_CLIENTCRAP) \\; Irssi::active_win->print( do { join '', map { \"%x7\\${_}7\\$_\" } 'A'..'X' }, MSGLEVEL_NEVER | MSGLEVEL_CLIENTCRAP) \\; Irssi::active_win->print(\"%_mIRC extended colours\", MSGLEVEL_CLIENTCRAP) \\; my \\$x \\; \\$x .= sprintf \"\00399,%02d%02d\",\\$_,\\$_ for 0..15 \\; Irssi::active_win->print(\\$x, MSGLEVEL_NEVER | MSGLEVEL_CLIENTCRAP) \\; for my \\$z (0..6) { my \\$x \\; \\$x .= sprintf \"\00399,%02d%02d\",\\$_,\\$_ for 16+(\\$z*12)..16+(\\$z*12)+11 \\; Irssi::active_win->print(\\$x, MSGLEVEL_NEVER | MSGLEVEL_CLIENTCRAP) }"; -  DATE = "TIME"; -  DEHIGHLIGHT = "DEHILIGHT"; -  DESCRIBE = "ACTION"; -  DHL = "DEHILIGHT"; -  EXEMPTLIST = "MODE $C +e"; -  EXIT = "QUIT"; -  GOTO = "SCROLLBACK GOTO"; -  HIGHLIGHT = "HILIGHT"; -  HL = "HILIGHT"; -  HOST = "USERHOST"; -  INVITELIST = "MODE $C +I"; -  J = "JOIN"; -  K = "KICK"; -  KB = "KICKBAN"; -  KN = "KNOCKOUT"; -  LAST = "LASTLOG"; -  LEAVE = "PART"; -  M = "MSG"; -  MUB = "UNBAN *"; -  N = "NAMES"; -  NMSG = "^MSG"; -  P = "PART"; -  Q = "QUERY"; -  RESET = "SET -default"; -  RUN = "SCRIPT LOAD"; -  SAY = "MSG *"; -  SB = "SCROLLBACK"; -  SBAR = "STATUSBAR"; -  SIGNOFF = "QUIT"; -  SV = "MSG * Irssi $J ($V) - http://www.irssi.org"; -  T = "TOPIC"; -  UB = "UNBAN"; -  UMODE = "MODE $N"; -  UNSET = "SET -clear"; -  W = "WHO"; -  WC = "WINDOW CLOSE"; -  WG = "WINDOW GOTO"; -  WJOIN = "JOIN -window"; -  WI = "WHOIS"; -  WII = "WHOIS $0 $0"; -  WL = "WINDOW LIST"; -  WN = "WINDOW NEW HIDDEN"; -  WQUERY = "QUERY -window"; -  WW = "WHOWAS"; -  1 = "WINDOW GOTO 1"; -  2 = "WINDOW GOTO 2"; -  3 = "WINDOW GOTO 3"; -  4 = "WINDOW GOTO 4"; -  5 = "WINDOW GOTO 5"; -  6 = "WINDOW GOTO 6"; -  7 = "WINDOW GOTO 7"; -  8 = "WINDOW GOTO 8"; -  9 = "WINDOW GOTO 9"; -  10 = "WINDOW GOTO 10"; -  11 = "WINDOW GOTO 11"; -  12 = "WINDOW GOTO 12"; -  13 = "WINDOW GOTO 13"; -  14 = "WINDOW GOTO 14"; -  15 = "WINDOW GOTO 15"; -  16 = "WINDOW GOTO 16"; -  17 = "WINDOW GOTO 17"; -  18 = "WINDOW GOTO 18"; -  19 = "WINDOW GOTO 19"; -  20 = "WINDOW GOTO 20"; -  21 = "WINDOW GOTO 21"; -  22 = "WINDOW GOTO 22"; -  23 = "WINDOW GOTO 23"; -  24 = "WINDOW GOTO 24"; -  25 = "WINDOW GOTO 25"; -  26 = "WINDOW GOTO 26"; -  27 = "WINDOW GOTO 27"; -  28 = "WINDOW GOTO 28"; -  29 = "WINDOW GOTO 29"; -  30 = "WINDOW GOTO 30"; -  31 = "WINDOW GOTO 31"; -  32 = "WINDOW GOTO 32"; -  33 = "WINDOW GOTO 33"; -  34 = "WINDOW GOTO 34"; -  35 = "WINDOW GOTO 35"; -  36 = "WINDOW GOTO 36"; -  37 = "WINDOW GOTO 37"; -  38 = "WINDOW GOTO 38"; -  39 = "WINDOW GOTO 39"; -  40 = "WINDOW GOTO 40"; -  41 = "WINDOW GOTO 41"; -  42 = "WINDOW GOTO 42"; -  43 = "WINDOW GOTO 43"; -  44 = "WINDOW GOTO 44"; -  45 = "WINDOW GOTO 45"; -  46 = "WINDOW GOTO 46"; -  47 = "WINDOW GOTO 47"; -  48 = "WINDOW GOTO 48"; -  49 = "WINDOW GOTO 49"; -  50 = "WINDOW GOTO 50"; -  51 = "WINDOW GOTO 51"; -  52 = "WINDOW GOTO 52"; -  53 = "WINDOW GOTO 53"; -  54 = "WINDOW GOTO 54"; -  55 = "WINDOW GOTO 55"; -  56 = "WINDOW GOTO 56"; -  57 = "WINDOW GOTO 57"; -  58 = "WINDOW GOTO 58"; -  59 = "WINDOW GOTO 59"; -  60 = "WINDOW GOTO 60"; -  61 = "WINDOW GOTO 61"; -  62 = "WINDOW GOTO 62"; -  63 = "WINDOW GOTO 63"; -  64 = "WINDOW GOTO 64"; -  65 = "WINDOW GOTO 65"; -  66 = "WINDOW GOTO 66"; -  67 = "WINDOW GOTO 67"; -  68 = "WINDOW GOTO 68"; -  69 = "WINDOW GOTO 69"; -  70 = "WINDOW GOTO 70"; -  71 = "WINDOW GOTO 71"; -  72 = "WINDOW GOTO 72"; -  73 = "WINDOW GOTO 73"; -  74 = "WINDOW GOTO 74"; -  75 = "WINDOW GOTO 75"; -  76 = "WINDOW GOTO 76"; -  77 = "WINDOW GOTO 77"; -  78 = "WINDOW GOTO 78"; -  79 = "WINDOW GOTO 79"; -  80 = "WINDOW GOTO 80"; -  81 = "WINDOW GOTO 81"; -  82 = "WINDOW GOTO 82"; -  83 = "WINDOW GOTO 83"; -  84 = "WINDOW GOTO 84"; -  85 = "WINDOW GOTO 85"; -  86 = "WINDOW GOTO 86"; -  87 = "WINDOW GOTO 87"; -  88 = "WINDOW GOTO 88"; -  89 = "WINDOW GOTO 89"; -  90 = "WINDOW GOTO 90"; -  91 = "WINDOW GOTO 91"; -  92 = "WINDOW GOTO 92"; -  93 = "WINDOW GOTO 93"; -  94 = "WINDOW GOTO 94"; -  95 = "WINDOW GOTO 95"; -  96 = "WINDOW GOTO 96"; -  97 = "WINDOW GOTO 97"; -  98 = "WINDOW GOTO 98"; -  99 = "WINDOW GOTO 99"; -}; - -statusbar = { - -  items = { - -    barstart = "{sbstart}"; -    barend = "{sbend}"; - -    topicbarstart = "{topicsbstart}"; -    topicbarend = "{topicsbend}"; - -    time = "{sb $Z}"; -    user = "{sb {sbnickmode $cumode}$N{sbmode $usermode}{sbaway $A}}"; - -    window = "{sb $winref:$tag/$itemname{sbmode $M}}"; -    window_empty = "{sb $winref{sbservertag $tag}}"; - -    prompt = "{prompt $[.15]itemname}"; -    prompt_empty = "{prompt $winname}"; - -    topic = " $topic"; -    topic_empty = " Irssi v$J - http://www.irssi.org"; - -    lag = "{sb Lag: $0-}"; -    act = "{sb Act: $0-}"; -    more = "-- more --"; -  }; - -  default = { - -    window = { - -      disabled = "no"; -      type = "window"; -      placement = "bottom"; -      position = "1"; -      visible = "active"; - -      items = { -        barstart = { priority = "100"; }; -        time = { }; -        user = { }; -        window = { }; -        window_empty = { }; -        lag = { priority = "-1"; }; -        act = { priority = "10"; }; -        more = { priority = "-1"; alignment = "right"; }; -        barend = { priority = "100"; alignment = "right"; }; -      }; -    }; - -    window_inact = { - -      type = "window"; -      placement = "bottom"; -      position = "1"; -      visible = "inactive"; - -      items = { -        barstart = { priority = "100"; }; -        window = { }; -        window_empty = { }; -        more = { priority = "-1"; alignment = "right"; }; -        barend = { priority = "100"; alignment = "right"; }; -      }; -    }; - -    prompt = { - -      type = "root"; -      placement = "bottom"; -      position = "100"; -      visible = "always"; - -      items = { -        prompt = { priority = "-1"; }; -        prompt_empty = { priority = "-1"; }; -        input = { priority = "10"; }; -      }; -    }; - -    topic = { - -      type = "root"; -      placement = "top"; -      position = "1"; -      visible = "always"; - -      items = { -        topicbarstart = { priority = "100"; }; -        topic = { }; -        topic_empty = { }; -        topicbarend = { priority = "100"; alignment = "right"; }; -      }; -    }; -  }; -}; -settings = { -  core = { real_name = "Unknown"; user_name = "alex"; nick = "alex"; }; -  "fe-text" = { actlist_sort = "refnum"; }; -}; diff --git a/dotfiles/tmux.conf b/dotfiles/tmux.conf index 9744289..de6c854 100644 --- a/dotfiles/tmux.conf +++ b/dotfiles/tmux.conf @@ -1,151 +1,64 @@ -# Start window numbering at 1 -set -g base-index 1 +################################### +# # +# Custom Binds # +# # +################################### -# Use 256 colors -# Note, this broke my colors in zsh, so off for now01/25/15 -set -g default-terminal "screen-256color" +# Rebind tmux prefix to to match vim -# COLOUR (Solarized 256) -# default statusbar colors -set-option -g status-bg colour235 #base02 -set-option -g status-fg colour136 #yellow -set-option -g status-attr default - -# default window title colors -set-window-option -g window-status-fg colour244 #base0 -set-window-option -g window-status-bg default -#set-window-option -g window-status-attr dim - -# active window title colors -set-window-option -g window-status-current-fg colour166 #orange -set-window-option -g window-status-current-bg default -#set-window-option -g window-status-current-attr bright - -# pane border -set-option -g pane-border-fg colour235 #base02 -set-option -g pane-active-border-fg colour240 #base01 - -# message text -set-option -g message-bg colour235 #base02 -set-option -g message-fg colour166 #orange - -# pane number display -set-option -g display-panes-active-colour colour33 #blue -set-option -g display-panes-colour colour166 #orange - -# clock -set-window-option -g clock-mode-colour colour64 #green - -# remap prefix to Ctrl+A -set -g prefix C-a unbind C-b -bind-key C-a send-prefix - -# set up clock -set -g clock-mode-style 12 - -# renumber windows after removal -set -g renumber-windows on - -# keep more history -set -g history-limit 10000 - -# no escape delay -set -sg escape-time 0 - -unbind % -bind | split-window -h -bind - split-window -v - -bind -n M-Left select-pane -L -bind -n M-Right select-pane -R -bind -n M-Up select-pane -U -bind -n M-Down select-pane -D - -setw -g monitor-activity on -setw -g visual-activity on - -# mouse -setw -g mode-mouse on -set-option -g mouse-select-pane on -set-option -g mouse-select-window on - -bind Z source-file ~/.tmux/dev -bind Q source-file ~/.tmux/devEditors -bind A source-file ~/.tmux/devMinimal - -# use vim keybindings in copy mode -setw -g mode-keys vi -bind-key -t vi-copy v begin-selection -bind-key -t vi-copy y copy-pipe "reattach-to-user-namespace pbcopy" +set -g prefix C-Space +bind Space send-prefix -unbind -t vi-copy Enter -bind-key -t vi-copy Enter copy-pipe "reattach-to-user-namespace pbcopy" +# Once the prefix is active these binds will matter +# and take you to copy mode. -unbind -t vi-copy Space -bind -t vi-copy Space jump-again +bind Space copy-mode +bind C-Space copy-mode -bind y run 'tmux save-buffer - | reattach-to-user-namespace pbcopy ' -bind C-y run 'tmux save-buffer - | reattach-to-user-namespace pbcopy ' +# Rebind window splitting +# j and l split vertically and horizontally, respectively +bind j split-window -v +bind C-j split-window -v -# See this blog post for additional detail: -# http://robots.thoughtbot.com/post/53022241323/seamlessly-navigate-vim-and-tmux-splits -bind -n C-h run "(tmux display-message -p '#{pane_current_command}' | grep -iqE '(^|\/)vim$' && tmux send-keys C-h) || tmux select-pane -L" -bind -n C-j run "(tmux display-message -p '#{pane_current_command}' | grep -iqE '(^|\/)vim$' && tmux send-keys C-j) || tmux select-pane -D" -bind -n C-k run "(tmux display-message -p '#{pane_current_command}' | grep -iqE '(^|\/)vim$' && tmux send-keys C-k) || tmux select-pane -U" -bind -n C-l run "(tmux display-message -p '#{pane_current_command}' | grep -iqE '(^|\/)vim$' && tmux send-keys C-l) || tmux select-pane -R" -bind -n C-\ run "(tmux display-message -p '#{pane_current_command}' | grep -iqE '(^|\/)vim$' && tmux send-keys 'C-\\') || tmux select-pane -l" +bind l split-window -h +bind C-l split-window -h -# Secondary binding for C-l to retain redraw -bind C-l send-keys 'C-l' +# Smart pane switching with awareness of vim splits +# This is the tmux side of the vim-tmux-navigator plugin +is_vim='echo "#{pane_current_command}" | grep -iqE "(^|\/)g?(view|n?vim?)(diff)?$"' +bind -n C-h if-shell "$is_vim" "send-keys C-h" "select-pane -L" +bind -n C-j if-shell "$is_vim" "send-keys C-j" "select-pane -D" +bind -n C-k if-shell "$is_vim" "send-keys C-k" "select-pane -U" +bind -n C-l if-shell "$is_vim" "send-keys C-l" "select-pane -R" +bind -n C-\ if-shell "$is_vim" "send-keys C-\\" "select-pane -l" -# Easy rotating of panes -bind C-k swap-pane -U -set -g display-panes-time 600 +# Vim keybinds so copy mode behaves more like vim +bind-key -t vi-copy 'v' begin-selection +bind-key -t vi-copy 'y' copy-selection -# status bar stuff -set -g status-left-length 40 +# Vim keybind so that paste is done more naturally instead of with ] +bind p paste-buffer -# Simplify status bar display. -set -g status-left '[#S]' -set -g status-right "%I:%M %p " -# set -g status-right "#[fg=red][44%%]#[default]   -  %I:%M %p " -# Dismiss current pane to background window -bind b break-pane -d -bind-key j command-prompt -p "join pane from: "  "join-pane -h -s '%%'" +################################### +# # +# Custom Settings # +# # +################################### -# more intuitive keybindings for splitting -bind \ split-window -h -c "#{pane_current_path}" -bind - split-window -v -c "#{pane_current_path}" +# Enable vi-like keybindings +set-window-option -g mode-keys vi -# Easy return to Vim from tmux runner zoom runner pane -bind C-p run "(tmux display-message -p '#{pane_current_command}' | grep -iqE '(^|\/)vim$' && tmux send-keys ':VtrZoomRunnerPane' 'C-m') || tmux send-keys 'C-c' && tmux select-pane -l" -# Make C-j display a selectable list of sessions -bind C-j choose-tree -# Keep window names as I set them -setw -g automatic-rename off -# reload tmux.conf with prefix-r -bind C-r source-file ~/.tmux.conf \; display "Reloaded ~/.tmux.conf" +set -g mode-mouse on +set -g mouse-resize-pane on +set -g mouse-select-pane on +set -g mouse-select-window on +set-window-option -g mode-mouse on -# bind resizing of panes to H,J,K,L (resizes by steps of 10 lines/columns) -# # Note, bindings are repeatable (within the default 500ms time limit) so that -# # you don't have to keep entering the prefix. (Prefix-H-H-H resizes by 15) -bind -n S-Left resize-pane -L 2 -bind -n S-Right resize-pane -R 2 -bind -n S-Down resize-pane -D 1 -bind -n S-Up resize-pane -U 1 -unbind -n C-Left -unbind -n C-Down -unbind -n C-Up -unbind -n C-Right -bind -n C-Left resize-pane -L 10 -bind -n C-Right resize-pane -R 10 -bind -n C-Down resize-pane -D 5 -bind -n C-Up resize-pane -U 5 diff --git a/dotfiles/vimrc b/dotfiles/vimrc index 82e5900..e04070d 100644 --- a/dotfiles/vimrc +++ b/dotfiles/vimrc @@ -1,201 +1,163 @@ -filetype on +set encoding=utf-8 +set fileencoding=utf-8 +set nocompatible +filetype off + + +" set the runtime path to include vundle and initialize + +" windows +set rtp+=C:/Users/t0rus/vimfiles/bundle/Vundle.vim + +" linux set rtp+=~/.vim/bundle/Vundle.vim + call vundle#begin() +" let Vundle manage Vundle, required Plugin 'gmarik/Vundle.vim' -Plugin 'tpope/vim-sensible' +" Solarized theme +Plugin 'altercation/vim-colors-solarized' + +" Syntastic +Plugin 'scrooloose/syntastic' + +" Rust +Plugin 'rust-lang/rust.vim' + +" Coffeescript support +Plugin 'kchmck/vim-coffee-script' + +" Git Plugin 'tpope/vim-fugitive' + +" NERD Commenter +Plugin 'scrooloose/nerdcommenter' + +" Surround - Easy changing of quotes and stuff Plugin 'tpope/vim-surround' -Plugin 'tmhedberg/matchit' -Plugin 'scrooloose/nerdtree' -Plugin 'scrooloose/syntastic' + + +" Ctrlp full path fuzzy file finder Plugin 'kien/ctrlp.vim' -Plugin 'rking/ag.vim' -Plugin 'blarghmatey/split-expander' -Plugin 'sjl/vitality.vim' -Plugin 'thoughtbot/vim-rspec' -Plugin 'tpope/vim-bundler' -Plugin 'airblade/vim-gitgutter' -Plugin 'tpope/vim-endwise' -Plugin 'kana/vim-textobj-user' -Plugin 'nelstrom/vim-textobj-rubyblock' -Plugin 'vim-scripts/tComment' -Plugin 'tomtom/tlib_vim' -Plugin 'vim-ruby/vim-ruby' -Plugin 'tpope/vim-haml' -Plugin 'Lokaltog/vim-easymotion' -Plugin 'dkprice/vim-easygrep' -Plugin 'christoomey/vim-tmux-navigator' -Plugin 'takac/vim-hardtime' -Plugin 'slim-template/vim-slim' -Plugin 'wting/rust.vim' - -Plugin 'myusuf3/numbers.vim' - -Plugin 'kikijump/tslime.vim' -Plugin 'altercation/vim-colors-solarized' -Plugin 'bling/vim-airline' -Plugin 'kchmck/vim-coffee-script' -Plugin 'tpope/vim-rails' +" Ack from vim +Plugin 'mileszs/ack.vim' -call vundle#end() -filetype plugin indent on +if !has("win32") || !has("win16") + "Code Completion + Plugin 'Valloric/YouCompleteMe' -syntax enable -set list listchars=tab:»·,trail:· -let g:solarized_termcolors=256 -let g:solarized_termtrans=1 -let g:solarized_degrade=0 -let g:solarized_visibility="normal" -set background=dark -colorscheme solarized -set laststatus=2 -let g:airline#extensions#tabline#enabled=1 + " Tree explorer + "Instead of forcing vim to start Nerdtree just do it manually + " autocmd vimenter * NERDTree " make NERDTree come up automatically + " on vim start -"set directory=$HOME/.vim/swapfiles// + Plugin 'scrooloose/nerdtree' -let g:syntastic_ruby_checkers = ['mri'] -let g:syntastic_enable_highlighting=0 -" Maybe fix slim -autocmd FileType slim setlocal foldmethod=indent -autocmd BufNewFile,BufRead *.slim set filetype=slim + " Make Vim play nice with tmux + " Use + " to move between window panes in tmux or vim + Plugin 'christoomey/vim-tmux-navigator' +endif -" Fix rust -autocmd FileType rust setlocal shiftwidth=2 tabstop=2 -autocmd BufRead,BufNewFile *.rs set filetype=rust -" Fix coffee -autocmd BufNewFile,BufRead *.coffee set filetype=coffee +" Markdown +Plugin 'godlygeek/tabular' +Plugin 'plasticboy/vim-markdown' -" Fix swap files -set directory=$HOME/.vim/swapfiles// +" Jade - Express templating +Plugin 'digitaltoad/vim-jade' -" Easier split navigation -nnoremap -nnoremap -nnoremap -nnoremap +" Stylus highlighting +Plugin 'wavded/vim-stylus' -" Easier window movement -nnoremap j -nnoremap k -nnoremap h -nnoremap l +" Haskell +Plugin 'raichoo/haskell-vim' -" Remap colon to semicolon -nnoremap ; : +" end plugin list +call vundle#end() +filetype plugin indent on -" Split below and right -set splitbelow -set splitright -" Persistent undo -set undodir=~/.vim/undo/ -set undofile -set undolevels=1000 -set undoreload=10000 +" Solarized Dark +syntax enable +set background=dark +colorscheme solarized +" let g:solarized_termcolors=256 " Better terminal colors + +" Toggle solarized scheme +" call togglebg#map("") + + +" Standard variables +set expandtab " tabs to spaces +set tabstop=2 " spaces entered when tab key is pressed +set shiftwidth=2 " spaces entered for indentation +set number " Line numbering +set backspace=indent,eol,start " Make backspacing work right +set clipboard=unnamed " Share system clipboard +set eol " End of line at bottom of file +set shiftround +set hlsearch " Highlight matches in search +set incsearch " Search as characters are entered +set list +set list listchars=tab:»·,trail:· + +" custom functons +function! NumberToggle() + if(&relativenumber == 1) + set norelativenumber + set number + else + set relativenumber + endif +endfunc + + +" Autocmds + +" Stripping trailing whitespace on save +autocmd BufWritePre * :%s/\s\+$//e -" Numbers -set number -set numberwidth=3 +" Fix rust +autocmd FileType rust setlocal shiftwidth=2 tabstop=2 +autocmd BufRead,BufNewFile *.rs set filetype=rust -" Case stuff -set smartcase -set ignorecase -set noantialias -set nocompatible -set backspace=2 -set nobackup -set ruler -set showcmd - -" Search -set incsearch -set hlsearch -set autowrite - -" Highlight characters over 80 col -highlight LineTooLong ctermbg=darkgray ctermfg=black -call matchadd('LineTooLong', '\%81v', 100) - " -" Leader -let mapleader = " " -" Toggle nerdtree with F10 -map :NERDTreeToggle - -" Current file in nerdtree -map :NERDTreeFind - -" Reduce timeout after is recvd. This is only a good idea on fast links. -set ttimeout -set ttimeoutlen=20 -set notimeout - -" Edit another file in the same directory as the current file -" uses expression to extract path from current file's path -map e :e =expand("%:p:h") . '/' -map s :split =expand("%:p:h") . '/' -map v :vnew =expand("%:p:h") . '/' - -" highlight vertical column of cursor -au WinLeave * set nocursorline nocursorcolumn -au WinEnter * set cursorline -set cursorline - -"key to insert mode with paste using F2 key -map :set pastei -" Leave paste mode on exit -au InsertLeave * set nopaste - -" Command aliases -cabbrev tp tabprev -cabbrev tn tabnext -cabbrev tf tabfirst -cabbrev tl tablast - -" Fuzzy finder: ignore stuff that can't be opened, and generated files -let g:fuzzy_ignore = "*.png;*.PNG;*.JPG;*.jpg;*.GIF;*.gif;vendor/**;coverage/**;tmp/**;rdoc/**" - -" Cursor highlight -hi CursorLineNr guifg=#050505 - -" Airline -let g:airline_theme='solarized' -set t_Co=256 - -" Use The Silver Searcher https://github.com/ggreer/the_silver_searcher -if executable('ag') - " Use Ag over Grep - set grepprg=ag\ --nogroup - let g:grep_cmd_opts = '--line-numbers --noheading' - - " Use ag in CtrlP for listing files. Lightning fast and respects .gitignore - let g:ctrlp_user_command = 'ag %s -l -g ""' - - " ag is fast enough that CtrlP doesn't need to cache - let g:ctrlp_use_caching = 0 -endif +" Hotkeys +" Note noremap is a normal mode non-recursive mapping +" nnoremap and nmap make the bind only work in normal mode + +let mapleader=" " +map t :NERDTreeToggle +nnoremap r :call NumberToggle() + +" This one maps F5 to delete all trailing whitespace +nnoremap :let _s=@/:%s/\s\+$//e:let @/=_s:nohl -" bind K to search word under cursor -nnoremap K :Ag "\b\b":cw +" Pressing enter in command mode clears the current search highlighting until +" the next search. +nnoremap :noh -" Softtabs, 2 spaces -set tabstop=2 -set shiftwidth=2 -set expandtab +" ctrlp hotkeys +let g:ctrlp_map='' +let g:ctrlp_cmd='CtrlP' -let g:rspec_command = 'call Send_to_Tmux("bundle exec rspec {spec}\n")' -let g:rspec_runner = "os_x_iterm" +" ctrlp configuration +set wildignore+=*/tmp/*,*.so,*.swp,*.zip " MacOSX/Linux +set wildignore+=*\\tmp\\*,*.swp,*.zip,*.exe " Windows -" RSpec.vim mappings -map t :call RunCurrentSpecFile() -map s :call RunNearestSpec() -map l :call RunLastSpec() -map a :call RunAllSpecs() +let g:ctrlp_working_path_mode='ra' + +" Highlight any line with ErrorMsg that goes over 120 characters +if exists('+colorcolumn') + set colorcolumn=120 +else + au BufWinEnter * let w:m2=matchadd('ErrorMsg', '\%>80v.\+', -1) +endif diff --git a/dotfiles/zshrc b/dotfiles/zshrc index f7f68ae..a5909fb 100644 --- a/dotfiles/zshrc +++ b/dotfiles/zshrc @@ -1,66 +1,62 @@ -# Get the current git branch -parse_git_branch() { +# Path to your oh-my-zsh installation. +#Portable across both mac and linux now +export ZSH=~/.oh-my-zsh +export LC_ALL=en_US.UTF-8 +export LANG=en_US.UTF-8 +export VISUAL=vim +export EDITOR="$VISUAL" +export TERM=xterm-256color + +parse_git_branch(){ ref=$(git symbolic-ref HEAD 2> /dev/null | cut -d'/' -f3) if [ -n "$ref" ]; then echo "[$ref]"; fi } -# Lines configured by zsh-newuser-install HISTFILE=~/.histfile HISTSIZE=10000 SAVEHIST=10000 -bindkey -v -# End of lines configured by zsh-newuser-install -# The following lines were added by compinstall -zstyle :compinstall filename '/home/alex/.zshrc' - -autoload bashcompinit -bashcompinit - -autoload -Uz compinit -compinit -# End of lines added by compinstall -# set up colors so tmux doesn't die -export TERM=xterm-256color - -# Set up theme -ZSH_THEME="doubleend" -# Set up plugins -plugins=(git) +# Set name of the theme to load. +# Look in ~/.oh-my-zsh/themes/ +# Optionally, if you set this to "random", it'll load a random theme each +# time that oh-my-zsh is loaded. +ZSH_THEME="juanghurtado" -# Make sure prompt is set to autoload autoload -U promptinit promptinit +plugins=(git brew npm coffee) -export EDITOR="vim" +# User configuration -# Git town -export PATH=/home/alex/packages/git-town/src/:$PATH -export MANPATH=/home/alex/packages/git-town/man/:$MANPATH +export PATH="/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin" +# export MANPATH="/usr/local/man:$MANPATH" -export PATH=/home/alex/.nvm/versions/node/v0.12.1/bin/:$PATH -# Fix rust (needs this exported) -export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/local/lib +# Preferred editor for local and remote sessions +# if [[ -n $SSH_CONNECTION ]]; then +# export EDITOR='vim' +# else +# export EDITOR='mvim' +# fi -# nvm -source ~/.nvm/nvm.sh -nvm use 0.12 1> /dev/null +# Compilation flags +# export ARCHFLAGS="-arch x86_64" -# rbenv -export PATH="$HOME/.rbenv/bin:$PATH" -eval "$(rbenv init -)" +# ssh +# export SSH_KEY_PATH="~/.ssh/dsa_id" -# python -export PYTHON=python2.7 +# Set personal aliases, overriding those provided by oh-my-zsh libs, +# plugins, and themes. Aliases can be placed here, though oh-my-zsh +# users are encouraged to define aliases within the ZSH_CUSTOM folder. +# For a full list of active aliases, run `alias`. +# +# Example aliases +# alias zshconfig="mate ~/.zshrc" -# Karma -export CHROME_BIN=google-chrome-stable - -# Maybe fix jave applets & xmonad -_JAVA_AWT_WM_NONREPARENTING=1 +export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting +. ~/.opam/opam-init/init.sh > /dev/null 2> /dev/null || true # Set up colors autoload -U colors && colors @@ -68,6 +64,7 @@ autoload -U colors && colors # Set up custom prompt setopt PROMPT_SUBST -RPROMPT='%{$fg[yellow]%}$(parse_git_branch)%{$reset_color%}' +RPROMPT="%{$fg[yellow]%}${vcs_info_msg_0_}%{$reset_color%}" + PROMPT="%{$fg[white]%}┌[%{$fg[yellow]%}%n%{$reset_color%}@%{$fg[cyan]%}%m%{$reset_color%}]─[%{$fg[green]%}%d%{$reset_color%}] └─╼ " diff --git a/scripts/lemonbar/my_bar.sh b/scripts/lemonbar/my_bar.sh index e49433f..2c085b4 100755 --- a/scripts/lemonbar/my_bar.sh +++ b/scripts/lemonbar/my_bar.sh @@ -1,2 +1,2 @@ back="#00000000" -lemonbar -f "-benis-uushi-medium-r-normal--11-90-75-75-p-58-iso10646-1" -B "black" -g "400x14+2480+1" +lemonbar -f "-benis-uushi-medium-r-normal--11-90-75-75-p-58-iso10646-1" -B "black" -g "800x14+1118+1"