Compare commits

..

10 Commits

Author SHA1 Message Date
Tom Hicks
436baf3241 Integrates Ubuntu 24.04LTS default bash config and fixes anonymous functions to work properly in bash. 2024-09-30 14:16:46 -07:00
7dbc649489 Removes duplicate fzf script. 2024-09-24 13:01:43 -07:00
Tom Hicks
c34cedc66b Maks install.sh executable. 2024-09-24 12:46:03 -07:00
Tom Hicks
7518283389 Adds dfault gitconfig and global ignore files for git and hg. 2024-09-24 12:42:53 -07:00
Tom Hicks
6484c9e57e Adds missing install script. 2024-09-24 12:24:20 -07:00
Tom Hicks
26d72aa686 Adds a bunch of fixes. 2024-09-24 12:24:20 -07:00
Tom Hicks
51fa32de5d Adds an install script. 2024-09-24 12:24:20 -07:00
Tom Hicks
ccd795ee6f Adds old zsh functions untouched. 2024-09-24 12:24:20 -07:00
Tom Hicks
13eeb245e3 Adds zsh completions script untouched. 2024-09-24 12:24:20 -07:00
Tom Hicks
d9ff0767ec Adds zoxide script. 2024-09-24 12:24:20 -07:00
25 changed files with 327 additions and 19 deletions

7
.bash_logout Normal file
View File

@@ -0,0 +1,7 @@
# ~/.bash_logout: executed by bash(1) when login shell exits.
# when leaving the console clear the screen to increase privacy
if [ "$SHLVL" = 1 ]; then
[ -x /usr/bin/clear_console ] && /usr/bin/clear_console -q
fi

151
.bashrc Normal file
View File

