use stow for ln -s instead of moving.
add nvim add user and music rc files. add zsh
This commit is contained in:
publicmatt
parent
0fbf4b41ee
commit
4f3efc79fe
16
Makefile
16
Makefile
|
|
@ -1,12 +1,12 @@
|
|||
FILES:=.vimrc .gitconfig .bash_profile
|
||||
.PHONY: nvim git shell
|
||||
|
||||
all:$(FILES)
|
||||
. ${HOME}/.bash_profile
|
||||
all: nvim git shell
|
||||
|
||||
$(FILES):
|
||||
cp -rf $(HOME)/$@ dotfiles/$@.bak
|
||||
cp -rf dotfiles/$@ ${HOME}/$@
|
||||
git:
|
||||
stow git -t ${HOME}
|
||||
|
||||
clean:
|
||||
@echo "clean: idk yet.\nTODO: default config swap\n- .git-config.sample.\n- .debian_bash_profile.sample\n- .vimrc.sample?"
|
||||
nvim:
|
||||
stow nvim -t ${HOME}/.config/
|
||||
|
||||
shell:
|
||||
stow shell -t ${HOME}
|
||||
|
|
|
|||
|
|
@ -1,23 +0,0 @@
|
|||
export VISUAL=vi
|
||||
export EDITOR="$VISUAL"
|
||||
|
||||
homestead() {
|
||||
( cd ~/Homestead && vagrant $* )
|
||||
}
|
||||
alias hup="homestead up && homestead ssh"
|
||||
|
||||
PATH=$PATH:$HOME/.config/composer/vendor/bin
|
||||
set -o vi
|
||||
|
||||
# tm - create new tmux session, or switch to existing one. Works from within tmux too. (@bag-man)
|
||||
# `tm` will allow you to select your tmux session via fzf.
|
||||
# `tm irc` will attach to the irc session (if it exists), else it will create it.
|
||||
|
||||
tm() {
|
||||
[[ -n "$TMUX" ]] && change="switch-client" || change="attach-session"
|
||||
if [ $1 ]; then
|
||||
tmux $change -t "$1" 2>/dev/null || (tmux new-session -d -s $1 && tmux $change -t "$1"); return
|
||||
fi
|
||||
session=$(tmux list-sessions -F "#{session_name}" 2>/dev/null | fzf --exit-0) && tmux $change -t "$session" || echo "No sessions found."
|
||||
}
|
||||
. ~/.bashrc
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
[user]
|
||||
name = Matthew Jensen
|
||||
email = "matt@happyhousemedia.com"
|
||||
[alias]
|
||||
lg1 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all
|
||||
lg2 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all
|
||||
lg = !"git lg1"
|
||||
|
||||
|
|
@ -1 +0,0 @@
|
|||
*.bak
|
||||
|
|
@ -1,94 +0,0 @@
|
|||
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 --sync | source $MYVIMRC
|
||||
endif
|
||||
|
||||
" Specify a directory for plugins
|
||||
call plug#begin('~/.vim/plugged')
|
||||
|
||||
Plug 'neoclide/coc.nvim', {'branch': 'release'}
|
||||
Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
|
||||
Plug 'junegunn/fzf.vim'
|
||||
Plug 'jpalardy/vim-slime', {'branch': 'main'}
|
||||
"Plug 'vim-syntastic/syntastic'
|
||||
Plug 'prettier/vim-prettier', { 'do': 'yarn install' }
|
||||
|
||||
" Plug 'christoomey/vim-tmux-navigator'
|
||||
|
||||
" Initialize plugin system
|
||||
call plug#end()
|
||||
|
||||
" Begin coc.vim
|
||||
"
|
||||
" Use tab for trigger completion with characters ahead and navigate.
|
||||
" NOTE: Use command ':verbose imap <tab>' to make sure tab is not mapped by
|
||||
" other plugin before putting this into your config.
|
||||
inoremap <silent><expr> <TAB>
|
||||
\ pumvisible() ? "\<C-n>" :
|
||||
\ <SID>check_back_space() ? "\<TAB>" :
|
||||
\ coc#refresh()
|
||||
inoremap <expr><S-TAB> pumvisible() ? "\<C-p>" : "\<C-h>"
|
||||
|
||||
function! s:check_back_space() abort
|
||||
let col = col('.') - 1
|
||||
return !col || getline('.')[col - 1] =~# '\s'
|
||||
endfunction
|
||||
|
||||
" Use K to show documentation in preview window.
|
||||
nnoremap <silent> K :call <SID>show_documentation()<CR>
|
||||
|
||||
function! s:show_documentation()
|
||||
if (index(['vim','help'], &filetype) >= 0)
|
||||
execute 'h '.expand('<cword>')
|
||||
else
|
||||
call CocActionAsync('doHover')
|
||||
endif
|
||||
endfunction
|
||||
"
|
||||
" End coc.vim
|
||||
"
|
||||
|
||||
nnoremap <silent> <C-f> :Files<CR>
|
||||
nnoremap <silent> <Leader>f :Ag <C-R><C-W><CR>
|
||||
nnoremap <silent> <Leader>b :Buffers<CR>
|
||||
|
||||
set nocompatible " Disable vi-compatibility
|
||||
|
||||
set guifont=menlo\ for\ powerline:h16
|
||||
set guioptions-=T " Removes top toolbar
|
||||
set guioptions-=r " Removes right hand scroll bar
|
||||
set go-=L " Removes left hand scroll bar
|
||||
set linespace=15
|
||||
|
||||
set showmode " always show what mode we're currently editing in
|
||||
"set nowrap " don't wrap lines
|
||||
set tabstop=4 " a tab is four spaces
|
||||
set smarttab
|
||||
set tags=tags
|
||||
set softtabstop=2 " when hitting <BS>, pretend like a tab is removed, even if spaces
|
||||
set expandtab " expand tabs by default (overloadable per file type later)
|
||||
set shiftwidth=4 " number of spaces to use for autoindenting
|
||||
set shiftround " use multiple of shiftwidth when indenting with '<' and '>'
|
||||
set backspace=indent,eol,start " allow backspacing over everything in insert mode
|
||||
set number " always show line numbers
|
||||
set ignorecase " ignore case when searching
|
||||
set smartcase " ignore case if search pattern is all lowercase,
|
||||
set timeout timeoutlen=200 ttimeoutlen=100
|
||||
set visualbell " don't beep
|
||||
set noerrorbells " don't beep
|
||||
set autowrite "Save on buffer switch
|
||||
|
||||
" autocmd TextChanged,TextChangedI <buffer> silent write
|
||||
|
||||
"Load the current buffer in Chrome
|
||||
" nmap ,c :!open -a Firefox<cr>
|
||||
|
||||
" Copy and Paste register between tmux panes.
|
||||
" let g:slime_target = "tmux"
|
||||
" let g:slime_default_config = {"socket_name": "default", "target_pane": "1"}
|
||||
|
||||
" Auto complete current file path to edit, tabe or split
|
||||
map ,e :e <C-R>=expand("%:p:h") . "/" <CR>
|
||||
map ,t :tabe <C-R>=expand("%:p:h") . "/" <CR>
|
||||
map ,s :split <C-R>=expand("%:p:h") . "/" <CR>
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
[init]
|
||||
defaultBranch = main
|
||||
[user]
|
||||
name = publicmatt
|
||||
email = "git@publicmatt.com"
|
||||
|
||||
[alias]
|
||||
lg = lg1
|
||||
lg1 = lg1-specific --all
|
||||
lg2 = lg2-specific --all
|
||||
lg3 = lg3-specific --all
|
||||
|
||||
lg1-specific = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(auto)%d%C(reset)'
|
||||
lg2-specific = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(auto)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)'
|
||||
lg3-specific = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset) %C(bold cyan)(committed: %cD)%C(reset) %C(auto)%d%C(reset)%n'' %C(white)%s%C(reset)%n'' %C(dim white)- %an <%ae> %C(reset) %C(dim white)(committer: %cn <%ce>)%C(reset)'
|
||||
|
||||
[pull]
|
||||
rebase = false
|
||||
[credential]
|
||||
helper = cache
|
||||
|
|
@ -0,0 +1 @@
|
|||
Subproject commit 4b31f8ef9e37f8a02739659a0a505927114c77af
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
########################################################################
|
||||
#
|
||||
# MUSIC STREAMS
|
||||
#
|
||||
########################################################################
|
||||
alias kexp="mpv https://kexp-mp3-128.streamguys1.com/kexp128.mp3"
|
||||
alias kugs="mpv https://peridot.streamguys1.com:7175/kugs-mp3"
|
||||
alias clis="mpv https://stream2.statsradio.com:8012/stream\?\=\&\&___cb\=759135934160766"
|
||||
alias music="find ~/Music/summer_202* ~/Music/fall_20* ~/Music/winter_202* ~/Music/spring_20* -iname '*.mp3' | mpv --playlist=- --shuffle --no-video"
|
||||
#
|
||||
# save a youtube video as audio file
|
||||
yt() {
|
||||
yt-dlp $1 -x --audio-format mp3
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,53 @@
|
|||
########################################################################
|
||||
#
|
||||
# PERSONAL sh stuff
|
||||
#
|
||||
########################################################################
|
||||
|
||||
bt() {
|
||||
echo "powering on"
|
||||
bluetoothctl power on
|
||||
device=$1
|
||||
echo "connecting to $device";
|
||||
bluetoothctl devices | awk -v device="$device" '$0 ~ device {print $2}' | xargs -I{} bluetoothctl connect {}
|
||||
}
|
||||
|
||||
grab() {
|
||||
out=$1
|
||||
echo "pasting clipboard to $out"
|
||||
xclip -sel clipboard -t image/png -o > $out
|
||||
}
|
||||
|
||||
# tm - create new tmux session, or switch to existing one. Works from within tmux too. (@bag-man)
|
||||
# `tm` will allow you to select your tmux session via fzf.
|
||||
# `tm irc` will attach to the irc session (if it exists), else it will create it.
|
||||
|
||||
tm() {
|
||||
[[ -n "$TMUX" ]] && change="switch-client" || change="attach-session"
|
||||
if [ $1 ]; then
|
||||
tmux $change -t "$1" 2>/dev/null || (tmux new-session -d -s $1 && tmux $change -t "$1"); return
|
||||
fi
|
||||
session=$(tmux list-sessions -F "#{session_name}" 2>/dev/null | fzf --exit-0) && tmux $change -t "$session" || echo "No sessions found."
|
||||
}
|
||||
|
||||
# save a youtube video as audio file
|
||||
yt() {
|
||||
youtube-dl $1 -x --audio-format mp3
|
||||
}
|
||||
|
||||
|
||||
########################################################################
|
||||
#
|
||||
# PATH additions
|
||||
#
|
||||
########################################################################
|
||||
alias vi=nvim
|
||||
export VISUAL=nvim
|
||||
export EDITOR="$VISUAL"
|
||||
|
||||
source "$HOME/.cargo/env"
|
||||
export PATH="$PATH:$HOME/.local/bin"
|
||||
export PATH="$PATH:/usr/local/lib/nodejs/bin"
|
||||
export PATH="$PATH:/opt/nvim/bin"
|
||||
|
||||
alias d="sudo docker"
|
||||
|
|
@ -0,0 +1,125 @@
|
|||
# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
|
||||
# Initialization code that may require console input (password prompts, [y/n]
|
||||
# confirmations, etc.) must go above this block; everything else may go below.
|
||||
if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
|
||||
source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
|
||||
fi
|
||||
|
||||
# If you come from bash you might have to change your $PATH.
|
||||
# export PATH=$HOME/bin:/usr/local/bin:$PATH
|
||||
|
||||
# Path to your oh-my-zsh installation.
|
||||
export ZSH="$HOME/.oh-my-zsh"
|
||||
|
||||
# Set name of the theme to load --- if set to "random", it will
|
||||
# load a random theme each time oh-my-zsh is loaded, in which case,
|
||||
# to know which specific one was loaded, run: echo $RANDOM_THEME
|
||||
# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes
|
||||
ZSH_THEME="powerlevel10k/powerlevel10k"
|
||||
|
||||
# Set list of themes to pick from when loading at random
|
||||
# Setting this variable when ZSH_THEME=random will cause zsh to load
|
||||
# a theme from this variable instead of looking in $ZSH/themes/
|
||||
# If set to an empty array, this variable will have no effect.
|
||||
# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" )
|
||||
|
||||
# Uncomment the following line to use case-sensitive completion.
|
||||
# CASE_SENSITIVE="true"
|
||||
|
||||
# Uncomment the following line to use hyphen-insensitive completion.
|
||||
# Case-sensitive completion must be off. _ and - will be interchangeable.
|
||||
# HYPHEN_INSENSITIVE="true"
|
||||
|
||||
# Uncomment one of the following lines to change the auto-update behavior
|
||||
# zstyle ':omz:update' mode disabled # disable automatic updates
|
||||
# zstyle ':omz:update' mode auto # update automatically without asking
|
||||
# zstyle ':omz:update' mode reminder # just remind me to update when it's time
|
||||
|
||||
# Uncomment the following line to change how often to auto-update (in days).
|
||||
# zstyle ':omz:update' frequency 13
|
||||
|
||||
# Uncomment the following line if pasting URLs and other text is messed up.
|
||||
# DISABLE_MAGIC_FUNCTIONS="true"
|
||||
|
||||
# Uncomment the following line to disable colors in ls.
|
||||
# DISABLE_LS_COLORS="true"
|
||||
|
||||
# Uncomment the following line to disable auto-setting terminal title.
|
||||
# DISABLE_AUTO_TITLE="true"
|
||||
|
||||
# Uncomment the following line to enable command auto-correction.
|
||||
# ENABLE_CORRECTION="true"
|
||||
|
||||
# Uncomment the following line to display red dots whilst waiting for completion.
|
||||
# You can also set it to another string to have that shown instead of the default red dots.
|
||||
# e.g. COMPLETION_WAITING_DOTS="%F{yellow}waiting...%f"
|
||||
# Caution: this setting can cause issues with multiline prompts in zsh < 5.7.1 (see #5765)
|
||||
# COMPLETION_WAITING_DOTS="true"
|
||||
|
||||
# Uncomment the following line if you want to disable marking untracked files
|
||||
# under VCS as dirty. This makes repository status check for large repositories
|
||||
# much, much faster.
|
||||
# DISABLE_UNTRACKED_FILES_DIRTY="true"
|
||||
|
||||
# Uncomment the following line if you want to change the command execution time
|
||||
# stamp shown in the history command output.
|
||||
# You can set one of the optional three formats:
|
||||
# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
|
||||
# or set a custom format using the strftime function format specifications,
|
||||
# see 'man strftime' for details.
|
||||
# HIST_STAMPS="mm/dd/yyyy"
|
||||
|
||||
# Would you like to use another custom folder than $ZSH/custom?
|
||||
# ZSH_CUSTOM=/path/to/new-custom-folder
|
||||
|
||||
# Which plugins would you like to load?
|
||||
# Standard plugins can be found in $ZSH/plugins/
|
||||
# Custom plugins may be added to $ZSH_CUSTOM/plugins/
|
||||
# Example format: plugins=(rails git textmate ruby lighthouse)
|
||||
# Add wisely, as too many plugins slow down shell startup.
|
||||
plugins=(git)
|
||||
|
||||
source $ZSH/oh-my-zsh.sh
|
||||
|
||||
# User configuration
|
||||
|
||||
# export MANPATH="/usr/local/man:$MANPATH"
|
||||
|
||||
# You may need to manually set your language environment
|
||||
# export LANG=en_US.UTF-8
|
||||
|
||||
# Preferred editor for local and remote sessions
|
||||
# if [[ -n $SSH_CONNECTION ]]; then
|
||||
# export EDITOR='vim'
|
||||
# else
|
||||
# export EDITOR='mvim'
|
||||
# fi
|
||||
|
||||
# Compilation flags
|
||||
# export ARCHFLAGS="-arch x86_64"
|
||||
|
||||
# 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"
|
||||
|
||||
# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
|
||||
[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
|
||||
|
||||
source ~/.userrc
|
||||
source ~/.musicrc
|
||||
source ~/.wwurc
|
||||
|
||||
|
||||
[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
|
||||
|
||||
# bun completions
|
||||
[ -s "/home/user/.bun/_bun" ] && source "/home/user/.bun/_bun"
|
||||
|
||||
# bun
|
||||
export BUN_INSTALL="$HOME/.bun"
|
||||
export PATH="$BUN_INSTALL/bin:$PATH"
|
||||
Loading…
Reference in New Issue