From a1c002065c6353fd0816161202b67fdfbd09313b Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Mon, 23 Oct 2017 22:15:43 +0300
Subject: [PATCH] - Removed Powerline usage (Bash, Vim and tmux), was more
convoluted and less portable than customizing the prompt myself. - Symlink
the TravisCI Bash completion to the one generated by the travis gem inside
.bash_completion.d, remove specific source in .bashrc. - Moved AWS CLI
completion to file inside .bash_completion.d. - Removed some unused blocks in
.bashrc.
---
.bash_completion.d/aws | 1 +
.bash_completion.d/pipenv | 8 +++++
.bash_completion.d/travis.sh | 1 +
.bashrc | 24 --------------
.config/powerline/config.json | 13 --------
.config/powerline/themes/shell/personal.json | 34 --------------------
.config/powerline/themes/tmux/personal.json | 20 ------------
.tmux.conf | 1 -
.vimrc | 6 ----
9 files changed, 10 insertions(+), 98 deletions(-)
create mode 100644 .bash_completion.d/aws
create mode 100644 .bash_completion.d/pipenv
create mode 120000 .bash_completion.d/travis.sh
delete mode 100644 .config/powerline/config.json
delete mode 100644 .config/powerline/themes/shell/personal.json
delete mode 100644 .config/powerline/themes/tmux/personal.json
diff --git a/.bash_completion.d/aws b/.bash_completion.d/aws
new file mode 100644
index 0000000..73844cf
--- /dev/null
+++ b/.bash_completion.d/aws
@@ -0,0 +1 @@
+! which aws_completer >/dev/null || complete -C 'aws_completer' aws
diff --git a/.bash_completion.d/pipenv b/.bash_completion.d/pipenv
new file mode 100644
index 0000000..5cd6436
--- /dev/null
+++ b/.bash_completion.d/pipenv
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+if which pipenv > /dev/null
+then
+ [ -f "$HOME/.bash_completion.d/.pipenv" ] || pipenv --completion > "$HOME/.bash_completion.d/.pipenv"
+ # shellcheck disable=SC1090
+ . "$HOME/.bash_completion.d/.pipenv"
+fi
diff --git a/.bash_completion.d/travis.sh b/.bash_completion.d/travis.sh
new file mode 120000
index 0000000..f116373
--- /dev/null
+++ b/.bash_completion.d/travis.sh
@@ -0,0 +1 @@
+../.travis/travis.sh
\ No newline at end of file
diff --git a/.bashrc b/.bashrc
index c270a3e..001845f 100644
--- a/.bashrc
+++ b/.bashrc
@@ -19,24 +19,11 @@ then
do
[ ! -f "$sourcefile" ] || . "$sourcefile"
done
-
- # shellcheck disable=SC1090
- # added by travis gem
- [ -f "$HOME/.travis/travis.sh" ] && . "$HOME/.travis/travis.sh"
-
- # shellcheck disable=SC2015
- which aws_completer >/dev/null && complete -C 'aws_completer' aws ||
- true
fi
# make less more friendly for non-text input files, see lesspipe(1)
[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
-# set variable identifying the chroot you work in (used in the prompt below)
-if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
- debian_chroot=$(cat /etc/debian_chroot)
-fi
-
# enable color support of ls and also add handy aliases
if [ -x /usr/bin/dircolors ]; then
eval "$(dircolors -b)"
@@ -45,17 +32,6 @@ if [ -x /usr/bin/dircolors ]; then
alias diff='diff --color=auto'
fi
-# shellcheck disable=SC2142
-[ -f /usr/local/bin/virtualenvwrapper.sh ] && . /usr/local/bin/virtualenvwrapper.sh
-
-if which powerline-daemon > /dev/null && [ -f /usr/share/powerline/bindings/bash/powerline.sh ]
-then
- export POWERLINE_BASH_CONTINUATION=1
- export POWERLINE_BASH_SELECT=1
- pgrep -f powerline-daemon > /dev/null || powerline-daemon -q
- . /usr/share/powerline/bindings/bash/powerline.sh
-fi
-
export REPREPRO_BASE_DIR="$HOME/Documents/Shore/debian-repository"
export EDITOR=vim
export GOPATH="$HOME/Documents/Golang"
diff --git a/.config/powerline/config.json b/.config/powerline/config.json
deleted file mode 100644
index a8e5f3e..0000000
--- a/.config/powerline/config.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "ext": {
- "shell": {
- "theme": "personal"
- },
- "vim": {
- "theme": "default"
- },
- "tmux": {
- "theme": "personal"
- }
- }
-}
diff --git a/.config/powerline/themes/shell/personal.json b/.config/powerline/themes/shell/personal.json
deleted file mode 100644
index 61e59f8..0000000
--- a/.config/powerline/themes/shell/personal.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
- "segments": {
- "left": [
- {
- "function": "powerline.segments.common.net.hostname",
- "priority": 10
- },
- {
- "function": "powerline.segments.common.env.user",
- "priority": 30
- },
- {
- "function": "powerline.segments.common.env.virtualenv",
- "priority": 50
- },
- {
- "function": "powerline.segments.common.vcs.branch",
- "priority": 40
- },
- {
- "function": "powerline.segments.shell.cwd",
- "priority": 10
- },
- {
- "function": "powerline.segments.shell.jobnum",
- "priority": 20
- },
- {
- "function": "powerline.segments.shell.last_status",
- "priority": 10
- }
- ]
- }
-}
diff --git a/.config/powerline/themes/tmux/personal.json b/.config/powerline/themes/tmux/personal.json
deleted file mode 100644
index 24ad5bf..0000000
--- a/.config/powerline/themes/tmux/personal.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "segments": {
- "right": [
- {
- "function": "powerline.segments.common.time.date"
- },
- {
- "function": "powerline.segments.common.time.date",
- "name": "time",
- "args": {
- "format": "%H:%M",
- "istime": true
- }
- },
- {
- "function": "powerline.segments.common.net.hostname"
- }
- ]
- }
-}
diff --git a/.tmux.conf b/.tmux.conf
index 433b406..4f0383f 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -1,2 +1 @@
-if-shell '[ -f /usr/share/powerline/bindings/tmux/powerline.conf ]' 'source "/usr/share/powerline/bindings/tmux/powerline.conf"'
bind-key b send-prefix
diff --git a/.vimrc b/.vimrc
index d79dc95..c147704 100644
--- a/.vimrc
+++ b/.vimrc
@@ -9,9 +9,3 @@ setlocal textwidth=80
setlocal smarttab
setlocal expandtab
syntax on
-:silent! python3 from powerline.vim import setup as powerline_setup
-:silent! python3 powerline_setup()
-:silent! python3 del powerline_setup
-set laststatus=2 " Always display the statusline in all windows
-set showtabline=2 " Always display the tabline, even if there is only one tab
-set noshowmode " Hide the default mode text (e.g. -- INSERT -- below the statusline)
--
GitLab