@@ -0,0 +1,151 @@
# ~/.bashrc: executed by bash(1) for non-login shells.
# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
# for examples
# If not running interactively, don't do anything
case $- in
*i*) ;;
*) return;;
esac
# If set, the pattern "**" used in a pathname expansion context will
# match all files and zero or more directories and subdirectories.
#shopt -s globstar
# 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
# set a fancy prompt (non-color, unless we know we "want" color)
case "$TERM" in
xterm-color|*-256color) color_prompt=yes;;
esac
# uncomment for a colored prompt, if the terminal has the capability; turned
# off by default to not distract the user: the focus in a terminal window
# should be on the output of commands, not on the prompt
#force_color_prompt=yes
if [ -n "$force_color_prompt" ]; then
if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
# We have color support; assume it's compliant with Ecma-48
# (ISO/IEC-6429). (Lack of such support is extremely rare, and such
# a case would tend to support setf rather than setaf.)
color_prompt=yes
else
color_prompt=
fi
fi
if [ "$color_prompt" = yes ]; then
PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
else
PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
fi
unset color_prompt force_color_prompt
# If this is an xterm set the title to user@host:dir
case "$TERM" in
xterm*|rxvt*)
PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1"
;;
*)
;;
esac
# enable color support of ls and also add handy aliases
if [ -x /usr/bin/dircolors ]; then
test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
alias ls='ls --color=auto'
#alias dir='dir --color=auto'
#alias vdir='vdir --color=auto'
alias grep='grep --color=auto'
alias fgrep='fgrep --color=auto'
alias egrep='egrep --color=auto'
fi
# colored GCC warnings and errors
#export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
# some more ls aliases
alias ll='ls -alF'
alias la='ls -A'
alias l='ls -CF'
# Add an "alert" alias for long running commands. Use like so:
# sleep 10; alert
alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
# Alias definitions.
# You may want to put all your additions into a separate file like
# ~/.bash_aliases, instead of adding them here directly.
# See /usr/share/doc/bash-doc/examples in the bash-doc package.
if [ -f ~/.bash_aliases ]; then
. ~/.bash_aliases
fi
## Begin .rc.d stuff
## Homebrew
# Consider moving this to a .rc.d script.
# If Apple Silicon Homebrew is installed activate it.
if [ -x "/usr/local/homebrew/bin/brew" ]; then
eval "$(/usr/local/homebrew/bin/brew shellenv)"
# If x86_64 Homebrew is installed alias it to brew86.
if [ -x "/opt/homebrew/bin/brew" ]; then
alias brew86='arch -x86_64 /usr/local/homebrew/bin/brew'
fi
fi
# If x86_64 Homebrew is installed activate it.
if [ -x "/opt/homebrew/bin/brew" ]; then
eval "$(/opt/homebrew/bin/brew shellenv)"
# If Apple Silicon Homebrew is installed alias it to brewarm.
if [ -x "/usr/local/homebrew/bin/brew" ]; then
alias brewarm='arch -arm64 /opt/homebrew/bin/brew'
fi
fi
## Source all scripts in ~/.rc.d
for f in ~/.rc.d/*.sh; do
source "$f"
done
## Autocompletion
# enable programmable completion features (you don't need to enable
# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
# sources /etc/bash.bashrc).
if ! shopt -oq posix; then
if [ -f /usr/share/bash-completion/bash_completion ]; then
. /usr/share/bash-completion/bash_completion
elif [ -f /etc/bash_completion ]; then
. /etc/bash_completion
fi
fi
## Functions
## Configure History
# don't put duplicate lines or lines starting with space in the history.
# See bash(1) for more options
HISTCONTROL=ignoreboth
# append to the history file, don't overwrite it
shopt -s histappend
# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
HISTSIZE=1000
HISTFILESIZE=2000
# check the window size after each command and, if necessary,
# update the values of LINES and COLUMNS.
shopt -s checkwinsize

22
.gitconfig Normal file
View File

@@ -0,0 +1,22 @@
[user]
name = Tom Hicks
email = headunter3@gmail.com
[core]
excludesfile = /Users/tom/.gitignore_global
[alias]
amend = commit --amend --no-edit
br = branch
brr = branch -r
co = checkout
ls = log --oneline --graph --decorate --all
st = status
cm = commit -m
aa = add --all .
cam = !git add --all . && git commit --amend --no-edit
rbs = !git checkout main && git pull && git checkout - && git rebase main
cop = "!f() { git checkout ${1-main}; git pull; }; f"
lazy = commit -C HEAD@{1}
[pull]
ff = only
[init]
defaultBranch = main

2
.gitignore_global Normal file
View File

@@ -0,0 +1,2 @@
*~
.DS_Store

4
.hgignore_global Normal file
View File

@@ -0,0 +1,4 @@
syntax: glob
*~
.DS_Store

28
.profile Normal file
View File

@@ -0,0 +1,28 @@
# ~/.profile: executed by the command interpreter for login shells.
# This file is not read by bash(1), if ~/.bash_profile or ~/.bash_login
# exists.
# see /usr/share/doc/bash/examples/startup-files for examples.
# the files are located in the bash-doc package.
# the default umask is set in /etc/profile; for setting the umask
# for ssh logins, install and configure the libpam-umask package.
#umask 022
# TODO: Do this for zsh and exec $HOME/.zshrc?
# if running bash
if [ -n "$BASH_VERSION" ]; then
# include .bashrc if it exists
if [ -f "$HOME/.bashrc" ]; then
. "$HOME/.bashrc"
fi
fi
# set PATH so it includes user's private bin if it exists
if [ -d "$HOME/bin" ] ; then
PATH="$HOME/bin:$PATH"
fi
# set PATH so it includes user's private bin if it exists
if [ -d "$HOME/.local/bin" ] ; then
PATH="$HOME/.local/bin:$PATH"
fi

0
.rc.d/aliases.sh Normal file → Executable file
View File

0
.rc.d/cargo.sh Normal file → Executable file
View File

2
.rc.d/fzf.sh Normal file → Executable file
View File

@@ -11,4 +11,6 @@
# To use fzf in Vim, add the following line to your .vimrc:
# set rtp+=/opt/homebrew/opt/fzf
if [ -x "$(which fzf)" ]; then
source <(fzf --zsh)
fi

3
.rc.d/icu.sh Normal file → Executable file
View File

@@ -1,4 +1,4 @@
function {
function anon() {
local icu_path=/opt/homebrew/opt/icu4c
local bin_path=$icu_path/bin
local sbin_path=$icu_path/sbin
@@ -9,3 +9,4 @@ function {
path=($sbin_path $path)
fi
}
unset -f anon

3
.rc.d/iterm2.sh Normal file → Executable file
View File

@@ -1,6 +1,7 @@
function {
function anon() {
local script_path="$HOME/.iterm2_shell_integration.zsh"
if [ "$TERM_PROGRAM" = "iTerm.app" -a -e "$script_path" ]; then
source "$script_path"
fi
}
unset -f anon

0
.rc.d/ls-colors.sh Normal file → Executable file
View File

View File

@@ -1,5 +1,5 @@
function {
$nvm_dir="$HOME/.nvm"
function anon() {
local nvm_dir="$HOME/.nvm"
if [ -d $nvm_dir ]; then
[ -s $nvm_dir/nvm.sh ] && \. $nvm_dir/nvm.sh # This loads nvm
@@ -7,3 +7,4 @@ function {
export NVM_DIR=$nvm_dir
fi
}
unset -f anon

5
.rc.d/qb64.sh Normal file → Executable file
View File

@@ -1,10 +1,11 @@
# TODO: make this detect the latest version at least.
# TODO: make a formula or cask for this so it can come from homebrew instead.
function {
function anon() {
bin_path="$HOME/Applications/qb64_2022-09-08-23-37-44-47f5044_osx"
if [ -d $bin_path ]; then
$path=($bin_path $path)
path=($bin_path $path)
fi
}
unset -f anon

5
.rc.d/yarn.sh Normal file → Executable file
View File

@@ -1,6 +1,7 @@
function {
function anon() {
if [[ $(command -v yarn) ]]; then
local yarn_path="$(yarn global bin)"
$path=($yarn_path $path)
path=($yarn_path $path)
fi
}
unset -f anon

12
.rc.d/zoxide.sh Executable file
View File

@@ -0,0 +1,12 @@
# TODO: Check if zoxide_path exists.
# TODO: Check shell better.
# -n $zoxide_path -a -n $zoxide_path
function anon() {
zoxide_path=$(which zoxide)
if [ -n $zoxide_path -a $zoxide_path != "zoxide not found" ]; then
if [ "$SHELL" = "/bin/zsh" ]; then
eval "$(zoxide init --cmd cd zsh)"
fi
fi
}
unset -f anon

10
.rc.d/zsh-completions.sh Executable file
View File

@@ -0,0 +1,10 @@
if type brew &>/dev/null; then
fpath=( $(brew --prefix)/share/zsh-completions "${fpath[@]}" )
fi
# If you receive "zsh compinit: insecure directories" warnings when attempting
# to load these completions, you may need to run these commands:
# chmod go-w '/opt/homebrew/share'
# chmod -R go-w '/opt/homebrew/share/zsh'
# compinit will load and run after this in .zshrc

View File

@@ -13,3 +13,22 @@
# /etc/zlogin
# ~/.zlogin
##fi
# set PATH so it includes user's private bin if it exists
if [ -d "$HOME/bin" ] ; then
PATH="$HOME/bin:$PATH"
fi
# set PATH so it includes user's private bin if it exists
if [ -d "$HOME/.local/bin" ] ; then
PATH="$HOME/.local/bin:$PATH"
fi
## ZSH version of this
# # if running bash
# if [ -n "$BASH_VERSION" ]; then
# # include .bashrc if it exists
# if [ -f "$HOME/.bashrc" ]; then
# . "$HOME/.bashrc"
# fi
# fi

9
.zsh_functions/clone Executable file
View File

@@ -0,0 +1,9 @@
clone() {
if [ -z "$1" -o "$1" = " " -o -z "$2" -o "$2" = " " ]; then
echo "Clones the repo into \$PROJECT_ROOT/<projectName>"
echo "usage: clone <repositoryUrl> <projectName>"
return
fi
git clone "$1" "$2"
}

9
.zsh_functions/compress Executable file
View File

@@ -0,0 +1,9 @@
compress(){
if [ -z "$1" -o "$1" = " " ]; then
echo "Compresses all of <basename>* to ../compresses/<basename>.tar.bz2"
echo "usage: compress <basename>"
return
fi
tar -jcvf ../compressed/$1.tar.bz2 $1* && rm $1*
}

18
.zsh_functions/remind Executable file
View File

@@ -0,0 +1,18 @@
# Use like this
# some-command && sleep 1 ; alert-me -s -t -f --success-message --success-title --failure-message --failure-title --title
# osascript -e 'display notification "The command worked" with title "Success"'
# osascript -e 'display notification "The command failed" with title "Failed"'
alert-me(){
local SUCCESS_MESSAGE="The command worked"
local SUCCESS_TITLE="Success"
local FAILURE_MESSAGE="The command failed"
local FAILURE_TITLE="Failed"
if [ $? -eq 0 ]; then
osascript -e "display notification \"$SUCCESS_MESSAGE\" with title \"$SUCCESS_TITLE\""
else
osascript -e "display notification \"$FAILURE_MESSAGE\" with title \"$FAILURE_TITLE\""
fi
}

6
.zsh_functions/whatsapp-backup Executable file
View File

@@ -0,0 +1,6 @@
whatsapp-backup() {
TIMESTAMP=`python3 -c "from datetime import datetime; print(datetime.now().strftime('%Y-%m-%d.%H-%M-%S.%f'))"`
DESTDIR=~/Downloads/WhatsApp-export-$TIMESTAMP
mkdir -p $DESTDIR
find ~/Library/Group\ Containers/group.net.whatsapp.WhatsApp.shared/ -type f -iname '*.*' -exec cp "{}" $DESTDIR \;
}

10
.zshrc
View File

@@ -21,16 +21,6 @@ for f in ~/.rc.d/*.sh; do
source "$f"
done
# Append personal bin to path
if [ -d "$HOME/bin" ] ; then
PATH="$HOME/bin:$PATH"
fi
# Append local personal bin to path
if [ -d "$HOME/.local/bin" ] ; then
PATH="$HOME/.local/bin:$PATH"
fi
# Activate ZSH autocompletion.
autoload -Uz compinit
compinit

View File

@@ -7,3 +7,10 @@ Refresh history after modifying
```shell
cat history/all.md| LC_ALL=C sort -u -o history/all.md
```
## TODO
* Look into lesspipe from .bashrc and make a script in .rc.d
* Move debian_chroot, color_prompt, and PS1 from .bashrc to .rc.d
* Move dircolors stuff from .bashrc to .rc.d
* Move content from ~/.bash_aliases to .rc.d

7
install.sh Executable file
View File

@@ -0,0 +1,7 @@
#! /usr/bin/env sh
cp .gitconfig .gitignore .gitignore_global ../
cp .hgignore_global ../
cp .profile ../
cp .bash_logout .bashrc ../
cp -r .zsh_functions .zprofile .zshenv .zshrc ../
cp -r .rc.d ../