Compare commits

...

13 Commits

10 changed files with 238 additions and 33 deletions

View File

@@ -1,11 +1,12 @@
stores:
apps:
target: ~/
target: "~"
files:
- .omp
- .emacs.d/init.el
- .tmux.conf
bash:
target: ~/
target: "~"
files:
- .aliases
- .bash_profile
@@ -13,11 +14,16 @@ stores:
- .env
- .functions
- .prompt
fish:
target: ~/.config/fish
files:
- config.fish
- aliases.fish
fun:
target: ~/
target: "~"
files:
- .fun
git:
target: ~/
target: "~"
files:
- .gitconfig

View File

@@ -1,4 +1,24 @@
# My Dotfiles - main
# My Dotfiles
Dotfiles that represent the shared scripts and configs across all shells and hosts
Dotfiles that represent the shared scripts and configs across all shells and hosts. Leverages the
`store` Go application to reconcile symlinks and organize configurations in the home directory.
On any new machine, clone the repo:
```sh
git clone <repo-url>
cd dotfiles
```
Download a pre-built binary at [github.com/cushycush/store](https://github.com/cushycush/store/releases)
or follow install instructions [here](https://github.com/cushycush/store#installation).
Then simply run the `store` command that reads the config file and applies all changes:
```sh
store apply
# or interactively
store tui
```

View File

@@ -1,3 +1,5 @@
;; sourced from https://github.com/typesAreSpaces/.emacs-cs-357-config
(require 'package)
(custom-set-variables
;; custom-set-variables was added by Custom.

52
apps/.tmux.conf Normal file
View File

@@ -0,0 +1,52 @@
# tmux config file
# with help from https://hamvocke.com/blog/a-guide-to-customizing-your-tmux-conf/
# remap prefix from 'C-b' to 'C-a' (easy with caps-lock remap)
unbind C-b
set-option -g prefix C-a
bind-key C-a send-prefix
# split panes using | and -
bind | split-window -h
bind - split-window -v
unbind '"'
unbind %
# switch panes using alt-arrow without prefix
bind -n M-Left select-pane -L
bind -n M-Right select-pane -R
bind -n M-Up select-pane -U
bind -n M-Down select-pane -D
# enable mouse control
set -g mouse on
# don't rename windows automatically
set-option -g allow-rename off
# faster, snappier
set -g escape-time 0
set -g history-limit 200000
# use 256 colors + better terminal features
set -g default-terminal "tmux-256color"
set -as terminal-features ",xterm-256color:RGB"
set -g focus-events on
# Start windows/panes at 1 (more human, less C)
set -g base-index 1
setw -g pane-base-index 1
# Renumber windows when one is closed
set -g renumber-windows on
# Status bar: simple + useful
set -g status-interval 5
set -g status-left-length 40
set -g status-right-length 120
set -g status-left " #[bold]#S #[default]"
set -g status-right " %Y-%m-%d %H:%M "
# Reduce “my panes renamed themselves” chaos
set -g allow-rename off
setw -g automatic-rename on

View File

@@ -1,15 +1,15 @@
# Custom Bash Aliases
## system services
# system services
alias restart="sudo systemctl restart"
alias status="sudo systemctl status"
## navigation
# navigation
alias ..='cd ..'
alias ...='cd ../../'
alias ....='cd ../../../'
## system information
# system information
alias connections="sudo netstat -tunlp"
alias ports='netstat -tulanp'
alias path='echo -e ${PATH//:/\\n}'
@@ -17,38 +17,47 @@ alias free='free -m -l -t'
alias psmem='ps auxf | sort -nr -k 4 | head -10'
alias pscpu='ps auxf | sort -nr -k 3 | head -10'
## system logs
# system logs
alias logtail="tail -n 200 /var/log/syslog"
## system administration
# system administration
alias upgrade="sudo apt update && sudo apt upgrade -y"
alias syscat='systemctl cat'
alias sysls='systemctl list-unit-files --type=service --state=enabled'
alias syslsa='systemctl list-unit-files --type=service'
## safe defaults
# safe defaults
alias rm='rm -I --preserve-root'
alias chown='chown --preserve-root'
alias chmod='chmod --preserve-root'
alias chgrp='chgrp --preserve-root'
## apps
# alias `git` and add completion
alias g='git'
# enable tab completion for 'g' by marking as alias for 'git'
if type _git &> /dev/null; then
complete -o default -o nospace -F _git g;
fi
# bat[cat] setup -- check for command name and alias accordingly
if command -v batcat &> /dev/null && ! command -v bat &> /dev/null; then
alias bat='batcat'
fi
# use `bat` for help command (override bash built-in)
alias bathelp='bat --plain --language=help'
help() {
"$@" --help 2>&1 | bathelp
}
## text editing
alias edit="emacs $1"
alias sedit="sudo emacs $1"
# text editing
alias edit="emacs"
alias sedit="sudo emacs"
## ls helpers
# ls helpers
alias l="ls -lFh --color"
alias la="ls -AF --color" # exclude . and ..
alias lsd="ls -F --color | grep --color=never '^d'" # only directories
alias lsd="ls -lFh --color | grep --color=never '^d'" # only directories
alias ls="command ls --color" # always color
alias ll="ls -AlFh --color"
@@ -57,7 +66,7 @@ alias grep='grep --color=auto'
alias fgrep='fgrep --color=auto'
alias egrep='egrep --color=auto'
## misc utils
# misc utils
alias ip="dig +short myip.opendns.com @resolver1.opendns.com"
alias ping='ping -c 5'
alias reload="exec ${SHELL} -l" # reload the shell

View File

@@ -2,25 +2,22 @@
# Adrian Abeyta <adrian@adrianabeyta.com>
# don't do anything if not running interactively
case $- in
*i*) ;;
*) return;;
esac
[[ $- != *i* ]] && return
# include user home bins if they exist
if [ -d "$HOME/bin" ] ; then
PATH="$HOME/bin:$PATH"
fi;
fi
if [ -d "$HOME/.local/bin" ] ; then
PATH="$HOME/.local/bin:$PATH"
fi;
fi
# load the dotfiles
for file in ~/.{env,path,functions,aliases,prompt}; do
[ -r "$file" ] && [ -f "$file" ] && \
source "$file";
done;
unset file;
unset file
# fun scripts
if is_true "${HAVE_FUN:-}"; then
@@ -31,8 +28,3 @@ shopt -s nocaseglob; # case-insensitive globbing
shopt -s histappend; # append to bash history file
shopt -s cdspell; # autocorrect typos in path names when cd'ing
shopt -s checkwinsize # update col/line values on each command
# enable tab completion for 'g' by marking as alias for 'git'
if type _git &> /dev/null; then
complete -o default -o nospace -F _git g;
fi;

View File

@@ -1 +1 @@
[ -n "$PS1" ] && source ~/.bash_profile;
[ -n "$PS1" ] && [[ -f ~/.bash_profile ]] && source ~/.bash_profile;

90
fish/aliases.fish Normal file
View File

@@ -0,0 +1,90 @@
# Custom aliases, ported from bash ~/.aliases
# system services
alias restart 'sudo systemctl restart'
alias sysstatus 'sudo systemctl status' # `status` is a reserved fish builtin
# navigation (fish also cds on a bare directory path like `..` or `../..`)
alias .. 'cd ..'
alias ... 'cd ../..'
alias .... 'cd ../../..'
# system information
alias connections 'sudo netstat -tunlp'
alias ports 'netstat -tulanp'
function pathls --description 'Print PATH one entry per line'
printf '%s\n' $PATH
end
alias free 'free -m -l -t'
function psmem --description 'Top 10 processes by memory'
ps auxf | sort -nr -k 4 | head -10
end
function pscpu --description 'Top 10 processes by CPU'
ps auxf | sort -nr -k 3 | head -10
end
# system logs
alias logtail 'tail -n 200 /var/log/syslog'
# system administration
alias upgrade 'sudo apt update && sudo apt upgrade -y'
alias syscat 'systemctl cat'
alias sysls 'systemctl list-unit-files --type=service --state=enabled'
alias syslsa 'systemctl list-unit-files --type=service'
# safe defaults
alias rm 'rm -I --preserve-root'
alias chown 'chown --preserve-root'
alias chmod 'chmod --preserve-root'
alias chgrp 'chgrp --preserve-root'
# git (no completion setup needed like with bash)
alias g git
# check for existence of batcat command before aliasing
if command -q batcat; and not command -q bat
alias bat batcat
end
# overrides built-in `help` command
alias bathelp 'bat --plain --language=help'
function help --description "Show a command's --help through bat"
$argv --help 2>&1 | bathelp
end
# text editing
alias edit emacs
alias sedit 'sudo emacs'
# ls helpers (override system-wide fish config aliases)
if command -q eza
# use `eza` if available; -a hides . and .. like ls -A
set -l eza_opts --color=auto --icons=auto --group-directories-first
alias ls "eza $eza_opts" # preferred listing
alias l "eza -lF $eza_opts" # long format
alias la "eza -a $eza_opts" # all files and dirs
alias ll "eza -alF $eza_opts" # long format, all files
alias lt "eza -aT $eza_opts" # tree listing
alias lsd "eza -lD $eza_opts" # only directories
alias l. "eza -a | grep -e '^\.'" # only dotfiles
else
# fallback to `ls`
alias ls 'command ls --color' # always color
alias l 'ls -lFh'
alias la 'ls -AF' # exclude . and ..
alias ll 'ls -AlFh'
function lsd --description 'List only directories'
command ls -lFh --color=always $argv | grep --color=never '^d'
end
end
# always enable colored grep output
alias grep 'grep --color=auto'
alias fgrep 'fgrep --color=auto'
alias egrep 'egrep --color=auto'
# misc utils
alias ip 'dig +short myip.opendns.com @resolver1.opendns.com'
alias ping 'ping -c 5'
alias reload 'exec fish -l' # reload the shell

32
fish/config.fish Normal file
View File

@@ -0,0 +1,32 @@
# this config file runs last after all ./conf.d/* files
# system-wide fish config
source /usr/share/cachyos-fish-config/cachyos-config.fish
# overwrite greeting
# potentially disabling fastfetch
#function fish_greeting
# smth smth
#end
# load custom aliases that clobber system-wide sourced in above config
test -r ~/.config/fish/aliases.fish; and source ~/.config/fish/aliases.fish
# common bin directories
fish_add_path --global --prepend ~/.local/bin ~/bin
# opencode
fish_add_path /home/adrian/.opencode/bin
# Go code paths
fish_add_path /usr/local/go/bin
fish_add_path "$(go env GOPATH)/bin"
# fun scripts
if string match -qir '^(1|y|yes|true|on)$' -- "$HAVE_FUN"
and test -r ~/.config/fish/fun.fish
source ~/.config/fish/fun.fish
end
# init oh-my-posh with custom theme
oh-my-posh init fish --config '~/.omp/themes/custom.json' | source

View File

@@ -16,6 +16,8 @@
f = fetch --all
m = merge
p = push
pf = push --force-with-lease