diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..1ce5c11 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "dotbot"] + path = dotbot + url = https://github.com/anishathalye/dotbot diff --git a/.nvimrc b/.nvimrc deleted file mode 120000 index 1490f7a..0000000 --- a/.nvimrc +++ /dev/null @@ -1 +0,0 @@ -.vimrc \ No newline at end of file diff --git a/.vimrc b/.vimrc deleted file mode 100644 index de19eaa..0000000 --- a/.vimrc +++ /dev/null @@ -1,119 +0,0 @@ -" Note: Skip initialization for vim-tiny or vim-small. if 0 | endif - -if has('vim_starting') - if &compatible - set nocompatible " Be iMproved - endif - - " Required: - set runtimepath+=~/.vim/bundle/neobundle.vim/ -endif - -" Required: -call neobundle#begin(expand('~/.vim/bundle/')) - -" Let NeoBundle manage NeoBundle -" Required: -NeoBundleFetch 'Shougo/neobundle.vim' - -" My Bundles here: -" Refer to |:NeoBundle-examples|. -" Note: You don't set neobundle setting in .gvimrc! - -NeoBundle 'tpope/vim-sensible' -NeoBundle 'easymotion/vim-easymotion' -NeoBundle 'terryma/vim-multiple-cursors' -NeoBundle 'kchmck/vim-coffee-script' -NeoBundle 'haya14busa/incsearch.vim' -NeoBundle 'tpope/vim-fugitive' -NeoBundle 'wavded/vim-stylus' -NeoBundle 'scrooloose/syntastic' -NeoBundle 'godlygeek/tabular' -NeoBundle 'nathanaelkane/vim-indent-guides' -NeoBundle 'azumakuniyuki/vim-colorschemes' -NeoBundle 'junegunn/goyo.vim' -NeoBundle 'chikatoike/sourcemap.vim' -NeoBundle 'amix/vim-zenroom2' -NeoBundle 'tpope/vim-commentary' -NeoBundle 'Valloric/YouCompleteMe' -NeoBundle 'junegunn/seoul256.vim' -NeoBundle 'powerline/powerline' -NeoBundle 'jnurmine/Zenburn' -NeoBundle 'jscappini/material.vim' -NeoBundle 'altercation/solarized' -NeoBundle 'digitaltoad/vim-jade' - - -call neobundle#end() -" cosmetics -set background=dark -colorscheme seoul256 - -" Required: -filetype plugin indent on - -" If there are uninstalled bundles found on startup, -" this will conveniently prompt you to install them. -NeoBundleCheck - -" UI -filetype off - - - -" colorschemes not recognized by indent guides, so color them manually -" let g:indent_guides_auto_colors = 0 -" autocmd VimEnter,Colorscheme * :hi IndentGuidesOdd guibg=none ctermbg=30 -" autocmd VimEnter,Colorscheme * :hi IndentGuidesEven guibg=none ctermbg=0 - -" syntax stuff -filetype plugin on -syntax on -autocmd FileType * setlocal nofoldenable -set nofoldenable - -" Bindings -imap :updatea -map :update - -" Uppercase to EOL -nnoremap Y y$ -nnoremap C c$ -nnoremap D d$ - -" Defuse unnerving keybindings -nnoremap K k -nnoremap Q q - - -" Configuration -set clipboard=unnamed -set autochdir -autocmd BufNewFile,BufRead *.coffee set filetype=coffee - -" size of a hard tabstop -set tabstop=4 -" size of an "indent" -set shiftwidth=4 -" a combination of spaces and tabs are used to simulate tab stops at a width -" other than the (hard)tabstop -set softtabstop=4 -" make "tab" insert indents instead of tabs at the beginning of a line -set smarttab - -" always uses spaces instead of tab characters -set expandtab - -let g:indent_guides_enable_on_vim_startup = 1 -set listchars=precedes:⠐ - - - -" backups & swaps -set backupdir=~/.vim/backups// -set directory=~/.vim/swaps// - -" Ignore case in searches excepted if an uppercase letter is used -set smartcase -set relativenumber -set number diff --git a/Colemak.keylayout b/Colemak.keylayout new file mode 100644 index 0000000..94a3b1e --- /dev/null +++ b/Colemak.keylayout @@ -0,0 +1,1819 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/InputMono/InputMono-Black.ttf b/InputMono/InputMono-Black.ttf new file mode 100644 index 0000000..bc9220a Binary files /dev/null and b/InputMono/InputMono-Black.ttf differ diff --git a/InputMono/InputMono-BlackItalic.ttf b/InputMono/InputMono-BlackItalic.ttf new file mode 100644 index 0000000..a2fac85 Binary files /dev/null and b/InputMono/InputMono-BlackItalic.ttf differ diff --git a/InputMono/InputMono-Bold.ttf b/InputMono/InputMono-Bold.ttf new file mode 100644 index 0000000..62e218b Binary files /dev/null and b/InputMono/InputMono-Bold.ttf differ diff --git a/InputMono/InputMono-BoldItalic.ttf b/InputMono/InputMono-BoldItalic.ttf new file mode 100644 index 0000000..9cbbb5e Binary files /dev/null and b/InputMono/InputMono-BoldItalic.ttf differ diff --git a/InputMono/InputMono-ExtraLight.ttf b/InputMono/InputMono-ExtraLight.ttf new file mode 100644 index 0000000..3102a9a Binary files /dev/null and b/InputMono/InputMono-ExtraLight.ttf differ diff --git a/InputMono/InputMono-ExtraLightItalic.ttf b/InputMono/InputMono-ExtraLightItalic.ttf new file mode 100644 index 0000000..c53f237 Binary files /dev/null and b/InputMono/InputMono-ExtraLightItalic.ttf differ diff --git a/InputMono/InputMono-Italic.ttf b/InputMono/InputMono-Italic.ttf new file mode 100644 index 0000000..e11651b Binary files /dev/null and b/InputMono/InputMono-Italic.ttf differ diff --git a/InputMono/InputMono-Light.ttf b/InputMono/InputMono-Light.ttf new file mode 100644 index 0000000..b0f810d Binary files /dev/null and b/InputMono/InputMono-Light.ttf differ diff --git a/InputMono/InputMono-LightItalic.ttf b/InputMono/InputMono-LightItalic.ttf new file mode 100644 index 0000000..01f64a4 Binary files /dev/null and b/InputMono/InputMono-LightItalic.ttf differ diff --git a/InputMono/InputMono-Medium.ttf b/InputMono/InputMono-Medium.ttf new file mode 100644 index 0000000..0d488bf Binary files /dev/null and b/InputMono/InputMono-Medium.ttf differ diff --git a/InputMono/InputMono-MediumItalic.ttf b/InputMono/InputMono-MediumItalic.ttf new file mode 100644 index 0000000..805b387 Binary files /dev/null and b/InputMono/InputMono-MediumItalic.ttf differ diff --git a/InputMono/InputMono-Regular.ttf b/InputMono/InputMono-Regular.ttf new file mode 100644 index 0000000..c19c287 Binary files /dev/null and b/InputMono/InputMono-Regular.ttf differ diff --git a/InputMono/InputMono-Thin.ttf b/InputMono/InputMono-Thin.ttf new file mode 100644 index 0000000..93e9214 Binary files /dev/null and b/InputMono/InputMono-Thin.ttf differ diff --git a/InputMono/InputMono-ThinItalic.ttf b/InputMono/InputMono-ThinItalic.ttf new file mode 100644 index 0000000..1c6fb3b Binary files /dev/null and b/InputMono/InputMono-ThinItalic.ttf differ diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..255d937 --- /dev/null +++ b/Makefile @@ -0,0 +1,99 @@ +installNodeModules: + sudo chown -R ${USER} /usr/local + git config --global url."https://".insteadOf git:// + npm i roots -g + npm i coffee-script -g + git config --global --unset url."https://".insteadOf git:// + + +installHyperdock: + rm -rf ~/getmacapps_temp + mkdir ~/getmacapps_temp + cd ~/getmacapps_temp + + # Installing Hyperdock + if [ ! -d "/Applications/HyperDock.app" ]; then \ + curl -L -O "https://bahoom.com/hyperdock/HyperDock.dmg"; \ + hdiutil mount -nobrowse Hyperdock.dmg; \ + cp -R "/Volumes/HyperDock/HyperDock.prefpane" ~/Library/PreferencePanes/HyperDock.prefpane; \ + hdiutil unmount "/Volumes/HyperDock"; \ + rm HyperDock.dmg; \ + fi + +installOsxSoftware: + # todo + # Hyperdock + # Atom + + rm -rf ~/getmacapps_temp + mkdir ~/getmacapps_temp + cd ~/getmacapps_temp + + + # Installing Chrome + if [ ! -d "/Applications/Google Chrome.app" ]; then \ + curl -L -O "https://dl.google.com/chrome/mac/stable/GGRO/googlechrome.dmg"; \ + hdiutil mount -nobrowse googlechrome.dmg; \ + cp -R "/Volumes/Google Chrome/Google Chrome.app" /Applications; \ + hdiutil unmount "/Volumes/Google Chrome"; \ + rm googlechrome.dmg; \ + fi + + + # Installing Keka + if [ ! -d "/Applications/Keka.app" ]; then \ + curl -L -o Keka.dmg "http://download.kekaosx.com/"; \ + hdiutil mount -nobrowse Keka.dmg; \ + cp -R "/Volumes/Keka/Keka.app" /Applications; \ + hdiutil unmount "/Volumes/Keka"; \ + rm Keka.dmg; \ + fi + + + cd .. + rm -rf ~/getmacapps_temp + + # Installing brew and apps + /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" + brew install --HEAD https://raw.githubusercontent.com/mawww/kakoune/master/contrib/kakoune.rb + brew install tmux + brew install the_platinum_searcher + brew install fasd + brew install zsh + brew install node + + # Installing additional resources + if [ ! -d "~/Library/Fonts/InputMono-Light.ttf" ]; then \ + cp InputMono/InputMono-Light.ttf ~/Library/Fonts/InputMono-Light.ttf; \ + fi + + # Installing colemak + if [ ! -d "~/Library/Keyboard Layouts/Colemak.keylayout" ]; then \ + cp Colemak.keylayout ~/Library/Keyboard\ Layouts/Colemak.keylayout; \ + fi + + +installSoftware: + # Install oh-my-zsh + sh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)" + # install tpm. inside tmux press prefix + I to install plugins + if [ -d "~/.tmux/plugins/tpm" ]; then \ + git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm; \ + fi + + # Install OSX software + make installOsxSoftware + + # Install Node modules + make installNodeModules + + # Install oh-my-zsh + if [ -d "~/.oh-my-zsh" ]; then \ + curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh > installZsh.sh; \ + sh installZsh.sh; \ + rm installZsh.sh; \ + fi + + # bootstrap configuration + sudo ./install + diff --git a/bootstrap.sh b/bootstrap.sh deleted file mode 100644 index 8463999..0000000 --- a/bootstrap.sh +++ /dev/null @@ -1,41 +0,0 @@ -BUNDLE_DIR=~/.vim/bundle -INSTALL_DIR=$BUNDLE_DIR/neobundle.vim - -# alias vim configs -rm ~/.*vimrc -ln -s ~/dotfiles/.vimrc ~/.vimrc -ln -s ~/dotfiles/.vimrc ~/.nvimrc - -#link viminfo -sudo rm ~/.viminfo -sudo rm ~/.nviminfo -ln -s ~/.viminfo ~/.nviminfo - -#create vim folders -mkdir -p ~/.vim/backups -mkdir -p ~/.vim/swaps - -# link directories -rm -rf ~/.nvim -ln -s ~/.vim ~/.nvim - -# install neobundle -rm -rf $INSTALL_DIR -git clone https://github.com/Shougo/neobundle.vim $INSTALL_DIR - -# add zshrc -rm ~/.zshrc -ln -s ~/dotfiles/.zshrc ~/.zshrc - -# link .tmux.conf -rm ~/.tmux.conf -ln -s ~/dotfiles/.tmux.conf ~/.tmux.conf - -# Download z.sh -rm -r ~/shellplugins -mkdir ~/shellplugins -curl https://raw.githubusercontent.com/rupa/z/master/z.sh > ~/shellplugins/z.sh - -# global gitignore -git config --global core.excludesfile '~/.gitignore' -ln -s ~/dotfiles/.gitignore ~/.gitignore diff --git a/com.apple.Terminal.plist b/com.apple.Terminal.plist new file mode 100644 index 0000000..05d22c2 Binary files /dev/null and b/com.apple.Terminal.plist differ diff --git a/dotbot b/dotbot new file mode 160000 index 0000000..0618bc7 --- /dev/null +++ b/dotbot @@ -0,0 +1 @@ +Subproject commit 0618bc70cc98c93cd2faa505585bdd093338f5be diff --git a/.gitignore b/gitignore similarity index 100% rename from .gitignore rename to gitignore diff --git a/install b/install new file mode 100755 index 0000000..b1baa33 --- /dev/null +++ b/install @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +set -e + +CONFIG="install.conf.yaml" +DOTBOT_DIR="dotbot" + +DOTBOT_BIN="bin/dotbot" +BASEDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" + +cd "${BASEDIR}" +git submodule update --init --recursive "${DOTBOT_DIR}" + +"${BASEDIR}/${DOTBOT_DIR}/${DOTBOT_BIN}" -d "${BASEDIR}" -c "${CONFIG}" "${@}" diff --git a/install.conf.yaml b/install.conf.yaml new file mode 100644 index 0000000..0a9ca76 --- /dev/null +++ b/install.conf.yaml @@ -0,0 +1,26 @@ +- defaults: + link: + relink: true + +- clean: ['~'] + +- link: + ~/.tmux.conf: tmux.conf + ~/.zshrc: + force: true + path: zshrc + ~/.gitignore: gitignore + ~/.config/kak/kakrc: kakrc + ~/Library/Preferences/com.apple.Terminal.plist: + force: true + path: com.apple.Terminal.plist + ~/Library/Preferences/org.pqrs.Karabiner.plist: + force: true + path: org.pqrs.Karabiner.plist + ~/Library/Preferences/org.pqrs.Seil.plist: + force: true + path: org.pqrs.Seil.plist + + +- shell: + - git config --global core.excludesfile ~/.gitignore diff --git a/kakrc b/kakrc index cf006f0..16405da 100644 --- a/kakrc +++ b/kakrc @@ -2,6 +2,6 @@ hook global WinCreate .* %{addhl number_lines} hook global WinCreate .* %{addhl show_whitespaces} -hook global WinCreate .* %{set global indentwidth 4} -hook global WinCreate .* %{set global tabstop 4} +hook global WinCreate .* %{set global indentwidth 2} +hook global WinCreate .* %{set global tabstop 2} hook global WinCreate .* %{hook window InsertChar \t %{ exec -draft h@}} diff --git a/org.pqrs.Karabiner.plist b/org.pqrs.Karabiner.plist new file mode 100644 index 0000000..fcefb32 Binary files /dev/null and b/org.pqrs.Karabiner.plist differ diff --git a/org.pqrs.Seil.plist b/org.pqrs.Seil.plist new file mode 100644 index 0000000..ac6b583 Binary files /dev/null and b/org.pqrs.Seil.plist differ diff --git a/.tmux.conf b/tmux.conf similarity index 95% rename from .tmux.conf rename to tmux.conf index 57097a7..4a2cfc2 100644 --- a/.tmux.conf +++ b/tmux.conf @@ -20,3 +20,4 @@ set -g @plugin 'tmux-plugins/tmux-pain-control' # Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf) run '~/.tmux/plugins/tpm/tpm' +set-option -g default-shell /bin/zsh diff --git a/.zshrc b/zshrc similarity index 99% rename from .zshrc rename to zshrc index 6fe7141..9eecfed 100644 --- a/.zshrc +++ b/zshrc @@ -86,7 +86,6 @@ source $ZSH/oh-my-zsh.sh set -o 'vi' DEFAULT_USER='jan' plugins=(fasd tmux) -source ~/shellplugins/z.sh alias a='fasd -a' # any alias s='fasd -si' # show / search / select