Compare commits
20 Commits
178acd261a
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 5edb3ff498 | |||
| 1a5622d1d6 | |||
| 40a51e8511 | |||
| a2acf44f91 | |||
| f69d4376d1 | |||
| d61d877464 | |||
| f1575749c3 | |||
| d5567ef7ca | |||
| 2083bcc6a4 | |||
| 2f87d6b029 | |||
| d89ac50b14 | |||
| 6232fe80c4 | |||
| 81695100d2 | |||
| c9084ddcdf | |||
| cee8498648 | |||
| c4d37b9e29 | |||
| c0d7bebfd0 | |||
| 9d49dae087 | |||
| 2a676ad2cb | |||
| f5e2861db2 |
@@ -1,10 +1,12 @@
|
|||||||
stores:
|
stores:
|
||||||
apps:
|
apps:
|
||||||
target: ~/
|
target: "~"
|
||||||
files:
|
files:
|
||||||
- .omp
|
- .omp
|
||||||
|
- .emacs.d/init.el
|
||||||
|
- .tmux.conf
|
||||||
bash:
|
bash:
|
||||||
target: ~/
|
target: "~"
|
||||||
files:
|
files:
|
||||||
- .aliases
|
- .aliases
|
||||||
- .bash_profile
|
- .bash_profile
|
||||||
@@ -12,11 +14,16 @@ stores:
|
|||||||
- .env
|
- .env
|
||||||
- .functions
|
- .functions
|
||||||
- .prompt
|
- .prompt
|
||||||
|
fish:
|
||||||
|
target: ~/.config/fish
|
||||||
|
files:
|
||||||
|
- config.fish
|
||||||
|
- aliases.fish
|
||||||
fun:
|
fun:
|
||||||
target: ~/
|
target: "~"
|
||||||
files:
|
files:
|
||||||
- .fun
|
- .fun
|
||||||
git:
|
git:
|
||||||
target: ~/
|
target: "~"
|
||||||
files:
|
files:
|
||||||
- .gitconfig
|
- .gitconfig
|
||||||
|
|||||||
@@ -1,22 +0,0 @@
|
|||||||
stores:
|
|
||||||
apps:
|
|
||||||
target: ~/
|
|
||||||
files:
|
|
||||||
- .omp
|
|
||||||
bash:
|
|
||||||
target: ~/
|
|
||||||
files:
|
|
||||||
- .aliases
|
|
||||||
- .bash_profile
|
|
||||||
- .bashrc
|
|
||||||
- .env
|
|
||||||
- .functions
|
|
||||||
- .prompt
|
|
||||||
fun:
|
|
||||||
target: /home/pasquale
|
|
||||||
files:
|
|
||||||
- .fun
|
|
||||||
git:
|
|
||||||
target: ~/
|
|
||||||
files:
|
|
||||||
- .gitconfig
|
|
||||||
24
README.md
24
README.md
@@ -1,2 +1,24 @@
|
|||||||
# dotfiles
|
# My Dotfiles
|
||||||
|
|
||||||
|
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
|
||||||
|
```
|
||||||
|
|
||||||
|
|||||||
80
apps/.emacs.d/init.el
Normal file
80
apps/.emacs.d/init.el
Normal file
@@ -0,0 +1,80 @@
|
|||||||
|
;; sourced from https://github.com/typesAreSpaces/.emacs-cs-357-config
|
||||||
|
|
||||||
|
(require 'package)
|
||||||
|
(custom-set-variables
|
||||||
|
;; custom-set-variables was added by Custom.
|
||||||
|
;; If you edit it by hand, you could mess it up, so be careful.
|
||||||
|
;; Your init file should contain only one such instance.
|
||||||
|
;; If there is more than one, they won't work right.
|
||||||
|
'(custom-enabled-themes '(wombat))
|
||||||
|
'(inhibit-startup-screen t)
|
||||||
|
'(package-archives
|
||||||
|
'(("gnu" . "https://elpa.gnu.org/packages/")
|
||||||
|
("melpa" . "https://melpa.org/packages/")))
|
||||||
|
'(package-selected-packages '(haskell-mode geiser)))
|
||||||
|
(package-initialize)
|
||||||
|
|
||||||
|
(setq package-list '(haskell-mode))
|
||||||
|
|
||||||
|
(unless package-archive-contents
|
||||||
|
(package-refresh-contents))
|
||||||
|
|
||||||
|
(dolist (package package-list)
|
||||||
|
(unless (package-installed-p package)
|
||||||
|
(package-install package)))
|
||||||
|
|
||||||
|
;; Basic UI setup
|
||||||
|
(require 'font-lock)
|
||||||
|
(global-font-lock-mode t)
|
||||||
|
(show-paren-mode 1)
|
||||||
|
(put 'upcase-region 'disabled nil)
|
||||||
|
(put 'eval-expression 'disabled nil)
|
||||||
|
|
||||||
|
(setq line-number-mode t)
|
||||||
|
(setq column-number-mode t)
|
||||||
|
(setq confirm-save-buffers nil)
|
||||||
|
|
||||||
|
;; y or n is sufficient for yes or no questions
|
||||||
|
(fset 'yes-or-no-p 'y-or-n-p)
|
||||||
|
;; show me the time
|
||||||
|
(display-time)
|
||||||
|
|
||||||
|
;; Basic Racket setup
|
||||||
|
(setq scheme-program-name "/usr/bin/racket")
|
||||||
|
(setq auto-mode-alist
|
||||||
|
(cons '("\\.rkt\\'" . scheme-mode)
|
||||||
|
auto-mode-alist))
|
||||||
|
|
||||||
|
(defun run-scheme2 ()
|
||||||
|
"Run scheme-program-name and disable geiser-mode."
|
||||||
|
(interactive)
|
||||||
|
(split-window-right)
|
||||||
|
(geiser-mode -1)
|
||||||
|
(windmove-right)
|
||||||
|
(run-scheme scheme-program-name))
|
||||||
|
|
||||||
|
;; Basic Haskell setup
|
||||||
|
(require 'haskell-mode)
|
||||||
|
(setq haskell-program-name "/usr/bin/ghci")
|
||||||
|
(setq auto-mode-alist
|
||||||
|
(cons '("\\.hs\\'" . haskell-mode)
|
||||||
|
auto-mode-alist))
|
||||||
|
(add-hook 'haskell-mode-hook 'turn-on-haskell-doc-mode)
|
||||||
|
;; Choose indentation mode (the latter requires haskell-mode >= 2.5):
|
||||||
|
(add-hook 'haskell-mode-hook 'turn-on-haskell-indent)
|
||||||
|
;;(add-hook 'haskell-mode-hook 'turn-on-haskell-indentation)
|
||||||
|
|
||||||
|
(custom-set-faces
|
||||||
|
;; custom-set-faces was added by Custom.
|
||||||
|
;; If you edit it by hand, you could mess it up, so be careful.
|
||||||
|
;; Your init file should contain only one such instance.
|
||||||
|
;; If there is more than one, they won't work right.
|
||||||
|
)
|
||||||
|
|
||||||
|
;; autosave files (e.g. #file#)
|
||||||
|
(setq auto-save-file-name-transforms
|
||||||
|
`((".*" "~/.emacs.d/auto-saves/" t)))
|
||||||
|
|
||||||
|
;; backup files (e.g. file~)
|
||||||
|
(setq backup-directory-alist
|
||||||
|
`((".*" . "~/.emacs.d/backups/")))
|
||||||
52
apps/.tmux.conf
Normal file
52
apps/.tmux.conf
Normal 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
|
||||||
@@ -1,15 +1,15 @@
|
|||||||
# Custom Bash Aliases
|
# Custom Bash Aliases
|
||||||
|
|
||||||
## system services
|
# system services
|
||||||
alias restart="sudo systemctl restart"
|
alias restart="sudo systemctl restart"
|
||||||
alias status="sudo systemctl status"
|
alias status="sudo systemctl status"
|
||||||
|
|
||||||
## navigation
|
# navigation
|
||||||
alias ..='cd ..'
|
alias ..='cd ..'
|
||||||
alias ...='cd ../../'
|
alias ...='cd ../../'
|
||||||
alias ....='cd ../../../'
|
alias ....='cd ../../../'
|
||||||
|
|
||||||
## system information
|
# system information
|
||||||
alias connections="sudo netstat -tunlp"
|
alias connections="sudo netstat -tunlp"
|
||||||
alias ports='netstat -tulanp'
|
alias ports='netstat -tulanp'
|
||||||
alias path='echo -e ${PATH//:/\\n}'
|
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 psmem='ps auxf | sort -nr -k 4 | head -10'
|
||||||
alias pscpu='ps auxf | sort -nr -k 3 | head -10'
|
alias pscpu='ps auxf | sort -nr -k 3 | head -10'
|
||||||
|
|
||||||
## system logs
|
# system logs
|
||||||
alias logtail="tail -n 200 /var/log/syslog"
|
alias logtail="tail -n 200 /var/log/syslog"
|
||||||
|
|
||||||
## system administration
|
# system administration
|
||||||
alias upgrade="sudo apt update && sudo apt upgrade -y"
|
alias upgrade="sudo apt update && sudo apt upgrade -y"
|
||||||
alias syscat='systemctl cat'
|
alias syscat='systemctl cat'
|
||||||
alias sysls='systemctl list-unit-files --type=service --state=enabled'
|
alias sysls='systemctl list-unit-files --type=service --state=enabled'
|
||||||
alias syslsa='systemctl list-unit-files --type=service'
|
alias syslsa='systemctl list-unit-files --type=service'
|
||||||
|
|
||||||
## safe defaults
|
# safe defaults
|
||||||
alias rm='rm -I --preserve-root'
|
alias rm='rm -I --preserve-root'
|
||||||
alias chown='chown --preserve-root'
|
alias chown='chown --preserve-root'
|
||||||
alias chmod='chmod --preserve-root'
|
alias chmod='chmod --preserve-root'
|
||||||
alias chgrp='chgrp --preserve-root'
|
alias chgrp='chgrp --preserve-root'
|
||||||
|
|
||||||
## apps
|
# alias `git` and add completion
|
||||||
alias g='git'
|
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
|
||||||
|
|
||||||
alias bat='batcat'
|
# 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'
|
alias bathelp='bat --plain --language=help'
|
||||||
help() {
|
help() {
|
||||||
"$@" --help 2>&1 | bathelp
|
"$@" --help 2>&1 | bathelp
|
||||||
}
|
}
|
||||||
|
|
||||||
## text editing
|
# text editing
|
||||||
alias edit="emacs $1"
|
alias edit="emacs"
|
||||||
alias sedit="sudo emacs $1"
|
alias sedit="sudo emacs"
|
||||||
|
|
||||||
## ls helpers
|
# ls helpers
|
||||||
alias l="ls -lF --color"
|
alias l="ls -lFh --color"
|
||||||
alias la="ls -AF --color" # exclude . and ..
|
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 ls="command ls --color" # always color
|
||||||
alias ll="ls -AlFh --color"
|
alias ll="ls -AlFh --color"
|
||||||
|
|
||||||
@@ -57,7 +66,7 @@ alias grep='grep --color=auto'
|
|||||||
alias fgrep='fgrep --color=auto'
|
alias fgrep='fgrep --color=auto'
|
||||||
alias egrep='egrep --color=auto'
|
alias egrep='egrep --color=auto'
|
||||||
|
|
||||||
## misc utils
|
# misc utils
|
||||||
alias ip="dig +short myip.opendns.com @resolver1.opendns.com"
|
alias ip="dig +short myip.opendns.com @resolver1.opendns.com"
|
||||||
alias ping='ping -c 5'
|
alias ping='ping -c 5'
|
||||||
alias reload="exec ${SHELL} -l" # reload the shell
|
alias reload="exec ${SHELL} -l" # reload the shell
|
||||||
|
|||||||
@@ -1,27 +1,23 @@
|
|||||||
# .bash_profile
|
# .bash_profile
|
||||||
# Adrian Abeyta <adrian@adrianabeyta.com>
|
# Adrian Abeyta <adrian@adrianabeyta.com>
|
||||||
# 2026.04.05
|
|
||||||
|
|
||||||
# don't do anything if not running interactively
|
# don't do anything if not running interactively
|
||||||
case $- in
|
[[ $- != *i* ]] && return
|
||||||
*i*) ;;
|
|
||||||
*) return;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# include user home bins if they exist
|
# include user home bins if they exist
|
||||||
if [ -d "$HOME/bin" ] ; then
|
if [ -d "$HOME/bin" ] ; then
|
||||||
PATH="$HOME/bin:$PATH"
|
PATH="$HOME/bin:$PATH"
|
||||||
fi;
|
fi
|
||||||
if [ -d "$HOME/.local/bin" ] ; then
|
if [ -d "$HOME/.local/bin" ] ; then
|
||||||
PATH="$HOME/.local/bin:$PATH"
|
PATH="$HOME/.local/bin:$PATH"
|
||||||
fi;
|
fi
|
||||||
|
|
||||||
# load the dotfiles
|
# load the dotfiles
|
||||||
for file in ~/.{env,path,functions,aliases,prompt}; do
|
for file in ~/.{env,path,functions,aliases,prompt}; do
|
||||||
[ -r "$file" ] && [ -f "$file" ] && \
|
[ -r "$file" ] && [ -f "$file" ] && \
|
||||||
source "$file";
|
source "$file";
|
||||||
done;
|
done;
|
||||||
unset file;
|
unset file
|
||||||
|
|
||||||
# fun scripts
|
# fun scripts
|
||||||
if is_true "${HAVE_FUN:-}"; then
|
if is_true "${HAVE_FUN:-}"; then
|
||||||
@@ -32,8 +28,3 @@ shopt -s nocaseglob; # case-insensitive globbing
|
|||||||
shopt -s histappend; # append to bash history file
|
shopt -s histappend; # append to bash history file
|
||||||
shopt -s cdspell; # autocorrect typos in path names when cd'ing
|
shopt -s cdspell; # autocorrect typos in path names when cd'ing
|
||||||
shopt -s checkwinsize # update col/line values on each command
|
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;
|
|
||||||
|
|||||||
@@ -1,43 +0,0 @@
|
|||||||
# .bash_profile
|
|
||||||
# Adrian Abeyta <adrian@adrianabeyta.com>
|
|
||||||
# 2026.04.05
|
|
||||||
|
|
||||||
# don't do anything if not running interactively
|
|
||||||
case $- in
|
|
||||||
*i*) ;;
|
|
||||||
*) return;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# include user home bins if they exist
|
|
||||||
if [ -d "$HOME/bin" ] ; then
|
|
||||||
PATH="$HOME/bin:$PATH"
|
|
||||||
fi;
|
|
||||||
if [ -d "$HOME/.local/bin" ] ; then
|
|
||||||
PATH="$HOME/.local/bin:$PATH"
|
|
||||||
fi;
|
|
||||||
|
|
||||||
# load the dotfiles
|
|
||||||
for file in ~/.{env,path,bash_prompt,aliases,functions}; do
|
|
||||||
[ -r "$file" ] && [ -f "$file" ] && \
|
|
||||||
source "$file";
|
|
||||||
done;
|
|
||||||
unset file;
|
|
||||||
|
|
||||||
# fun scripts
|
|
||||||
if is_true "${HAVE_FUN:-}"; then
|
|
||||||
source ~/.fun
|
|
||||||
fi
|
|
||||||
|
|
||||||
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;
|
|
||||||
|
|
||||||
# startup oh-my-posh
|
|
||||||
OMP_THEME="~/.omp/themes/custom.json"
|
|
||||||
eval "$(oh-my-posh init bash --config $OMP_THEME)"
|
|
||||||
@@ -1 +1 @@
|
|||||||
[ -n "$PS1" ] && source ~/.bash_profile;
|
[ -n "$PS1" ] && [[ -f ~/.bash_profile ]] && source ~/.bash_profile;
|
||||||
|
|||||||
@@ -1,53 +0,0 @@
|
|||||||
# Bash Functions
|
|
||||||
|
|
||||||
mkcd()
|
|
||||||
{
|
|
||||||
mkdir -p -- "$1" && cd -P -- "$1"
|
|
||||||
}
|
|
||||||
|
|
||||||
# determine size of a file or total size of a directory
|
|
||||||
function fs() {
|
|
||||||
if du -b /dev/null > /dev/null 2>&1; then
|
|
||||||
local arg=-sbh;
|
|
||||||
else
|
|
||||||
local arg=-sh;
|
|
||||||
fi
|
|
||||||
if [[ -n "$@" ]]; then
|
|
||||||
du $arg -- "$@";
|
|
||||||
else
|
|
||||||
du $arg .[^.]* ./*;
|
|
||||||
fi;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
# use Git’s colored diff when available
|
|
||||||
hash git &>/dev/null;
|
|
||||||
if [ $? -eq 0 ]; then
|
|
||||||
function diff() {
|
|
||||||
git diff --no-index --color-words "$@";
|
|
||||||
}
|
|
||||||
fi;
|
|
||||||
|
|
||||||
## system administration
|
|
||||||
|
|
||||||
### service files
|
|
||||||
sysedit() {
|
|
||||||
local svc="$1"
|
|
||||||
sudo systemctl edit --full "$svc"
|
|
||||||
|
|
||||||
read -p "Reload + restart $svc? [y/N]: " ans
|
|
||||||
if [[ "$ans" == "y" ]]; then
|
|
||||||
sudo systemctl daemon-reload
|
|
||||||
sudo systemctl restart "$svc"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
sysadd() {
|
|
||||||
local svc="$1"
|
|
||||||
sudo systemctl edit "$svc"
|
|
||||||
|
|
||||||
read -p "Reload + restart $svc? [y/N]: " ans
|
|
||||||
if [[ "$ans" == "y" ]]; then
|
|
||||||
sudo systemctl daemon-reload
|
|
||||||
sudo systemctl restart "$svc"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
90
fish/aliases.fish
Normal file
90
fish/aliases.fish
Normal 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
32
fish/config.fish
Normal 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
|
||||||
@@ -16,12 +16,16 @@
|
|||||||
|
|
||||||
f = fetch --all
|
f = fetch --all
|
||||||
|
|
||||||
# Pull in remote changes for the current repository and all its submodules.
|
m = merge
|
||||||
p = pull --recurse-submodules
|
|
||||||
|
p = push
|
||||||
|
pf = push --force-with-lease
|
||||||
|
|
||||||
# Clone a repository including all submodules.
|
# Clone a repository including all submodules.
|
||||||
c = commit -m
|
c = commit -m
|
||||||
|
|
||||||
|
a = add
|
||||||
|
|
||||||
# Commit all changes.
|
# Commit all changes.
|
||||||
ca = !git add ':(exclude,attr:builtin_objectmode=160000)' && git commit -av
|
ca = !git add ':(exclude,attr:builtin_objectmode=160000)' && git commit -av
|
||||||
|
|
||||||
|
|||||||
@@ -1,79 +0,0 @@
|
|||||||
# Git User Config
|
|
||||||
|
|
||||||
[alias]
|
|
||||||
|
|
||||||
# View abbreviated SHA, description, and history graph of the latest 20 commits.
|
|
||||||
l = log --pretty=oneline -n 20 --graph --abbrev-commit
|
|
||||||
|
|
||||||
# View the current working tree status using the short format.
|
|
||||||
s = status -s
|
|
||||||
|
|
||||||
# Show the diff between the latest commit and the current state.
|
|
||||||
d = !"git diff-index --quiet HEAD -- || clear; git --no-pager diff --patch-with-stat"
|
|
||||||
|
|
||||||
# `git di $number` shows the diff between the state `$number` revisions ago and the current state.
|
|
||||||
di = !"d() { git diff --patch-with-stat HEAD~$1; }; git diff-index --quiet HEAD -- || clear; d"
|
|
||||||
|
|
||||||
f = fetch --all
|
|
||||||
|
|
||||||
# Pull in remote changes for the current repository and all its submodules.
|
|
||||||
p = pull --recurse-submodules
|
|
||||||
|
|
||||||
# Clone a repository including all submodules.
|
|
||||||
c = commit -m
|
|
||||||
|
|
||||||
# Commit all changes.
|
|
||||||
ca = !git add ':(exclude,attr:builtin_objectmode=160000)' && git commit -av
|
|
||||||
|
|
||||||
# Switch to a branch, creating it if necessary.
|
|
||||||
go = "!f() { git checkout -b \"$1\" 2> /dev/null || git checkout \"$1\"; }; f"
|
|
||||||
|
|
||||||
# Show verbose output about tags, branches or remotes
|
|
||||||
tags = tag -l
|
|
||||||
branches = branch --all
|
|
||||||
remotes = remote --verbose
|
|
||||||
|
|
||||||
# List aliases.
|
|
||||||
aliases = config --get-regexp alias
|
|
||||||
|
|
||||||
# Amend the currently staged files to the latest commit.
|
|
||||||
amend = commit --amend --reuse-message=HEAD
|
|
||||||
|
|
||||||
# Credit an author on the latest commit.
|
|
||||||
credit = "!f() { git commit --amend --author \"$1 <$2>\" -C HEAD; }; f"
|
|
||||||
|
|
||||||
# Interactive rebase with the given number of latest commits.
|
|
||||||
reb = "!r() { git rebase -i HEAD~$1; }; r"
|
|
||||||
|
|
||||||
# Remove the old tag with this name and tag the latest commit with it.
|
|
||||||
retag = "!r() { git tag -d $1 && git push origin :refs/tags/$1 && git tag $1; }; r"
|
|
||||||
|
|
||||||
# Find branches containing commit
|
|
||||||
ft = "!f() { git describe --always --contains $1; }; f"
|
|
||||||
|
|
||||||
# Find commits by source code
|
|
||||||
fc = "!f() { git log --pretty=format:'%C(yellow)%h %Cblue%ad %Creset%s%Cgreen [%cn] %Cred%d' --decorate --date=short -S\
|
|
||||||
$1; }; f"
|
|
||||||
|
|
||||||
# Find commits by commit message
|
|
||||||
fm = "!f() { git log --pretty=format:'%C(yellow)%h %Cblue%ad %Creset%s%Cgreen [%cn] %Cred%d' --decorate --date=short --\
|
|
||||||
grep=$1; }; f"
|
|
||||||
|
|
||||||
# Remove branches that have already been merged with main.
|
|
||||||
# a.k.a. ‘delete merged’
|
|
||||||
dm = "!git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d"
|
|
||||||
|
|
||||||
# List contributors with number of commits.
|
|
||||||
contributors = shortlog --summary --numbered
|
|
||||||
|
|
||||||
# Show the user email for the current repository.
|
|
||||||
whoami = config user.email
|
|
||||||
|
|
||||||
[branch]
|
|
||||||
|
|
||||||
# show most recently changed branches first
|
|
||||||
sort = -committerdate
|
|
||||||
|
|
||||||
[init]
|
|
||||||
|
|
||||||
defaultBranch = main
|
|
||||||
5
git/.gitignore
vendored
Normal file
5
git/.gitignore
vendored
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
# Universal Git Ignore File
|
||||||
|
|
||||||
|
# emacs autosave files
|
||||||
|
*~
|
||||||
|
\#*\#
|
||||||
Reference in New Issue
Block a user