diff --git a/.spacemacs b/.spacemacs new file mode 100644 index 0000000..0909a99 --- /dev/null +++ b/.spacemacs @@ -0,0 +1,363 @@ +;; -*- mode: emacs-lisp -*- +;; This file is loaded by Spacemacs at startup. +;; It must be stored in your home directory. + +(defun dotspacemacs/layers () + "Configuration Layers declaration. +You should not put any user code in this function besides modifying the variable +values." + (setq-default + ;; Base distribution to use. This is a layer contained in the directory + ;; `+distribution'. For now available distributions are `spacemacs-base' + ;; or `spacemacs'. (default 'spacemacs) + dotspacemacs-distribution 'spacemacs + ;; List of additional paths where to look for configuration layers. + ;; Paths must have a trailing slash (i.e. `~/.mycontribs/') + dotspacemacs-configuration-layer-path '() + ;; List of configuration layers to load. If it is the symbol `all' instead + ;; of a list then all discovered layers will be installed. + dotspacemacs-configuration-layers + '( + ;; ---------------------------------------------------------------- + ;; Example of useful layers you may want to use right away. + ;; Uncomment some layer names and press (Vim style) or + ;; (Emacs style) to install them. + ;; ---------------------------------------------------------------- + ;; auto-completion + ;; better-defaults + emacs-lisp + git + github + markdown + org + ;; (shell :variables + ;; shell-default-height 30 + ;; shell-default-position 'bottom) + spell-checking + syntax-checking + version-control + react + javascript + osx + ;; company-mode + spotify + emoji + autocompletion + colors + better-defaults + mu4e + shell + ) + ;; List of additional packages that will be installed without being + ;; wrapped in a layer. If you need some configuration for these + ;; packages, then consider creating a layer. You can also put the + ;; configuration in `dotspacemacs/user-config'. + dotspacemacs-additional-packages '( + auto-complete + ac-js2 + tern-auto-complete + git-gutter+ + circe + evil-smartparens + dockerfile-mode + yaml-mode + ) + ;; A list of packages and/or extensions that will not be install and loaded. + dotspacemacs-excluded-packages '( + company + aggressive-indent-mode + ) + ;; If non-nil spacemacs will delete any orphan packages, i.e. packages that + ;; are declared in a layer which is not a member of + ;; the list `dotspacemacs-configuration-layers'. (default t) + dotspacemacs-delete-orphan-packages t)) + + +(defun dotspacemacs/init () + "Initialization function. +This function is called at the very startup of Spacemacs initialization +before layers configuration. +You should not put any user code in there besides modifying the variable +values." + ;; This setq-default sexp is an exhaustive list of all the supported + ;; spacemacs settings. + (setq-default + ;; If non nil ELPA repositories are contacted via HTTPS whenever it's + ;; possible. Set it to nil if you have no way to use HTTPS in your + ;; environment, otherwise it is strongly recommended to let it set to t. + ;; This variable has no effect if Emacs is launched with the parameter + ;; `--insecure' which forces the value of this variable to nil. + ;; (default t) + dotspacemacs-elpa-https nil + ;; Maximum allowed time in seconds to contact an ELPA repository. + dotspacemacs-elpa-timeout 5 + ;; If non nil then spacemacs will check for updates at startup + ;; when the current branch is not `develop'. (default t) + dotspacemacs-check-for-update t + ;; One of `vim', `emacs' or `hybrid'. Evil is always enabled but if the + ;; variable is `emacs' then the `holy-mode' is enabled at startup. `hybrid' + ;; uses emacs key bindings for vim's insert mode, but otherwise leaves evil + ;; unchanged. (default 'vim) + dotspacemacs-editing-style 'vim + ;; If non nil output loading progress in `*Messages*' buffer. (default nil) + dotspacemacs-verbose-loading nil + ;; Specify the startup banner. Default value is `official', it displays + ;; the official spacemacs logo. An integer value is the index of text + ;; banner, `random' chooses a random text banner in `core/banners' + ;; directory. A string value must be a path to an image format supported + ;; by your Emacs build. + ;; If the value is nil then no banner is displayed. (default 'official) + dotspacemacs-startup-banner 'official + ;; List of items to show in the startup buffer. If nil it is disabled. + ;; Possible values are: `recents' `bookmarks' `projects'. + ;; (default '(recents projects)) + dotspacemacs-startup-lists '(recents projects) + ;; Number of recent files to show in the startup buffer. Ignored if + ;; `dotspacemacs-startup-lists' doesn't include `recents'. (default 5) + dotspacemacs-startup-recent-list-size 5 + ;; Default major mode of the scratch buffer (default `text-mode') + dotspacemacs-scratch-mode 'text-mode + ;; List of themes, the first of the list is loaded when spacemacs starts. + ;; Press T n to cycle to the next theme in the list (works great + ;; with 2 themes variants, one dark and one light) + dotspacemacs-themes '(spacemacs-dark + spacemacs-light + solarized-light + solarized-dark + leuven + monokai + zenburn) + ;; If non nil the cursor color matches the state color in GUI Emacs. + dotspacemacs-colorize-cursor-according-to-state t + ;; Default font. `powerline-scale' allows to quickly tweak the mode-line + ;; size to make separators look not too crappy. + dotspacemacs-default-font '("Source Code Pro" + :size 13 + :weight normal + :width normal + :powerline-scale 1.1) + ;; The leader key + dotspacemacs-leader-key "SPC" + ;; The leader key accessible in `emacs state' and `insert state' + ;; (default "M-m") + dotspacemacs-emacs-leader-key "M-m" + ;; Major mode leader key is a shortcut key which is the equivalent of + ;; pressing ` m`. Set it to `nil` to disable it. (default ",") + dotspacemacs-major-mode-leader-key "," + ;; Major mode leader key accessible in `emacs state' and `insert state'. + ;; (default "C-M-m) + dotspacemacs-major-mode-emacs-leader-key "C-M-m" + ;; These variables control whether separate commands are bound in the GUI to + ;; the key pairs C-i, TAB and C-m, RET. + ;; Setting it to a non-nil value, allows for separate commands under + ;; and TAB or and RET. + ;; In the terminal, these pairs are generally indistinguishable, so this only + ;; works in the GUI. (default nil) + dotspacemacs-distinguish-gui-tab nil + ;; (Not implemented) dotspacemacs-distinguish-gui-ret nil + ;; The command key used for Evil commands (ex-commands) and + ;; Emacs commands (M-x). + ;; By default the command key is `:' so ex-commands are executed like in Vim + ;; with `:' and Emacs commands are executed with ` :'. + dotspacemacs-command-key ":" + ;; If non nil `Y' is remapped to `y$'. (default t) + dotspacemacs-remap-Y-to-y$ t + ;; Name of the default layout (default "Default") + dotspacemacs-default-layout-name "Default" + ;; If non nil the default layout name is displayed in the mode-line. + ;; (default nil) + dotspacemacs-display-default-layout nil + ;; If non nil then the last auto saved layouts are resume automatically upon + ;; start. (default nil) + dotspacemacs-auto-resume-layouts nil + ;; Location where to auto-save files. Possible values are `original' to + ;; auto-save the file in-place, `cache' to auto-save the file to another + ;; file stored in the cache directory and `nil' to disable auto-saving. + ;; (default 'cache) + dotspacemacs-auto-save-file-location 'cache + ;; Maximum number of rollback slots to keep in the cache. (default 5) + dotspacemacs-max-rollback-slots 5 + ;; If non nil then `ido' replaces `helm' for some commands. For now only + ;; `find-files' (SPC f f), `find-spacemacs-file' (SPC f e s), and + ;; `find-contrib-file' (SPC f e c) are replaced. (default nil) + dotspacemacs-use-ido nil + ;; If non nil, `helm' will try to minimize the space it uses. (default nil) + dotspacemacs-helm-resize nil + ;; if non nil, the helm header is hidden when there is only one source. + ;; (default nil) + dotspacemacs-helm-no-header nil + ;; define the position to display `helm', options are `bottom', `top', + ;; `left', or `right'. (default 'bottom) + dotspacemacs-helm-position 'bottom + ;; If non nil the paste micro-state is enabled. When enabled pressing `p` + ;; several times cycle between the kill ring content. (default nil) + dotspacemacs-enable-paste-micro-state nil + ;; Which-key delay in seconds. The which-key buffer is the popup listing + ;; the commands bound to the current keystroke sequence. (default 0.4) + dotspacemacs-which-key-delay 0.4 + ;; Which-key frame position. Possible values are `right', `bottom' and + ;; `right-then-bottom'. right-then-bottom tries to display the frame to the + ;; right; if there is insufficient space it displays it at the bottom. + ;; (default 'bottom) + dotspacemacs-which-key-position 'bottom + ;; If non nil a progress bar is displayed when spacemacs is loading. This + ;; may increase the boot time on some systems and emacs builds, set it to + ;; nil to boost the loading time. (default t) + dotspacemacs-loading-progress-bar t + ;; If non nil the frame is fullscreen when Emacs starts up. (default nil) + ;; (Emacs 24.4+ only) + dotspacemacs-fullscreen-at-startup nil + ;; If non nil `spacemacs/toggle-fullscreen' will not use native fullscreen. + ;; Use to disable fullscreen animations in OSX. (default nil) + dotspacemacs-fullscreen-use-non-native nil + ;; If non nil the frame is maximized when Emacs starts up. + ;; Takes effect only if `dotspacemacs-fullscreen-at-startup' is nil. + ;; (default nil) (Emacs 24.4+ only) + dotspacemacs-maximized-at-startup nil + ;; A value from the range (0..100), in increasing opacity, which describes + ;; the transparency level of a frame when it's active or selected. + ;; Transparency can be toggled through `toggle-transparency'. (default 90) + dotspacemacs-active-transparency 90 + ;; A value from the range (0..100), in increasing opacity, which describes + ;; the transparency level of a frame when it's inactive or deselected. + ;; Transparency can be toggled through `toggle-transparency'. (default 90) + dotspacemacs-inactive-transparency 90 + ;; If non nil unicode symbols are displayed in the mode line. (default t) + dotspacemacs-mode-line-unicode-symbols t + ;; If non nil smooth scrolling (native-scrolling) is enabled. Smooth + ;; scrolling overrides the default behavior of Emacs which recenters the + ;; point when it reaches the top or bottom of the screen. (default t) + dotspacemacs-smooth-scrolling t + ;; If non nil line numbers are turned on in all `prog-mode' and `text-mode' + ;; derivatives. If set to `relative', also turns on relative line numbers. + ;; (default nil) + dotspacemacs-line-numbers nil + ;; If non-nil smartparens-strict-mode will be enabled in programming modes. + ;; (default nil) + dotspacemacs-smartparens-strict-mode nil + ;; Select a scope to highlight delimiters. Possible values are `any', + ;; `current', `all' or `nil'. Default is `all' (highlight any scope and + ;; emphasis the current one). (default 'all) + dotspacemacs-highlight-delimiters 'all + ;; If non nil advises quit functions to keep server open when quitting. + ;; (default nil) + dotspacemacs-persistent-server nil + ;; List of search tool executable names. Spacemacs uses the first installed + ;; tool of the list. Supported tools are `ag', `pt', `ack' and `grep'. + ;; (default '("ag" "pt" "ack" "grep")) + dotspacemacs-search-tools '("ag" "pt" "ack" "grep") + ;; The default package repository used if no explicit repository has been + ;; specified with an installed package. + ;; Not used for now. (default nil) + dotspacemacs-default-package-repository nil + ;; Delete whitespace while saving buffer. Possible values are `all' + ;; to aggressively delete empty line and long sequences of whitespace, + ;; `trailing' to delete only the whitespace at end of lines, `changed'to + ;; delete only whitespace for changed lines or `nil' to disable cleanup. + ;; (default nil) + dotspacemacs-whitespace-cleanup nil + )) + +(defun dotspacemacs/user-init () + "Initialization function for user code. +It is called immediately after `dotspacemacs/init', before layer configuration +executes. + This function is mostly useful for variables that need to be set +before packages are loaded. If you are unsure, you should try in setting them in +`dotspacemacs/user-config' first." + (setenv "NODE_NO_READLINE" "1") + (setq-default json-reformat:indent-width 2) + (setq-default dotspacemacs-configuration-layers + '(shell :variables shell-default-shell 'eshell)) + (setq projectile-switch-project-action 'neotree-projectile-action) + (setq neo-smart-open t) + (setq-default git-magit-status-fullscreen t) + (setq js2-strict-trailing-comma-warning nil) + (setq-default indent-tabs-mode nil) + (setq-default tab-width 2) + (setq-default json-reformat:indent-width 2) + (setq-default + js-basic-offset 2 + js2-basic-offset 2 + css-indent-offset 2 + web-mode-markup-indent-offset 2 + web-mode-css-indent-offset 2 + web-mode-code-indent-offset 2 + web-mode-attr-indent-offset 2) + (setq projectile-enable-caching t) + (setq circe-network-options + '(("Gitter" + :host "irc.gitter.im" + :port 6697 + :tls t + :nick "gigavinyl" + :nickserv-password "409b940f62bd71f468ea31f8dbc2927f22bdd8d3" + :channels ("#/syl20bnr/spacemacs")))) + ) + +(defun dotspacemacs/user-config () + "Configuration function for user code. + This function is called at the very end of Spacemacs initialization after + layers configuration. + This is the place where most of your configurations should be done. Unless it is + explicitly specified that a variable should be set before a package is loaded, + you should place your code here." + (add-to-list 'auto-mode-alist '("\\.yml\\'" . yaml-mode)) + (add-to-list + 'comint-preoutput-filter-functions + (lambda (output) + (replace-regexp-in-string "\\[[0-9]+[GK]" "" output))) + (global-git-gutter+-mode) + (add-to-list 'auto-mode-alist '("Dockerfile\\'" . dockerfile-mode)) + (add-hook 'js2-mode-hook #'smartparens-mode) + (add-hook 'web-mode-hook #'smartparens-mode) + (add-hook 'smartparens-enabled-hook #'evil-smartparens-mode) + (setq powerline-default-separator 'slant) + (add-to-list 'auto-mode-alist '("\\.js[x]?\\'" . web-mode)) + (setq web-mode-content-types-alist + '(("jsx" . "\\.js[x]?\\'"))) + (with-eval-after-load 'flycheck + (setq-default flycheck-disabled-checkers + (append flycheck-disabled-checkers + '(javascript-jshint))) + ;; use eslint with web-mode for jsx files + (flycheck-add-mode 'javascript-eslint 'web-mode)) + (evil-leader/set-key "n" 'neotree-toggle) + (global-git-commit-mode t) + (global-flycheck-mode) + (ac-config-default) + (add-to-list 'ac-modes 'web-mode) + (setq ac-auto-show-menu 0.05) + (setq ac-delay 0.05) + (tern-ac-setup) + (setq ac-js2-evaluate-calls t) + + ;; Vim key bindings + (evil-leader/set-key + "ci" 'evilnc-comment-or-uncomment-lines + "cl" 'evilnc-quick-comment-or-uncomment-to-the-line + "cc" 'evilnc-copy-and-comment-lines + "cp" 'evilnc-comment-or-uncomment-paragraphs + "cr" 'comment-or-uncomment-region + "cv" 'evilnc-toggle-invert-comment-line-by-line + "\\" 'evilnc-comment-operator ; if you prefer backslash key + ) + (setq-default dotspacemacs-configuration-layers '( + (colors :variables colors-enable-rainbow-identifiers t))) + ) + +;; Do not write anything past this comment. This is where Emacs will +;; auto-generate custom variable definitions. +(custom-set-variables + ;; custom-set-variables was added by Custom. + ;; If you edit it by hand, you could mess it up, so be careful. + ;; Your init file should contain only one such instance. + ;; If there is more than one, they won't work right. + '(paradox-github-token t)) +(custom-set-faces + ;; custom-set-faces was added by Custom. + ;; If you edit it by hand, you could mess it up, so be careful. + ;; Your init file should contain only one such instance. + ;; If there is more than one, they won't work right. + ) + diff --git a/README.md b/README.md deleted file mode 100644 index 501c4e8..0000000 --- a/README.md +++ /dev/null @@ -1,12 +0,0 @@ - -# Dotfiles - -![Setup Preview](https://i.imgur.com/pGzolWf.png) - -This repo includes my tmux.conf and vimrc along with the scripts used in said tmux.conf. -**Note:** my vimrc is using [vundle](https://github.com/gmarik/Vundle.vim) so don't just copy and paste it without installing vundle -(also directly copying a vimrc is usually not a good idea). - -##Fonts - -The vimrc and tmux.conf files require patched fonts in order to be displayed correctly. I recommend [DejaVu Sans Mono for Powerline](https://github.com/powerline/fonts/tree/master/DejaVuSansMono) but you can find patched versions of many more fonts in that repository. diff --git a/README.org b/README.org new file mode 100644 index 0000000..ce0a52f --- /dev/null +++ b/README.org @@ -0,0 +1,2 @@ +* Dotfiles +- [[https://github.com/syl20bnr/spacemacs][Spacemacs]] config diff --git a/scripts/battery.sh b/scripts/battery.sh deleted file mode 100755 index 0514e0b..0000000 --- a/scripts/battery.sh +++ /dev/null @@ -1,112 +0,0 @@ -#!/bin/sh -#Made by richo on GitHub - -HEART_FULL=♥ -HEART_EMPTY=♡ -[ -z "$NUM_HEARTS" ] && - NUM_HEARTS=5 - -cutinate() -{ - perc=$1 - inc=$(( 100 / $NUM_HEARTS)) - - - for i in `seq $NUM_HEARTS`; do - if [ $perc -lt 100 ]; then - echo $HEART_EMPTY - else - echo $HEART_FULL - fi - perc=$(( $perc + $inc )) - done -} - -linux_get_bat () -{ - bf=$(cat $BAT_FULL) - bn=$(cat $BAT_NOW) - echo $(( 100 * $bn / $bf )) -} - -freebsd_get_bat () -{ - echo "$(sysctl -n hw.acpi.battery.life)" - -} - -# Do with grep and awk unless too hard - -# TODO Identify which machine we're on from teh script. - -battery_status() -{ -case $(uname -s) in - "Linux") - BATPATH=/sys/class/power_supply/BAT0 - STATUS=$BATPATH/status - BAT_FULL=$BATPATH/energy_full - BAT_NOW=$BATPATH/energy_now - if [ "$1" = `cat $STATUS` -o "$1" = "" ]; then - linux_get_bat - fi - ;; - "FreeBSD") - STATUS=`sysctl -n hw.acpi.battery.state` - case $1 in - "Discharging") - if [ $STATUS -eq 1 ]; then - freebsd_get_bat - fi - ;; - "Charging") - if [ $STATUS -eq 2 ]; then - freebsd_get_bat - fi - ;; - "") - freebsd_get_bat - ;; - esac - ;; - "Darwin") - case $1 in - "Discharging") - ext="No";; - "Charging") - ext="Yes";; - esac - - ioreg -c AppleSmartBattery -w0 | \ - grep -o '"[^"]*" = [^ ]*' | \ - sed -e 's/= //g' -e 's/"//g' | \ - sort | \ - while read key value; do - case $key in - "MaxCapacity") - export maxcap=$value;; - "CurrentCapacity") - export curcap=$value;; - "ExternalConnected") - if [ "$ext" != "$value" ]; then - exit - fi - ;; - "FullyCharged") - if [ "$value" = "Yes" ]; then - exit - fi - ;; - esac - if [[ -n "$maxcap" && -n $curcap ]]; then - echo $(( 100 * $curcap / $maxcap )) - break - fi - done -esac -} - -BATTERY_STATUS=`battery_status $1` -[ -z "$BATTERY_STATUS" ] && exit - -echo `cutinate $BATTERY_STATUS` diff --git a/scripts/mpd.sh b/scripts/mpd.sh deleted file mode 100755 index 9b0df1b..0000000 --- a/scripts/mpd.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -#Inspired by tungd on GitHub -MPD_TRACK=$(mpc -f "%title%" current) -echo '#[bg=colour237,fg=colour249,bold] ♫' $MPD_TRACK diff --git a/tmux.conf b/tmux.conf deleted file mode 100644 index 77723e9..0000000 --- a/tmux.conf +++ /dev/null @@ -1,45 +0,0 @@ -# This tmux statusbar config was created by tmuxline.vim -# on Sat, 16 May 2015 -# Credit for the appearance of this config goes to the creator of tmuxline, Evgeni Kolev. - -######Behavior###### -set -g prefix ^a -#Start counting windows from 1 -set -g base-index 1 -set -g pane-base-index 1 -#Enable notifications from windows -setw -g monitor-activity on -set-option -g visual-activity on -#Set how often the status bar updates its info -set -g status-interval 1 -unbind-key C-h - -######Colors###### -set -g status-bg "colour238" -set -g message-command-fg "colour249" -set -g status-justify "left" -set -g status-left-length "100" -set -g status "on" -set -g pane-active-border-fg "colour150" -set -g message-bg "colour237" -set -g status-right-length "100" -set -g status-right-attr "none" -set -g message-fg "colour249" -set -g message-command-bg "colour237" -set -g status-attr "none" -set -g status-utf8 "on" -set -g pane-border-fg "colour237" -set -g status-left-attr "none" -setw -g window-status-fg "colour150" -setw -g window-status-attr "none" -setw -g window-status-activity-bg "colour238" -setw -g window-status-activity-attr "none" -setw -g window-status-activity-fg "colour150" -setw -g window-status-separator "" -setw -g window-status-bg "colour238" - -######Status Bar###### -set -g status-left "#[fg=colour236,bg=colour150] #S #[fg=colour150,bg=colour238,nobold,nounderscore,noitalics]" -set -g status-right "#[fg=colour237,bg=colour238,nobold,nounderscore,noitalics]#[fg=colour249,bg=colour237] #(~/.scripts/battery.sh) #(~/.scripts/mpd.sh) #[fg=colour249,bg=colour237] %m/%d/%y  %l:%M %p #[fg=colour150,bg=colour237,nobold,nounderscore,noitalics]#[fg=colour236,bg=colour150] #h " -setw -g window-status-format "#[fg=colour150,bg=colour238] #I #[fg=colour150,bg=colour238] #W " -setw -g window-status-current-format "#[fg=colour238,bg=colour237,nobold,nounderscore,noitalics]#[fg=colour249,bg=colour237] #I #[fg=colour249,bg=colour237] #W #[fg=colour237,bg=colour238,nobold,nounderscore,noitalics]" diff --git a/vimrc b/vimrc deleted file mode 100644 index ec71648..0000000 --- a/vimrc +++ /dev/null @@ -1,109 +0,0 @@ -""""""""Setup env"""""""" -set t_Co=256 -syntax enable -set background=dark -colorscheme Tomorrow-Night-Eighties -set nu -set laststatus=2 -set hlsearch ignorecase -"Auto indent -filetype on -filetype plugin on -filetype indent on -set autoindent -set smartindent -"Tab -set tabstop=2 shiftwidth=0 expandtab -set pastetoggle= -let mapleader = ',' -"Line wrapping -set wrap -set linebreak -set nolist - -set nocompatible -filetype off - -""""""""Setup Vundle"""""""" -" set the runtime path to include Vundle and initialize -set rtp+=~/.vim/bundle/Vundle.vim -call vundle#begin() - -" let Vundle manage Vundle, required -Plugin 'gmarik/Vundle.vim' - -""""""""Plugins"""""""" -Plugin 'tpope/vim-fugitive' -Plugin 'airblade/vim-gitgutter' -Plugin 'scrooloose/nerdtree' -Plugin 'bling/vim-airline' -Plugin 'Townk/vim-autoclose' -Plugin 'plasticboy/vim-markdown' -Plugin 'kchmck/vim-coffee-script' -Plugin 'pangloss/vim-javascript' -Plugin 'jelera/vim-javascript-syntax' -Plugin 'octol/vim-cpp-enhanced-highlight' -Plugin 'tpope/vim-haml' -Plugin 'hail2u/vim-css3-syntax' -Bundle 'kien/ctrlp.vim' -Bundle 'mattn/webapi-vim' -Bundle 'mattn/gist-vim' -Bundle 'vim-ruby/vim-ruby' -Bundle 'scrooloose/nerdcommenter' -Bundle 'tpope/vim-surround' -Bundle 'ervandew/supertab' - -call vundle#end() " required -filetype plugin indent on " required - -""""""""Setup Airline"""""""" -let g:airline_theme= 'bubblegum' -let g:airline_powerline_fonts = 1 - -""""""""Setup GitGutter"""""""" -let g:gitgutter_enabled = 1 -let g:gitgutter_signs = 1 -let g:gitgutter_highlight_lines = 0 - -""""""""Setup AutoClose"""""""" -let g:AutoClosePairs = "() {} \" ` ' [] <>" - -""""""""Leader Commands"""""""" -nnoremap n :NERDTreeToggle -nnoremap w :w -nnoremap i :PluginInstall -nnoremap g :Gist -nnoremap q :q -nnoremap x :x -nnoremap r :%s/ -nnoremap v :vsplit -nnoremap bd :bd -nnoremap bn :bnext! -nnoremap bp :bprevious! -nnoremap t :! - - -""""""Setup ctlp"""""" -set runtimepath^=~/.vim/bundle/ctrlp.vim -let g:ctrlp_map = 'p' -let g:ctrlp_cmd = 'CtrlP' - -""""""Remap split movement"""""" -nmap j j -nmap k k -nmap h h -nmap l l - -""""""Improve indent in visual mode"""""" -vnoremap < >gv - -""""""Enable Extra Cpp Syntax Highlighting Features"""""" -let g:cpp_class_scope_highlight = 1 -let g:cpp_experimental_template_highlight = 1 - -""""""Enable Better HTML AutoIndent"""""" -let g:html_indent_inctags = 'html,body,head,tbody, div, img, a' - -""""""Enable vim-airline's tabline"""""" -let g:airline#extensions#tabline#enabled = 1 diff --git a/zshrc b/zshrc deleted file mode 100644 index 87b2a24..0000000 --- a/zshrc +++ /dev/null @@ -1,55 +0,0 @@ -case $TERM in - xterm*) - precmd () {print -Pn "\e]0;Zshell\a"} - ;; -esac -autoload -U colors && colors -alias ls='ls --color=auto' -zstyle ':completion:*' completer _complete _ignored _approximate -zstyle :compinstall filename '/home/gigavinyl/.zshrc' - -autoload -Uz compinit -compinit -# End of lines added by compinstall -# Lines configured by zsh-newuser-install -HISTFILE=~/.histfile -HISTSIZE=500 -SAVEHIST=500 -setopt appendhistory autocd nomatch -unsetopt beep extendedglob notify -bindkey -v -# End of lines configured by zsh-newuser-install -autoload -U promptinit -promptinit -PROMPT="%{$fg[green]%}%m %{$fg_no_bold[blue]%}%1~ %{$reset_color%}%# " - -alias cl="clear && archeyjs" -alias apts="apt-cache search" -alias aptsy="sudo apt-fast update" -alias aptsyu="sudo apt-fast update && sudo apt-fast upgrade" -alias apti="sudo apt-fast install" -alias aptar="sudo apt-fast autoremove" -alias aptr="sudo apt-fast remove" - -alias gpmas="git push origin master" - -alias tma="tmux -2 a -t Home" -alias music="ncmpcpp" -alias vi="vim" - -export EDITOR=vim - -export PATH="$HOME/.rbenv/bin:$PATH" -export PATH="$HOME/.gem/ruby/2.2.0/bin:$PATH" -eval "$(rbenv init -)" - -#export PYENV_ROOT="$HOME/.pyenv" -#export PATH="$PYENV_ROOT/bin:$PATH" -#eval "$(pyenv init -)" - -#export PATH=/home/gigavinyl/.mongodb/bin:$PATH - -. ~/.nvm/nvm.sh -nvm use 0.12>/dev/null - -archeyjs