From b32de217f0782886339231191f85b8a6e287a6f3 Mon Sep 17 00:00:00 2001 From: dl92 Date: Sun, 23 Feb 2025 23:14:46 +0000 Subject: [PATCH] testing fragmented config --- home/.bashrc | 146 ++---------------- home/bash-config/bashrc.base | 0 home/bash-config/bashrc.functions | 0 home/bash-config/bashrc.local | 38 +++++ home/bash-config/rc.aliases | 7 + home/bash-config/rc.base | 18 +++ .../{bashrc.aliases => rc.functions} | 0 7 files changed, 75 insertions(+), 134 deletions(-) delete mode 100644 home/bash-config/bashrc.base delete mode 100644 home/bash-config/bashrc.functions create mode 100644 home/bash-config/rc.aliases create mode 100644 home/bash-config/rc.base rename home/bash-config/{bashrc.aliases => rc.functions} (100%) diff --git a/home/.bashrc b/home/.bashrc index 12bc83e..f9556ea 100644 --- a/home/.bashrc +++ b/home/.bashrc @@ -1,140 +1,18 @@ -# ~/.bashrc: executed by bash(0) 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 +#!/bin/bash +# ~/.bashrc (symlink to ~/code/configs/home/.bashrc) -# don't put duplicate lines or lines starting with space in the history. -# See bash(1) for more options -HISTCONTROL=ignoreboth +# Load base configurations +source ~/code/configs/home/bash-config/rc.base +source ~/code/configs/home/bash-config/rc.aliases +source ~/code/configs/home/bash-config/rc.functions -# 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 +# Load machine-specific configurations +[ -f ~/code/configs/home/bash-config/bashrc.local ] && \ + source ~/code/configs/home/bash-config/bashrc.local -# check the window size after each command and, if necessary, -# update the values of LINES and COLUMNS. -shopt -s checkwinsize - -# 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) +# Load environment-specific config (example) +if [ "$(hostname)" = "my-work-pc" ]; then + source ~/code/configs/home/bash-config/env/work-machine.sh 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 nvim='nvim.appimage' -#alias ll='ls -l' -#alias la='ls -A' -#alias l='ls -CF' - -# 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 - -# 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 - -# Set up fzf key bindings and fuzzy completion - -# Set up fzf key bindings and fuzzy completion -eval "$(fzf --bash)" -FZF_DEFAULT_COMMAND='fd --type f| fzf --print0 | xargs -0 -o vim' - - - -# ask scrcpy to use a specific adb binary, -export ADB=/usr/bin/adb -source "$HOME/code/scripts/system/nnn/nnnconfig.sh" -export PATH="$PATH:$HOME/code/scripts/system/nnn" -export PATH="$PATH:$HOME/.local/bin" - -# set PATH so it includes user's private bin if it exists -if [ -d "$HOME/bin" ] ; then - PATH="$HOME/bin:$PATH" -fi - -#activate python - -source /home/ys/Data/projects/code/Python/Envs/General/bin/activate - -# Added by LM Studio CLI tool (lms) -export PATH="$PATH:$HOME/.lmstudio/bin" diff --git a/home/bash-config/bashrc.base b/home/bash-config/bashrc.base deleted file mode 100644 index e69de29..0000000 diff --git a/home/bash-config/bashrc.functions b/home/bash-config/bashrc.functions deleted file mode 100644 index e69de29..0000000 diff --git a/home/bash-config/bashrc.local b/home/bash-config/bashrc.local index e69de29..601f117 100644 --- a/home/bash-config/bashrc.local +++ b/home/bash-config/bashrc.local @@ -0,0 +1,38 @@ + + + +# check the window size after each command and, if necessary, +# update the values of LINES and COLUMNS. +shopt -s checkwinsize + +# If set, the pattern "**" used in a pathname expansion context will +# match all files and zero or more directories and subdirectories. +#shopt -s globstar + + +# If not running interactively, don't do anything +case $- in + *i*) ;; + *) return;; +esac + +# 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 + + +#activate python +source /home/ys/Data/projects/code/Python/Envs/General/bin/activate + +# Added by LM Studio CLI tool (lms) +export PATH="$PATH:$HOME/.lmstudio/bin" + +# ask scrcpy to use a specific adb binary, +export ADB=/usr/bin/adb diff --git a/home/bash-config/rc.aliases b/home/bash-config/rc.aliases new file mode 100644 index 0000000..72798cd --- /dev/null +++ b/home/bash-config/rc.aliases @@ -0,0 +1,7 @@ +# some more ls aliases + +# Common aliases +alias ll='ls -alF' +alias gs='git status' +alias lz='lazygit' +alias nvim='nvim.appimage' diff --git a/home/bash-config/rc.base b/home/bash-config/rc.base new file mode 100644 index 0000000..f0404f2 --- /dev/null +++ b/home/bash-config/rc.base @@ -0,0 +1,18 @@ + + + + + +# Set up fzf key bindings and fuzzy completion +eval "$(fzf --bash)" +FZF_DEFAULT_COMMAND='fd --type f| fzf --print0 | xargs -0 -o vim' + +source "$HOME/code/scripts/system/nnn/nnnconfig.sh" +export PATH="$PATH:$HOME/code/scripts/system/nnn" +export PATH="$PATH:$HOME/.local/bin" + +# set PATH so it includes user's private bin if it exists +if [ -d "$HOME/bin" ] ; then + PATH="$HOME/bin:$PATH" +fi + diff --git a/home/bash-config/bashrc.aliases b/home/bash-config/rc.functions similarity index 100% rename from home/bash-config/bashrc.aliases rename to home/bash-config/rc.functions