GitHub
commit
041d195556
14 changed files with 74 additions and 271 deletions
4
.gitignore
vendored
4
.gitignore
vendored
|
|
@ -1,9 +1,5 @@
|
|||
#Local Gitignore for Repo#
|
||||
##########################
|
||||
|
||||
# Ignore Plug-related directories
|
||||
vim/vim/autoload
|
||||
vim/vim/bundle
|
||||
|
||||
# Ignore undo files
|
||||
*.un~
|
||||
|
|
|
|||
12
.gitmodules
vendored
Normal file
12
.gitmodules
vendored
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
[submodule "vim/vim/pack/plugins/start/vim-fugitive"]
|
||||
path = vim/vim/pack/plugins/start/vim-fugitive
|
||||
url = https://github.com/tpope/vim-fugitive.git
|
||||
[submodule "vim/vim/pack/plugins/start/vim-unimpaired"]
|
||||
path = vim/vim/pack/plugins/start/vim-unimpaired
|
||||
url = https://github.com/tpope/vim-unimpaired.git
|
||||
[submodule "vim/vim/pack/plugins/start/vim-commentary"]
|
||||
path = vim/vim/pack/plugins/start/vim-commentary
|
||||
url = https://github.com/tpope/vim-commentary.git
|
||||
[submodule "vim/vim/pack/plugins/start/vim-polyglot"]
|
||||
path = vim/vim/pack/plugins/start/vim-polyglot
|
||||
url = https://github.com/sheerun/vim-polyglot.git
|
||||
81
bash/bashrc
81
bash/bashrc
|
|
@ -6,8 +6,34 @@
|
|||
if [ -f /etc/bashrc ]; then
|
||||
. /etc/bashrc
|
||||
fi
|
||||
#===============================================================================
|
||||
# Path
|
||||
#===============================================================================
|
||||
# Custom stuff
|
||||
PATH="$HOME/bin:$PATH"
|
||||
# Add Python to path
|
||||
PYTHONPATH="${PYTHONPATH}"
|
||||
export PYTHONPATH
|
||||
PATH="$PATH:/opt/python/bin"
|
||||
# Add Rust cargo bin
|
||||
PATH="$PATH:$HOME/.cargo/bin"
|
||||
# RVM. Make sure this is the last PATH variable change.
|
||||
PATH="$PATH:$HOME/.rvm/bin"
|
||||
# Set it.
|
||||
export PATH
|
||||
#===============================================================================
|
||||
# Defaults
|
||||
#===============================================================================
|
||||
# Disable CTRL+S flow control
|
||||
stty -ixon
|
||||
# Set editor, if Vim is available
|
||||
type vim >/dev/null 2>&1
|
||||
if [[ $? == 0 ]]; then
|
||||
export EDITOR=vim
|
||||
fi
|
||||
# History size and time-format
|
||||
export HISTSIZE=10000
|
||||
export HISTTIMEFORMAT="%s "
|
||||
#===============================================================================
|
||||
# Prompt
|
||||
#===============================================================================
|
||||
|
|
@ -23,24 +49,9 @@ fi
|
|||
#===============================================================================
|
||||
# Aliases
|
||||
#===============================================================================
|
||||
alias tssh="source ~/.ssh/auth_ssh; ssh -A"
|
||||
complete -F _ssh tssh
|
||||
#===============================================================================
|
||||
# Functions
|
||||
#===============================================================================
|
||||
#If redshift wasn't automatically started, this will do it
|
||||
function tint(){
|
||||
type redshift >/dev/null 2>&1
|
||||
if [[ $? == 0 ]]; then
|
||||
redshift -l 42.8864500:-78.8783700 -t 5000:4000 &
|
||||
else
|
||||
echo "Redshift not installed"
|
||||
fi
|
||||
}
|
||||
# Function for keeping ssh-agent happy
|
||||
function yssh(){
|
||||
echo "export SSH_AUTH_SOCK=$SSH_AUTH_SOCK" > ~/.ssh/auth_ssh
|
||||
}
|
||||
# Determine git branch and index status
|
||||
function show_git_info(){
|
||||
local results=""
|
||||
|
|
@ -66,47 +77,13 @@ function sojourner_tmux(){
|
|||
# If there is no session named Sojourner
|
||||
if [ $? != 0 ] ; then
|
||||
# Create a new session named Sojourner
|
||||
tmux new-session -s Sojourner -d -c ~/
|
||||
tmux new-session -s Sojourner -d
|
||||
fi
|
||||
# Get our SSH socket documented
|
||||
echo "export SSH_AUTH_SOCK=$SSH_AUTH_SOCK" > ~/.ssh/auth_ssh
|
||||
# Attack to the Sojourner session
|
||||
tmux attach -t Sojourner
|
||||
else
|
||||
echo "Tmux not installed."
|
||||
fi
|
||||
}
|
||||
#===============================================================================
|
||||
# Path
|
||||
#===============================================================================
|
||||
# Ruby Gems
|
||||
if which ruby >/dev/null && which gem >/dev/null; then
|
||||
PATH="$(ruby -rubygems -e 'puts Gem.user_dir')/bin:$PATH"
|
||||
fi
|
||||
# Custom stuff
|
||||
PATH="$HOME/bin:$PATH"
|
||||
# Add Python to path
|
||||
PYTHONPATH="${PYTHONPATH}"
|
||||
export PYTHONPATH
|
||||
# RVM. Make sure this is the last PATH variable change.
|
||||
PATH="$PATH:$HOME/.rvm/bin"
|
||||
# Set it.
|
||||
export PATH
|
||||
#===============================================================================
|
||||
# Defaults
|
||||
#===============================================================================
|
||||
# Set editor, if Vim is available
|
||||
type vim >/dev/null 2>&1
|
||||
if [[ $? == 0 ]]; then
|
||||
export EDITOR=vim
|
||||
fi
|
||||
# History size and time-format
|
||||
export HISTSIZE=10000
|
||||
export HISTTIMEFORMAT="%s "
|
||||
#===============================================================================
|
||||
# Random Shit often auto-added
|
||||
#===============================================================================
|
||||
# Hook for desk activation
|
||||
[ -n "$DESK_ENV" ] && source "$DESK_ENV" || true
|
||||
|
||||
# Yubikey support
|
||||
# eval "$(ssh-agent -s)" &> /dev/null
|
||||
export SSH_AUTH_SOCK=$HOME/.yubiagent/sock
|
||||
|
|
|
|||
|
|
@ -1,60 +0,0 @@
|
|||
{
|
||||
"version": 1,
|
||||
"script_version": "3.5.318",
|
||||
"aliases": {},
|
||||
"settings": {
|
||||
"advanced_settings": true,
|
||||
"favorite_settings": [
|
||||
"auto_theater",
|
||||
"dark_twitch",
|
||||
"channel_views",
|
||||
"srl_races",
|
||||
"stream_title",
|
||||
"parse_emoticons",
|
||||
"replace_bad_emotes",
|
||||
"room_status",
|
||||
"emoji_in_menu",
|
||||
"global_emotes_in_menu",
|
||||
"replace_twitch_menu",
|
||||
"input_emoticons_case_sensitive",
|
||||
"input_complete_name_at",
|
||||
"input_complete_name_require_at",
|
||||
"emote_image_hover",
|
||||
"player_volume_bar",
|
||||
"sidebar_hide_more_at_twitch",
|
||||
"sidebar_hide_promoted_games",
|
||||
"sidebar_hide_recommended_channels",
|
||||
"sidebar_directly_to_followed_channels",
|
||||
"hide_conversations_in_theatre",
|
||||
"minimize_conversations"
|
||||
],
|
||||
"twenty_four_timestamps": 2,
|
||||
"auto_theater": true,
|
||||
"player_volume_bar": true,
|
||||
"emote_image_hover": true,
|
||||
"chat_rows": true,
|
||||
"chat_padding": true,
|
||||
"minimal_chat": 3,
|
||||
"top_conversations": false,
|
||||
"hide_conversations_in_theatre": true,
|
||||
"minimize_conversations": true,
|
||||
"input_complete_name_require_at": true,
|
||||
"sidebar_hide_recommended_channels": true,
|
||||
"sidebar_hide_promoted_games": true,
|
||||
"sidebar_hide_more_at_twitch": true,
|
||||
"sidebar_directly_to_followed_channels": true,
|
||||
"twitch_chat_dark": false,
|
||||
"dark_twitch": true,
|
||||
"dark_no_blue": true,
|
||||
"replace_twitch_menu": true,
|
||||
"global_emotes_in_menu": true,
|
||||
"emoji_in_menu": true,
|
||||
"emote_menu_collapsed": [
|
||||
"twitch-2237",
|
||||
"twitch-11261",
|
||||
"ffz-3",
|
||||
"twitch-0"
|
||||
],
|
||||
"warp_world": false
|
||||
}
|
||||
}
|
||||
|
|
@ -1,109 +0,0 @@
|
|||
<!-- Custom HTML Homepage for niblock -->
|
||||
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>++ H O M E ++</title>
|
||||
<style>
|
||||
html { background-color: #0e0e0e; color: #555555; }
|
||||
a { color: #555555; text-decoration: none; transition: color 1s; }
|
||||
a:hover { color: #d4d454; text-decoration: none; transition: color 1s; }
|
||||
body {
|
||||
position: absolute; bottom: 0px; display: table;
|
||||
width: 100%; height: 100%; margin: 0; padding: 0; }
|
||||
header { position: fixed; top: 3%; right: 3%; height: 50px; }
|
||||
#icons { display: table-cell; vertical-align: middle; }
|
||||
#category {
|
||||
float: left; margin: 0px; padding: 0px 20px; list-style: none; }
|
||||
#category li {
|
||||
color: lightgray; font-weight: bold;
|
||||
text-align: center; padding: 10px 0px; }
|
||||
#category li:first-child { border-bottom: 2px solid #270e24; }
|
||||
#category a {
|
||||
display: table-cell; width: 50px; height: 50px;
|
||||
background: #270e24; border: 1px solid #270e24; border-radius: 50%;
|
||||
vertical-align: middle; color: lightgray; }
|
||||
#category a:hover {
|
||||
color: #d4d454; text-decoration: none; transition: color 1s; }
|
||||
#fence {
|
||||
display: table-cell; vertical-align: middle;
|
||||
margin: 0px auto; width: 1000px; }
|
||||
#links {
|
||||
float: left; width: 150px;
|
||||
margin: 25px 46px; padding: 0px 0px 12px 0px;
|
||||
list-style: none; background: #270e24;
|
||||
border: 2px solid #270e24; border-radius: 10px; }
|
||||
#links #header {
|
||||
background-color: #270e24;
|
||||
color: lightgray; font-weight: bold;
|
||||
border-top-right-radius: 10px; border-top-left-radius: 10px; }
|
||||
#links li {
|
||||
padding: 5px 10px; text-align: center; background-color: black; }
|
||||
footer {
|
||||
position: fixed; bottom: 0px; left: 0px; right: 0px; width: 75%;
|
||||
margin: 0px auto; text-align: center; letter-spacing: 8px;
|
||||
font-family: monospace; font-weight: bold; color: gray; }
|
||||
</style>
|
||||
<script type="text/javascript">
|
||||
</script>
|
||||
</head>
|
||||
<body >
|
||||
<header>
|
||||
<ul id="icons">
|
||||
<ul id="category">
|
||||
<li>Mail</li>
|
||||
<li><a href="https://mail.google.com">G</a></li>
|
||||
<li><a href="https://www.yahoo.com/mail">Y</a></li>
|
||||
</ul>
|
||||
<ul id="category">
|
||||
<li>Cloud</li>
|
||||
<li><a href="https://drive.google.com">D</a></li>
|
||||
<li><a href="https://cyberthunderdesigns.com/owncloud">L</a></li>
|
||||
<li><a href="https://github.com">GH</a></li>
|
||||
</ul>
|
||||
</ul>
|
||||
</header>
|
||||
<!-- Commonly visited links -->
|
||||
<section id="fence">
|
||||
<ul id="links">
|
||||
<li id="header">Watch</li>
|
||||
<li><a href="https://www.youtube.com/feed/subscriptions">
|
||||
YouTube</a></li>
|
||||
<li><a href="https://www.twitch.tv/directory/following">
|
||||
Twitch</a></li>
|
||||
<li><a href="https://www.netflix.com">Netflix</a></li>
|
||||
<li><a href="https://www.amazon.com/video">Amazon</a></li>
|
||||
<li><a href="https://www.plex.tv">Plex</a></li>
|
||||
</ul>
|
||||
<ul id="links">
|
||||
<li id="header">Listen</li>
|
||||
<li><a href="https://bandcamp.com/azulien">Bandcamp</a></li>
|
||||
<li><a href="https://www.pandora.com">Pandora</a></li>
|
||||
<li><a href="http://audionoir.com">Audio Noir</a></li>
|
||||
<li><a href="http://www.radio-kol.net/">Radio KoL</a></li>
|
||||
</ul>
|
||||
<ul id="links">
|
||||
<li id="header">Read</li>
|
||||
<li><a href="https://feedly.com">Feedly</a></li>
|
||||
<li><a href="https://news.ycombinator.com/">Hacker News</a></li>
|
||||
<li><a href="https://lobste.rs/">Lobsters</a></li>
|
||||
<li><a href="https://www.reddit.com">Reddit</a></li>
|
||||
<li><a href="https://www.reddit.com/r/vim">/r/vim</a></li>
|
||||
<li><a href="https://www.reddit.com/r/unixporn">/r/unixporn</a></li>
|
||||
<li><a href="https://www.reddit.com/r/stoicism">/r/stoicism</a></li>
|
||||
</ul>
|
||||
<ul id="links">
|
||||
<li id="header">Play</li>
|
||||
<li><a href="https://www.kingdomofloathing.com">
|
||||
Kingdom of Loathing</a></li>
|
||||
<li><a href="https://discordapp.com/channels/@me">Discord</a></li>
|
||||
<li><a href="https://vghd.slack.com/">VGHD Slack</a></li>
|
||||
</ul>
|
||||
</section>
|
||||
<footer>
|
||||
<hr>
|
||||
<p>ENDURE and RENOUNCE</p>
|
||||
</footer>
|
||||
</body>
|
||||
</html>
|
||||
26
makefile
26
makefile
|
|
@ -7,13 +7,11 @@
|
|||
build-simple \
|
||||
clean-all \
|
||||
install-vim-config \
|
||||
install-vim-dir \
|
||||
install-vim-plugin \
|
||||
install-vim-plugins \
|
||||
install-git \
|
||||
install-tmux \
|
||||
install-bash-config \
|
||||
install-bash-profile \
|
||||
install-irssi
|
||||
|
||||
.DEFAULT-GOAL := help
|
||||
#===============================================================================
|
||||
|
|
@ -31,8 +29,7 @@ link-dotfiles: ## Create dotfiles link in Home directory
|
|||
build-default: ## Create default environment, using all dotfiles
|
||||
build-default: link-dotfiles \
|
||||
install-vim-config \
|
||||
install-vim-dir \
|
||||
install-vim-plugin \
|
||||
install-vim-plugins \
|
||||
install-git \
|
||||
install-tmux \
|
||||
install-bash-config
|
||||
|
|
@ -54,18 +51,17 @@ install-vim-config: ## Create vimrc file and vim directory in Home directory
|
|||
ln -s -- "$(CURDIR)"/vim/vimrc "$(HOME)"/.vimrc ; \
|
||||
fi
|
||||
@if [ ! -d "$(HOME)"/.vim ] ; then \
|
||||
mkdir "$(HOME)"/.vim \
|
||||
mkdir "$(HOME)"/.vim ; \
|
||||
fi
|
||||
@cp -uir -- "$(CURDIR)"/vim/vim/ "$(HOME)"/.vim/
|
||||
@echo "Copying Vim directory into ~/.vim"
|
||||
@cp -uir -- "$(CURDIR)"/vim/vim/* "$(HOME)"/.vim/
|
||||
|
||||
install-vim-plugin: ## Create vimrc-plugins (Plugin file) in Home directory
|
||||
install-vim-plugin: install-vim-config
|
||||
@if [ -L "$(HOME)"/.vimrc-plugins ] ; then \
|
||||
echo "File vimrc-plugins already linked; skipping." ; \
|
||||
else \
|
||||
echo "Linking vimrc-plugins to ~/.vimrc-plugins" ; \
|
||||
ln -s -- "$(CURDIR)"/vim/vimrc-plugins "$(HOME)"/.vimrc-plugins ; \
|
||||
fi
|
||||
install-vim-plugins: ## Install configure Vim plugin submodules
|
||||
install-vim-plugins: install-vim-config
|
||||
@echo "Updating all submodules"
|
||||
@git submodule foreach git pull origin master
|
||||
@echo "Updating Vim helptags"
|
||||
@vim -u NONE -c "helptags ALL" -c q
|
||||
|
||||
install-git: ## Create git config and ignore files in Home directory
|
||||
@cp -i -- "$(CURDIR)"/git/gitconfig "$(HOME)"/.gitconfig
|
||||
|
|
|
|||
1
vim/vim/pack/plugins/start/vim-commentary
Submodule
1
vim/vim/pack/plugins/start/vim-commentary
Submodule
|
|
@ -0,0 +1 @@
|
|||
Subproject commit 141d9d32a9fb58fe474fcc89cd7221eb2dd57b3a
|
||||
1
vim/vim/pack/plugins/start/vim-fugitive
Submodule
1
vim/vim/pack/plugins/start/vim-fugitive
Submodule
|
|
@ -0,0 +1 @@
|
|||
Subproject commit 7df9f07e1fd53d560f2e352d5faa3eba92cd1582
|
||||
1
vim/vim/pack/plugins/start/vim-polyglot
Submodule
1
vim/vim/pack/plugins/start/vim-polyglot
Submodule
|
|
@ -0,0 +1 @@
|
|||
Subproject commit 3ddca5da461ebfaa82104f82e3cbf19d1c326ade
|
||||
1
vim/vim/pack/plugins/start/vim-unimpaired
Submodule
1
vim/vim/pack/plugins/start/vim-unimpaired
Submodule
|
|
@ -0,0 +1 @@
|
|||
Subproject commit a49c4f2bf05f18a6e4f6572a19763ba7abba52b1
|
||||
29
vim/vimrc
29
vim/vimrc
|
|
@ -18,10 +18,12 @@ set autoread " Auto-reload modified files
|
|||
set hidden " Allow for un-saved buffers
|
||||
set autochdir " Change directory automatically
|
||||
|
||||
set clipboard+=unnamed " Include the global buffer
|
||||
|
||||
set autoindent " Enable auto-indentation
|
||||
set expandtab " Spaces for tab
|
||||
set shiftwidth=4 " Spaces per shift
|
||||
set softtabstop=4 " Spaces to use when editing
|
||||
set shiftwidth=2 " Spaces per shift
|
||||
set softtabstop=2 " Spaces to use when editing
|
||||
set listchars=tab:>-,trail:· " Show me tabs and spaces
|
||||
|
||||
set number " Enable line numbers
|
||||
|
|
@ -47,9 +49,20 @@ let g:netrw_banner=0 " Disable the netrw banner
|
|||
augroup ruby_settings " Custom settings: Ruby{-like}
|
||||
autocmd!
|
||||
autocmd FileType ruby,eruby,yaml
|
||||
\ setlocal shiftwidth=2
|
||||
\ softtabstop=2
|
||||
\ makeprg=rubocop
|
||||
\ setlocal makeprg=rubocop
|
||||
augroup END
|
||||
|
||||
augroup python_settings " Custom settings: Python-like
|
||||
autocmd!
|
||||
autocmd FileType py
|
||||
\ setlocal shiftwidth=4
|
||||
\ softtabstop=4
|
||||
augroup END
|
||||
|
||||
augroup shell_settings " Custom settings: Shell-like
|
||||
autocmd!
|
||||
autocmd FileType sh
|
||||
\ setlocal makeprg=shellcheck
|
||||
augroup END
|
||||
|
||||
augroup spellcheckr " Spelling, for some files...
|
||||
|
|
@ -197,9 +210,3 @@ function! TmuxWrite(pane, line1, line2) abort
|
|||
return 'echoerr '.string(v:exception)
|
||||
endtry
|
||||
endfunction
|
||||
" ==============================================================================
|
||||
" Plugins
|
||||
" ==============================================================================
|
||||
if filereadable(expand('~/.vimrc-plugins'))
|
||||
source ~/.vimrc-plugins
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -1,20 +0,0 @@
|
|||
" ==============================================================================
|
||||
" vimrc-plugins: Plug-in configuration. Using vim-plug.
|
||||
" ==============================================================================
|
||||
" Fetch & Install Self
|
||||
if empty(glob('~/.vim/autoload/plug.vim'))
|
||||
silent !curl -fLo ~/.vim/autoload/plug.vim --create-dirs
|
||||
\ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
|
||||
autocmd VimEnter * PlugInstall | source $MYVIMRC
|
||||
endif
|
||||
|
||||
call plug#begin('~/.vim/bundle')
|
||||
Plug 'tpope/vim-fugitive'
|
||||
Plug 'tpope/vim-unimpaired'
|
||||
Plug 'tpope/vim-commentary'
|
||||
|
||||
"Plug 'ludovicchabant/vim-gutentags'
|
||||
Plug 'sheerun/vim-polyglot'
|
||||
|
||||
Plug 'junegunn/goyo.vim'
|
||||
call plug#end()
|
||||
Loading…
Reference in a new issue