From 7d490453085ae084ce0e3875952eae1d3ad7b1ab Mon Sep 17 00:00:00 2001 From: Craig Jennings Date: Mon, 26 Jan 2026 16:57:37 -0600 Subject: refactor(shell): reorganize shell config for proper separation Restructure shell configuration to follow standard conventions: - .profile: Environment variables only (POSIX compatible) - .bash_profile: NEW - sources .profile and .bashrc for login shells - .bashrc: Bash-specific settings, sources .bashrc.d/ - .zshrc: Zsh-specific settings, sources .zshrc.d/ New modular directories: - .bashrc.d/: aliases, emacs, fzf, git, media, utilities - .zshrc.d/: same as bashrc.d plus arch-downgrade (zsh-only) - .profile.d/: reduced to env-only files (display, framework, auto-tmux) Fixes: - Remove duplicate .profile sourcing in .bashrc - Remove broken XDG_CURRENT_DESKTOP=GNOME line from display.sh - Move aliases/functions from .profile to appropriate .d/ directories - Shell-specific init (zoxide, fzf) now in .bashrc/.zshrc directly - FreeBSD bindkey fix now in .zshrc directly Also adds CLAUDE.md session context file. Co-Authored-By: Claude Opus 4.5 --- dotfiles/system/.profile.d/git.sh | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 dotfiles/system/.profile.d/git.sh (limited to 'dotfiles/system/.profile.d/git.sh') diff --git a/dotfiles/system/.profile.d/git.sh b/dotfiles/system/.profile.d/git.sh deleted file mode 100644 index 7332ba1..0000000 --- a/dotfiles/system/.profile.d/git.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -# git.sh -# Craig Jennings -# git settings and convenience aliases, sourced by .profile - -alias gitlog="git log --graph --pretty=format:'%Cred%h%Creset %an: %s - %Creset %C(yellow)%d%Creset %Cgreen(%cr)%Creset' --abbrev-commit --date=relative" -alias gitstatus='git status -sb ' -alias gitcom='git commit -m ' -alias gitpp='git pull --prune ' # clean up any orphaned git objects -alias gittagbydate="git for-each-ref --sort=creatordate --format '%(refname) %(creatordate)' refs/tags" - -gitsp() { - git stash && git pull && git stash pop -} - -gitck() { - git checkout "$(git branch --all | fzf| tr -d '[:space:]')" -} - -gitdiff() { - preview="git diff $@ --color=always -- {-1}" - git diff "$@" --name-only | fzf -m --ansi --preview "$preview" -} -- cgit v1.2.3