diff --git a/files/bash/.bashrc b/files/bash/.bashrc index f7ba439..b3402d5 100644 --- a/files/bash/.bashrc +++ b/files/bash/.bashrc @@ -235,6 +235,10 @@ if [[ -f /usr/share/doc/pkgfile/command-not-found.bash ]] && ! shopt -oq posix; . /usr/share/doc/pkgfile/command-not-found.bash fi +if [[ -f /usr/share/git/completion/git-completion.bash ]] && ! shopt -oq posix; then + . /usr/share/git/completion/git-completion.bash +fi + function smallmkv() { ffmpeg -i "$1" -b 1000k -acodec libmp3lame -vcodec libx264 -ar 44100 -ab 56k -ac 2 -vpre fast -crf 24 \ "$1.mkv" ;} export LC_ALL=en_US.utf8 export LC_ALL=en_US.utf8 @@ -584,14 +588,6 @@ function mkcd() { cd "$1" } -#SCM Breeze -[ -s "/home/nemo/.scm_breeze/scm_breeze.sh" ] && source "/home/nemo/.scm_breeze/scm_breeze.sh" -PATH="/home/nemo/perl5/bin${PATH:+:${PATH}}"; export PATH; -PERL5LIB="/home/nemo/perl5/lib/perl5${PERL5LIB:+:${PERL5LIB}}"; export PERL5LIB; -PERL_LOCAL_LIB_ROOT="/home/nemo/perl5${PERL_LOCAL_LIB_ROOT:+:${PERL_LOCAL_LIB_ROOT}}"; export PERL_LOCAL_LIB_ROOT; -PERL_MB_OPT="--install_base \"/home/nemo/perl5\""; export PERL_MB_OPT; -PERL_MM_OPT="INSTALL_BASE=/home/nemo/perl5"; export PERL_MM_OPT; - # To allow global package installations for the current user PATH="$HOME/.node_modules/bin:$PATH" export npm_config_prefix=~/.node_modules @@ -699,3 +695,5 @@ function starship_set_win_title(){ starship_precmd_user_func="starship_set_win_title" eval "$(starship init bash)" + +[ -s "/usr/share/scm_breeze/scm_breeze.sh" ] && source "/usr/share/scm_breeze/scm_breeze.sh" diff --git a/files/git/.git.scmbrc b/files/git/.git.scmbrc index f7867a6..d2096cb 100644 --- a/files/git/.git.scmbrc +++ b/files/git/.git.scmbrc @@ -18,7 +18,7 @@ export git_setup_aliases="yes" # Git Index Config # ---------------------------------------------- # Repos will be automatically added from this directory. -export GIT_REPO_DIR="$HOME/code" +export GIT_REPO_DIR="$HOME/projects" # Add the full paths of any extra repos to GIT_REPOS, separated with ':' # e.g. "/opt/rails/project:/opt/rails/another project:$HOME/other/repo" export GIT_REPOS="" @@ -26,7 +26,6 @@ export git_status_command="git_status_shortcuts" # Alias git_index_alias="c" # Switch to a repo in the (c)ode directory - # Git Aliases # ---------------------------------------------- git_alias="g" @@ -111,4 +110,4 @@ git_commit_all_with_ci_skip_keys="\C-xv" # CTRL+x, v (Appends [ci skip] to c # Expand numbered args for common shell commands shell_command_wrapping_enabled="true" # Here you can tweak the list of wrapped commands. -scmb_wrapped_shell_commands="vim emacs gedit cat rm cp mv ln cd" +scmb_wrapped_shell_commands="vim emacs gedit cat rm cp mv ln cd bat glow" diff --git a/files/i3/.config/i3blocks/config b/files/i3/.config/i3blocks/config index 5cfc691..aaf85fc 100644 --- a/files/i3/.config/i3blocks/config +++ b/files/i3/.config/i3blocks/config @@ -36,8 +36,8 @@ markup=none [weather] command=curl -Ss 'https://wttr.in/Bangalore?0&T&Q' | cut -c 16- | head -2 | xargs echo -# Every 5 minutes, gets stale otherwise -interval=300 +# Every 30 minutes +interval=1800 color=#A4C2F4 [ip] diff --git a/files/i3/.i3/config b/files/i3/.i3/config index c6e1253..ee9c6a5 100644 --- a/files/i3/.i3/config +++ b/files/i3/.i3/config @@ -17,6 +17,8 @@ exec --no-startup-id redshift-gtk exec yubikey-touch-detector --libnotify # This ensures that GTK changes are applied immediately exec xfsettingsd --replace --no-daemon +# execute ibus XIM server. +exec ibus-daemon --replace --xim # Launch the VPN app, but turn it off exec riseup-vpn-git --start-vpn off