Compare commits

...

5 Commits

Author SHA1 Message Date
Gwen bf6a57f7ed
Add helix install script 2022-12-22 20:36:20 -05:00
Gwen 4303e26f2a
Re-arrange git config
Moved more things from my global gitconfig to user config where it
feels appropriate.
2022-12-22 20:32:06 -05:00
Gwen 83594f3b8f
Undot and move bashrc stuff to config/bash 2022-12-22 15:00:39 -05:00
Gwen 30decb6580
Un-dot git files and move them to config folder 2022-12-22 14:52:44 -05:00
Gwen 42ab116eb3
Move dotfiles to config and unhide them 2022-12-22 14:49:56 -05:00
19 changed files with 64 additions and 55 deletions

View File

@ -11,7 +11,7 @@ esac
DIR="$(dirname $(readlink ~/.bashrc))"
# load all dotfiles in dotfiles repository
for DOTFILE in `find $DIR/system/.{prompt,alias,functions,path,env,shell}.sh`
for DOTFILE in `find $DIR/.{prompt,alias,functions,path,env,shell}.sh`
do
[ -f "$DOTFILE" ] && source "$DOTFILE"
done

35
config/git/gitconfig Normal file
View File

@ -0,0 +1,35 @@
[push]
default = simple
[core]
editor = "vi"
excludesfile = ~/.gitignore_global
attributesfile = ~/.gitattributes_global
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
required = true
process = git-lfs filter-process
[filter "nbstrip_full"]
clean = "jq --indent 1 \
'(.cells[] | select(has(\"outputs\")) | .outputs) = [] \
| (.cells[] | select(has(\"execution_count\")) | .execution_count) = null \
| .metadata = {\"language_info\": {\"name\": \"python\", \"pygments_lexer\": \"ipython3\"}} \
| .cells[].metadata = {} \
'"
smudge = cat
required = true
[commit]
verbose = true
[help]
autocorrect = 10
[init]
defaultBranch = main
[include]
path = ~/.gitconfig.user

View File

@ -1,28 +1,18 @@
[push]
default = simple
[user]
name = Gwen Lofman
email = git@glfmn.io
signingkey = 4DB217ABEC8E37B0
[commit]
gpgSign = true
[tag]
gpgSign = true
[core]
editor = "vi"
excludesfile = ~/.gitignore_global
attributesfile = ~/.gitattributes_global
editor = "hx"
pager = delta --dark
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
required = true
process = git-lfs filter-process
[filter "nbstrip_full"]
clean = "jq --indent 1 \
'(.cells[] | select(has(\"outputs\")) | .outputs) = [] \
| (.cells[] | select(has(\"execution_count\")) | .execution_count) = null \
| .metadata = {\"language_info\": {\"name\": \"python\", \"pygments_lexer\": \"ipython3\"}} \
| .cells[].metadata = {} \
'"
smudge = cat
required = true
[alias]
# "Custom" commands
# diff against characters instead of lines
@ -71,15 +61,3 @@ required = true
fll = !git lgl --follow -- # long-format commits
fst = !git lst --follow -- # stat-style commits
fpa = !git lpa --follow -- # full patch commits
[commit]
verbose = true
[help]
autocorrect = 10
[init]
defaultBranch = main
[include]
path = ~/.gitconfig.user

View File

@ -1,10 +0,0 @@
[user]
name = Gwen Lofman
email = git@glfmn.io
signingkey = 4DB217ABEC8E37B0
[commit]
gpgSign = true
[tag]
gpgSign = true

View File

@ -9,3 +9,9 @@ cargo install -f glit
# Rust alternatives for common programs
sudo apt install exa fd-find
cargo install -f git-delta batcat
# Helix text editor
mkdir -p ~/Code/util
git clone https://github.com/helix-editor/helix ~/Code/util/helix
cargo install --path ~/Code/util/helix/helix-term
ln -s ~/Code/util/helix/runtime ~/.config/helix/runtime

View File

@ -13,29 +13,29 @@ DIR=$(pwd -L)
echo -e "\n${GREEN}linking config files...${NC}\n"
# System profiles
echo -e "\n\t${BOLD}System profiles...${NC}\n"
ln -sbv "$DIR/.bashrc" ~
ln -sbv "$DIR/profiles/.bash_profile" ~
ln -sbv "$DIR/profiles/.inputrc" ~
# System config
echo -e "\n\t${BOLD}System config...${NC}\n"
ln -sbv "$DIR/config/bash/bashrc" ~/.bashrc
ln -sbv "$DIR/config/bash/profile" ~/.bash_profile
ln -sbv "$DIR/config/inputrc" ~/.inputrc
ln -sbv "$DIR/config/fish" ~/.config/
# Text editor config
echo -e "\n\t${BOLD}Text editors...${NC}\n"
ln -sbv "$DIR/profiles/.vimrc" ~
ln -sbv "$DIR/config/vimrc" ~/.vimrc
ln -sbv "$DIR/config/helix/config.toml" ~/.config/helix/config.toml
ln -sbv "$DIR/config/helix/themes/" ~/.config/helix/
# Terminal Config
echo -e "\n\t${BOLD}Terminal Emulator...${NC}\n"
ln -sbv "$DIR/profiles/.alacritty.yml" ~
ln -sbv "$DIR/config/alacritty.yml" ~/.alacritty.yml
# Git
echo -e "\n\t${BOLD}git...${NC}\n"
ln -sbv "$DIR/git/.gitconfig" ~
ln -sbv "$DIR/git/.gitconfig.user" ~
ln -sbv "$DIR/git/.gitignore_global" ~
ln -sbv "$DIR/git/.gitattributes_global" ~
ln -sbv "$DIR/config/git/gitconfig" ~/.gitconfig
ln -sbv "$DIR/config/git/gitconfig.user" ~/.gitconfig.user
ln -sbv "$DIR/config/git/gitignore_global" ~/.gitignore_global
ln -sbv "$DIR/config/git/gitattributes_global" ~/.gitattributes_global
# e-mail
echo -e "\n\t${BOLD}email...${NC}\n"