diff --git a/sublime_user/Package Control.sublime-settings b/sublime_user/Package Control.sublime-settings index 212533c..6c6ab76 100644 --- a/sublime_user/Package Control.sublime-settings +++ b/sublime_user/Package Control.sublime-settings @@ -22,6 +22,7 @@ "Moonscripty", "Package Control", "Prolog", + "Ruby Slim", "SFTP", "SideBarEnhancements", "Syntax Manager", diff --git a/sublime_user/SyntaxMgr.sublime-settings b/sublime_user/SyntaxMgr.sublime-settings index 48ccbe2..060557b 100644 --- a/sublime_user/SyntaxMgr.sublime-settings +++ b/sublime_user/SyntaxMgr.sublime-settings @@ -3,13 +3,15 @@ { "platforms": ["windows"], "settings": { - "font_face": "Consolas" + "font_face": "Consolas", + "font_size": 10 } }, { "platforms": ["linux"], "settings": { - "font_face": "Deja Vu Sans Mono" + "font_face": "Deja Vu Sans Mono", + "font_size": 10 } } ] diff --git a/zshrc b/zshrc index a093dc8..57f2c61 100644 --- a/zshrc +++ b/zshrc @@ -104,3 +104,7 @@ launch() fpath=(~/.zsh/completions $fpath) autoload -U compinit && compinit + +export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting +source $HOME/.rvm/scripts/rvm + -- 2.54.0 From beee5a7c9352fc876251baf7ca0d5cc552bb20fd Mon Sep 17 00:00:00 2001 From: Sharparam Date: Sat, 21 May 2016 16:30:30 +0200 Subject: [PATCH 02/13] Add explicit python path to vimrc --- vimrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vimrc b/vimrc index f652254..6990561 100644 --- a/vimrc +++ b/vimrc @@ -1,3 +1,5 @@ +let $PYTHONPATH='/usr/lib/python3.5/site-packages' + set nocompatible " be iMproved, required filetype off " required -- 2.54.0 From e948ce50a34db90c50d64565d1c3876ef57f8aab Mon Sep 17 00:00:00 2001 From: Sharparam Date: Sat, 21 May 2016 16:30:39 +0200 Subject: [PATCH 03/13] Disable YouCompleteMe in vimrc --- vimrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vimrc b/vimrc index 6990561..3f46c41 100644 --- a/vimrc +++ b/vimrc @@ -11,7 +11,7 @@ Plugin 'VundleVim/Vundle.vim' Plugin 'editorconfig/editorconfig-vim' Plugin 'airblade/vim-gitgutter' Plugin 'AutoClose' -Plugin 'Valloric/YouCompleteMe' +" Plugin 'Valloric/YouCompleteMe' call vundle#end() -- 2.54.0 From 2bed5bca1d95f7238cd170f74c1c4c4f54d020c8 Mon Sep 17 00:00:00 2001 From: Adam Hellberg Date: Sun, 22 May 2016 02:51:12 +0200 Subject: [PATCH 04/13] Add .editorconfig --- editorconfig | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 editorconfig diff --git a/editorconfig b/editorconfig new file mode 100644 index 0000000..3cb3cbb --- /dev/null +++ b/editorconfig @@ -0,0 +1,7 @@ +root = true + +[*] +insert_final_newline = true +indent_style = space +indent_size = 4 +trim_trailing_whitespace = true -- 2.54.0 From c5337fce81584383dc2c466e8dadd57f8294052b Mon Sep 17 00:00:00 2001 From: Adam Hellberg Date: Sun, 22 May 2016 02:51:20 +0200 Subject: [PATCH 05/13] Update .zshrc --- zshrc | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/zshrc b/zshrc index 57f2c61..921c034 100644 --- a/zshrc +++ b/zshrc @@ -5,7 +5,7 @@ export ZSH=/home/sharparam/.oh-my-zsh # 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="robbyrussell" +ZSH_THEME="agnoster" # Uncomment the following line to use case-sensitive completion. # CASE_SENSITIVE="true" @@ -53,13 +53,16 @@ plugins=(git) # User configuration -export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:$HOME/.composer/vendor/bin" +export PATH="/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl" # export MANPATH="/usr/local/man:$MANPATH" source $ZSH/oh-my-zsh.sh # You may need to manually set your language environment -# export LANG=en_US.UTF-8 +#export LANG=en_GB.UTF-8 +#export LANGUAGE=en_GB.UTF-8 + +. /usr/lib/python3.5/site-packages/powerline/bindings/zsh/powerline.zsh # Preferred editor for local and remote sessions # if [[ -n $SSH_CONNECTION ]]; then @@ -68,6 +71,9 @@ source $ZSH/oh-my-zsh.sh # export EDITOR='mvim' # fi +export VISUAL="vim" +export EDITOR="vim" + # Compilation flags # export ARCHFLAGS="-arch x86_64" @@ -83,28 +89,22 @@ source $ZSH/oh-my-zsh.sh # alias zshconfig="mate ~/.zshrc" # alias ohmyzsh="mate ~/.oh-my-zsh" -#alias cowfortune="fortune | cowsay" - -cowfortune() { fortune $@ | cowsay } - -cowfortune - -. /usr/share/powerline/bindings/zsh/powerline.zsh - eval "$(thefuck --alias)" eval "$(hub alias -s)" +cowfortune() { + fortune $@ | cowsay -s -f bong -W 80 +} + launch() { nohup $@ >&/dev/null & } -[ -s "/home/sharparam/.dnx/dnvm/dnvm.sh" ] && . "/home/sharparam/.dnx/dnvm/dnvm.sh" # Load dnvm - -fpath=(~/.zsh/completions $fpath) -autoload -U compinit && compinit - -export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting -source $HOME/.rvm/scripts/rvm +scrotclip() +{ + scrot $@ /tmp/scrotclip.png -e 'xclip -se c -t image/png -i $f && rm $f' +} +cowfortune -- 2.54.0 From 1d0658f4126e6e52309db2aed1eab4111390f826 Mon Sep 17 00:00:00 2001 From: Adam Hellberg Date: Sun, 22 May 2016 02:51:27 +0200 Subject: [PATCH 06/13] Update .vimrc --- vimrc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/vimrc b/vimrc index 3f46c41..6fcdbc0 100644 --- a/vimrc +++ b/vimrc @@ -17,7 +17,9 @@ call vundle#end() filetype plugin indent on -set smartindent +set tabstop=4 +set shiftwidth=4 +set expandtab set laststatus=2 set t_Co=256 -- 2.54.0 From e62cd4fb7606f1a2ee657b53cefc728f75b5c8ed Mon Sep 17 00:00:00 2001 From: Adam Hellberg Date: Sun, 22 May 2016 02:51:35 +0200 Subject: [PATCH 07/13] Update sublime settings --- sublime_user/LaTeXTools.sublime-settings | 4 ++-- sublime_user/Preferences.sublime-settings | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sublime_user/LaTeXTools.sublime-settings b/sublime_user/LaTeXTools.sublime-settings index 0a75e8e..c0d6179 100644 --- a/sublime_user/LaTeXTools.sublime-settings +++ b/sublime_user/LaTeXTools.sublime-settings @@ -82,10 +82,10 @@ // Command to invoke Python 2. Useful if you have both Python 2 and Python 3 on your system, // and "python" by default is linked to Python 3. If blank, "python" is used // Note: ST3 uses Python 3 internally, but the evince scripts need Python 2 - "python2": "", + "python2": "python2", // The name of the ST2 or ST3 executable. On Ubuntu, both subl and sublime-text are // available for ST2; adjust as needed for other platforms, and for ST3 - "sublime": "sublime-text", + "sublime": "subl3", // How long to wait after evince has launched before sending a sync message // in seconds, floating point; choose 2.0 or 3.0 on a slower machine, 0.5 on a fast one // Note: only tweak this if sync after launching the PDF viewer does not seem to work, diff --git a/sublime_user/Preferences.sublime-settings b/sublime_user/Preferences.sublime-settings index 45dd80b..de8b64e 100644 --- a/sublime_user/Preferences.sublime-settings +++ b/sublime_user/Preferences.sublime-settings @@ -1,12 +1,13 @@ { - "color_scheme": "Packages/Tomorrow Color Schemes/Tomorrow-Night.tmTheme", + "color_scheme": "Packages/Color Scheme - Default/Monokai.tmTheme", "draw_white_space": "selection", "font_size": 10, "highlight_line": true, "ignored_packages": [ "Vintage", - "Vintageous" + "Vintageous", + "Visual Studio Dark" ], "rulers": [ -- 2.54.0 From 74bb2ca6b44fed880c4ba23236b5af19208693ec Mon Sep 17 00:00:00 2001 From: Adam Hellberg Date: Sun, 22 May 2016 02:52:57 +0200 Subject: [PATCH 08/13] Add special edit rule for makefiles --- editorconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/editorconfig b/editorconfig index 3cb3cbb..9b71d44 100644 --- a/editorconfig +++ b/editorconfig @@ -5,3 +5,6 @@ insert_final_newline = true indent_style = space indent_size = 4 trim_trailing_whitespace = true + +[Makefile] +indent_style = tab -- 2.54.0 From 6d0b40f8929f72400f882eb2e2d09814d9e418c1 Mon Sep 17 00:00:00 2001 From: Adam Hellberg Date: Sun, 22 May 2016 15:09:05 +0200 Subject: [PATCH 09/13] Update display of cowfortune --- zshrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zshrc b/zshrc index 921c034..dc01c72 100644 --- a/zshrc +++ b/zshrc @@ -94,7 +94,7 @@ eval "$(thefuck --alias)" eval "$(hub alias -s)" cowfortune() { - fortune $@ | cowsay -s -f bong -W 80 + fortune $@ | cowsay -W 80 } launch() -- 2.54.0 From cb330c3416827262df3ad84c3169cea2348d5be5 Mon Sep 17 00:00:00 2001 From: Adam Hellberg Date: Mon, 30 May 2016 16:32:32 +0200 Subject: [PATCH 10/13] Add gemrc file --- gemrc | 1 + 1 file changed, 1 insertion(+) create mode 100644 gemrc diff --git a/gemrc b/gemrc new file mode 100644 index 0000000..154cd47 --- /dev/null +++ b/gemrc @@ -0,0 +1 @@ +gem: --no-document -- 2.54.0 From 13ea529854b053dc95fb2245c1b6b5d64b4bd696 Mon Sep 17 00:00:00 2001 From: Adam Hellberg Date: Mon, 30 May 2016 16:32:43 +0200 Subject: [PATCH 11/13] Update zshrc --- zshrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zshrc b/zshrc index dc01c72..bb1969a 100644 --- a/zshrc +++ b/zshrc @@ -60,7 +60,7 @@ source $ZSH/oh-my-zsh.sh # You may need to manually set your language environment #export LANG=en_GB.UTF-8 -#export LANGUAGE=en_GB.UTF-8 +export LANGUAGE=en_GB.UTF-8 . /usr/lib/python3.5/site-packages/powerline/bindings/zsh/powerline.zsh -- 2.54.0 From 00fdc82924a1850c8714c9001b63bd528fb8b21f Mon Sep 17 00:00:00 2001 From: Adam Hellberg Date: Mon, 30 May 2016 16:32:52 +0200 Subject: [PATCH 12/13] Update sublime settings --- sublime_user/Preferences.sublime-settings | 4 ++-- sublime_user/SyntaxMgr.sublime-settings | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/sublime_user/Preferences.sublime-settings b/sublime_user/Preferences.sublime-settings index de8b64e..2820ab0 100644 --- a/sublime_user/Preferences.sublime-settings +++ b/sublime_user/Preferences.sublime-settings @@ -1,7 +1,7 @@ { - "color_scheme": "Packages/Color Scheme - Default/Monokai.tmTheme", + "color_scheme": "Packages/Tomorrow Color Schemes/Tomorrow-Night.tmTheme", "draw_white_space": "selection", - "font_size": 10, + "font_size": 11, "highlight_line": true, "ignored_packages": [ diff --git a/sublime_user/SyntaxMgr.sublime-settings b/sublime_user/SyntaxMgr.sublime-settings index 060557b..048d178 100644 --- a/sublime_user/SyntaxMgr.sublime-settings +++ b/sublime_user/SyntaxMgr.sublime-settings @@ -10,8 +10,7 @@ { "platforms": ["linux"], "settings": { - "font_face": "Deja Vu Sans Mono", - "font_size": 10 + "font_face": "Deja Vu Sans Mono" } } ] -- 2.54.0 From 16943d0185f9d84bf0e07e496be79a1d1455a5dc Mon Sep 17 00:00:00 2001 From: Adam Hellberg Date: Mon, 30 May 2016 17:26:03 +0200 Subject: [PATCH 13/13] Add rbenv to zshrc --- zshrc | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/zshrc b/zshrc index bb1969a..aa7f604 100644 --- a/zshrc +++ b/zshrc @@ -64,13 +64,6 @@ export LANGUAGE=en_GB.UTF-8 . /usr/lib/python3.5/site-packages/powerline/bindings/zsh/powerline.zsh -# Preferred editor for local and remote sessions -# if [[ -n $SSH_CONNECTION ]]; then -# export EDITOR='vim' -# else -# export EDITOR='mvim' -# fi - export VISUAL="vim" export EDITOR="vim" @@ -80,18 +73,9 @@ export EDITOR="vim" # ssh # export SSH_KEY_PATH="~/.ssh/dsa_id" -# 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" -# alias ohmyzsh="mate ~/.oh-my-zsh" - eval "$(thefuck --alias)" - eval "$(hub alias -s)" +eval "$(rbenv init -)" cowfortune() { fortune $@ | cowsay -W 80