Add some linux compatibility stuff. WIP...

This commit is contained in:
Ivan Malison 2014-11-07 05:11:23 -08:00
parent 9c26907f7c
commit 796bfed264
9 changed files with 29 additions and 13 deletions

3
.gitignore vendored
View File

@ -8,3 +8,6 @@ dotfiles/.pip/download_cache
dotfiles/.pip/pip.log dotfiles/.pip/pip.log
dotfiles/config/hub dotfiles/config/hub
dotfiles/cider/.cache/ dotfiles/cider/.cache/
dotfiles/pip/download_cache/
.gitignore
dotfiles/pip/pip.log

View File

@ -1,6 +1,5 @@
clear Mod1 keycode 66 = Control_L
clear Mod2 clear Lock
keycode 63 = Mode_switch add Control = Control_L
keycode 66 = Meta_L keycode 117 = Caps_Lock
add Mod1 = Meta_L add Lock = Caps_Lock
add Mod2 = Mode_switch

@ -1 +1 @@
Subproject commit 3404f466e205a3f2a1a84562665cac37a227c650 Subproject commit 4cfc0e42cca13c26ec02bd4beea26c37e02da8e9

View File

@ -1,4 +1,4 @@
alias emacs='temacs' alias emacs='terminal_emacs'
is_osx && alias emacs='cocoa_emacs' is_osx && alias emacs='cocoa_emacs'
alias terminal_emacs='_emacs -t' alias terminal_emacs='_emacs -t'
alias ec='_emacs -n ' alias ec='_emacs -n '

View File

@ -107,10 +107,15 @@ function is_osx() {
esac esac
} }
function clipboard() { # TODO: Remove this.
alias clipboard='oscopy'
function oscopy() {
if is_osx; if is_osx;
then then
reattach-to-user-namespace pbcopy reattach-to-user-namespace pbcopy
else
xclip -selection c
fi fi
} }
@ -118,6 +123,8 @@ function ospaste() {
if is_osx; if is_osx;
then then
reattach-to-user-namespace pbpaste reattach-to-user-namespace pbpaste
else
xclip -o
fi fi
} }

View File

@ -36,6 +36,6 @@ function smart_copy() {
then then
remote_os_copy remote_os_copy
else else
clipboard oscopy
fi fi
} }

View File

@ -5,7 +5,6 @@ ddg
ouimeaux ouimeaux
simplejson simplejson
invoke invoke
cider
lxml lxml
okcupyd okcupyd
vcrpy vcrpy

View File

@ -23,6 +23,7 @@ def setup(ctx):
linux.all(ctx) linux.all(ctx)
dotfiles(ctx, 'f') dotfiles(ctx, 'f')
install_python_libraries(ctx) install_python_libraries(ctx)
powerline(ctx)
install_npm_libraries(ctx) install_npm_libraries(ctx)
change_shell(ctx) change_shell(ctx)
@ -34,6 +35,11 @@ def dotfiles(ctx, flags=''):
return ctx.run('dotfiles -s{1} -R {0}'.format(DOTFILES_DIRECTORY, flags)) return ctx.run('dotfiles -s{1} -R {0}'.format(DOTFILES_DIRECTORY, flags))
@ctask
def powerline(ctx):
ctx.run('pip install --user git+git://github.com/Lokaltog/powerline')
@ctask @ctask
def install_python_libraries(ctx): def install_python_libraries(ctx):
ctx.run('sudo pip install -r {0}'.format( ctx.run('sudo pip install -r {0}'.format(
@ -64,3 +70,4 @@ ns.add_task(setup)
ns.add_task(install_python_libraries) ns.add_task(install_python_libraries)
ns.add_task(install_npm_libraries) ns.add_task(install_npm_libraries)
ns.add_task(vimstall) ns.add_task(vimstall)
ns.add_task(powerline)

View File

@ -10,7 +10,8 @@ def all(ctx):
linux_pacakges = ('zsh', 'tmux', 'emacs24-nox', 'nmap', 'scala', 'default-jdk', linux_pacakges = ('zsh', 'tmux', 'emacs24-nox', 'nmap', 'scala', 'default-jdk',
'default-jre', 'python-virtualenv', 'htop', 'netcat', 'wget', 'default-jre', 'python-virtualenv', 'htop', 'netcat', 'wget',
'zlib1g-dev', 'libxml2-dev', 'libxslt1-dev', 'python-dev', 'zlib1g-dev', 'libxml2-dev', 'libxslt1-dev', 'python-dev',
'libncurses5-dev', 'npm', 'python3-dev') 'libncurses5-dev', 'xbindkeys', 'python3-dev', 'xclip',
'silversearcher-ag', 'npm', 'xdotool')
@ctask @ctask
def apt_get(ctx): def apt_get(ctx):
install_command = 'sudo apt-get -y install' install_command = 'sudo apt-get -y install'