From 4d7aa521dc80bf2c75c9ba795d923ab0ff55da80 Mon Sep 17 00:00:00 2001
From: Shaun Reed <shaunrd0@gmail.com>
Date: Sat, 18 Dec 2021 20:57:56 -0500
Subject: [PATCH] Remove yakuake configurations

+ Migrate yakuake configs to a branch with a full DE
+ Update `.bash_aliases` to include `kapp-update` and `kapp-git`
+ Add conditional sourcing of untracked `.bash_secrets` file, if it exists
---
 .bash_aliases     | 13 ++++++---
 .bashrc           | 13 ++++-----
 .config/yakuakerc | 72 -----------------------------------------------
 3 files changed, 15 insertions(+), 83 deletions(-)
 delete mode 100644 .config/yakuakerc

diff --git a/.bash_aliases b/.bash_aliases
index ea22709..8ea3606 100644
--- a/.bash_aliases
+++ b/.bash_aliases
@@ -3,9 +3,8 @@
 alias python3='python3.9'
 alias pip3='python3.9 -m pip'
 
-alias gitkapp='git config --global user.name "Shaun Reed" && git config --global user.email "shaunrd0@gmail.com"'
-
-# Default .bashrc aliases stored here
+alias kapp-git='git config --global user.name "Shaun Reed" && git config --global user.email "shaunrd0@gmail.com"'
+alias kapp-update='sudo apt update -y && sudo apt upgrade -y && sudo apt upgrade --fix-broken --fix-missing --auto-remove'
 
 # Alias / export customizations
 
@@ -23,9 +22,15 @@ alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo
 export EDITOR="vim"
 export VISUAL="vim"
 export LS_COLORS="di=1;34:ln=31;47:so=32:pi=33:ex=1;32:bd=34;46:cd=34;43:su=30;41:sg=30;46:tw=30;42:ow=30;43"
-export PATH=$PATH:/opt/
+export PATH=$PATH:/opt/:/home/kapper/.local/bin/
 
 # Example path for autocompletion using libclang-9-dev package, obtained by the following command
 # find /usr/ -name libclang.so.1 2>/dev/null
 export LIBCLANG="/usr/lib/llvm-10/lib/libclang.so.1"
 
+# Source a top-secret alias file
+if [ -f ~/.bash_secrets ]; then
+  . ~/.bash_secrets
+fi
+
+
diff --git a/.bashrc b/.bashrc
index 2a2c60a..15177f2 100644
--- a/.bashrc
+++ b/.bashrc
@@ -57,9 +57,9 @@ if [ -n "$force_color_prompt" ]; then
 fi
 
 if [ "$color_prompt" = yes ]; then
-    PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\][\u@\h\[\033[00m\] \W\[\033[01;32m\]]\$\[\033[00m\]'
+    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]\$ '
+    PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
 fi
 unset color_prompt force_color_prompt
 
@@ -84,8 +84,6 @@ if [ -x /usr/bin/dircolors ]; then
     alias egrep='egrep --color=auto'
 fi
 
-# Alias / export customizations
-
 # colored GCC warnings and errors
 #export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
 
@@ -98,8 +96,9 @@ alias l='ls -CF'
 #   sleep 10; alert
 alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
 
-
-# Edit ~/.bash_aliases, instead of adding them here directly.
+# 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
@@ -116,4 +115,4 @@ if ! shopt -oq posix; then
     . /etc/bash_completion
   fi
 fi
-
+. "$HOME/.cargo/env"
diff --git a/.config/yakuakerc b/.config/yakuakerc
deleted file mode 100644
index 33e3a1e..0000000
--- a/.config/yakuakerc
+++ /dev/null
@@ -1,72 +0,0 @@
-[Appearance]
-HideSkinBorders=true
-Skin=default
-
-[Desktop Entry]
-DefaultProfile=
-
-[Dialogs]
-FirstRun=false
-
-[Favorite Profiles]
-Favorites=
-
-[Global Shortcuts]
-toggle-window-state=Meta+`
-
-[PrintOptions]
-PrinterFriendly=true
-ScaleOutput=true
-
-[Shortcuts]
-Height=80
-Width=80
-adjust-history=none
-clear-history=none
-clear-history-and-reset=Ctrl+Shift+K
-close-active-terminal=Ctrl+Shift+W; Ctrl+Shift+R
-close-session=none
-decrease-window-height=Alt+Shift+Up
-decrease-window-width=Alt+Shift+Left
-edit-current-profile=none
-edit-profile=none
-edit_copy=Ctrl+Shift+C
-edit_copy_contextmenu=none
-edit_find=Ctrl+Shift+F
-edit_find_next=F3
-edit_find_prev=Shift+F3
-edit_paste=Ctrl+Shift+V; Shift+Ins
-file_print=Ctrl+Shift+P
-file_quit=Ctrl+Shift+Q
-file_save_as=Ctrl+Shift+S
-grow-terminal-bottom=Ctrl+Alt+Down
-grow-terminal-left=Ctrl+Alt+Left
-grow-terminal-right=Ctrl+Alt+Right
-grow-terminal-top=Ctrl+Alt+Up
-help_about_app=none
-help_about_kde=none
-help_report_bug=none
-help_whats_this=Shift+F1
-increase-window-height=Alt+Shift+Down
-increase-window-width=Alt+Shift+Right
-keep-open=none
-manage-profiles=none
-move-session-left=Ctrl+Shift+Left
-move-session-right=Ctrl+Shift+Right
-new-session=Ctrl+Shift+T
-new-session-quad=none
-new-session-two-horizontal=none
-new-session-two-vertical=none
-next-session=Shift+Right
-next-terminal=Ctrl+Tab; Shift+Tab
-open-browser=none
-options_configure=Ctrl+Shift+,
-options_configure_keybinding=none
-options_configure_notifications=none
-paste-selection=Ctrl+Shift+Ins
-previous-session=Shift+Left
-previous-terminal=Ctrl+Shift+Tab
-rename-session=Ctrl+Alt+S[Window]
-
-[Window]
-Height=40