diff --git a/bashrc b/bashrc new file mode 100644 index 0000000..f92ef19 --- /dev/null +++ b/bashrc @@ -0,0 +1,67 @@ +# If not running interactively, don't do anything +case $- in + *i*) ;; + *) return;; +esac + +source ~/.local/share/blesh/ble.sh --noattach + +# 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 + +# check the window size after each command and, if necessary, +# update the values of LINES and COLUMNS. +shopt -s checkwinsize + +# 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) +fi + +# Add an "alert" alias for long running commands. Use like so: +# 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$//'\'')"' + +# # 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 + +PATH="$HOME/.local/bin:$HOME/.cargo/bin:$PATH" + +alias lz="lazygit" +alias vi="nvim" +alias vim="nvim" +alias ls="eza -1 -l --icons=auto --git-repos --git -h -g -o --no-permissions" +alias lsa="eza -1 -l --icons=auto --git-repos --git -h -g -o --no-permissions -a" +alias lss="eza -1 -l --icons=auto --git-repos --git -h -g --total-size -o --no-permissions -a" + +source ~/.fzf.bash +eval "$(zoxide init bash)" +eval "$(starship init bash)" + +[[ ! ${BLE_VERSION-} ]] || ble-attach + +# TMUX +if [[ ! $TERM =~ screen ]]; then + if which tmux >/dev/null 2>&1; then + tmux new-session + fi +fi diff --git a/update.sh b/update.sh index 640ca52..993efcb 100755 --- a/update.sh +++ b/update.sh @@ -201,6 +201,7 @@ sudo nala install -y nodejs # Install ble.sh printf -- '\033[33m Installing ble.sh\n\033[37m' +sudo nala install gawk if [ -d ~/ble.sh ]; then rm -rf ~/ble.sh; fi cd ~ git clone --recursive --depth 1 --shallow-submodules https://github.com/akinomyoga/ble.sh.git @@ -239,8 +240,8 @@ if [ $DESKTOP == "yes" ]; then printf -- '\033[33m Installing Visual Code\n\033[37m' sudo snap install --classic code - printf -- '\033[33m Installing Discord\n\033[37m' - flatpak install -y flathub com.discordapp.Discord + # printf -- '\033[33m Installing Discord\n\033[37m' + # flatpak install -y flathub com.discordapp.Discord printf -- '\033[33m Installing KiCad\n\033[37m' flatpak install -y flathub org.kicad.KiCad @@ -262,6 +263,10 @@ if [ $DESKTOP == "yes" ]; then printf -- '\033[33m Installing remmina\n\033[37m' sudo nala install -y remmina + # Install gnome tweaks + printf -- '\033[33m Installing gnome tweaks\n\033[37m' + sudo nala install -y gnome-tweaks + # Install NerdFonts printf -- '\033[33m Installing NerdFonts\n\033[37m' mkdir -p /home/$USER/.local/share/fonts @@ -301,6 +306,12 @@ if [ $DESKTOP == "yes" ]; then sudo usermod -a -G vboxusers $USER fi + if [ $VER == "22.04" ]; then + # Install helvum + printf -- '\033[33m Installing pavucontrol\n\033[37m' + sudo nala install -y pavucontrol + fi + if [ $VER == "24.04" ]; then # Install helvum printf -- '\033[33m Installing helvum\n\033[37m' @@ -357,44 +368,48 @@ ln -sf ~/code_server/update_wrapper.sh ~/.local/bin/update printf -- '\033[33m Symlinking start script\n\033[37m' ln -sf ~/code_server/start.sh ~/.start -# Restore default .bashrc -printf -- '\033[33m Restoring default .bashrc\n\033[37m' -sudo /bin/cp /etc/skel/.bashrc ~/.bashrc +# Symlink bashrc +printf -- '\033[33m Symlinking bashrc\n\033[37m' +ln -sf ~/code_server/bashrc ~/.bashrc -# Add path to bashrc -printf -- '\033[33m Adding path to bashrc\n\033[37m' -echo 'PATH="$HOME/.local/bin:$HOME/.cargo/bin:$PATH"' >> ~/.bashrc -echo 'alias lz="lazygit"' >> ~/.bashrc -echo 'alias vi="nvim"' >> ~/.bashrc -echo 'alias vim="nvim"' >> ~/.bashrc -echo 'alias ls="eza -1 -l --icons=auto -h -g -o --no-permissions -a"' >> ~/.bashrc -echo 'alias lsg="eza -1 -l --icons=auto --git-repos --git -h -g -o --no-permissions -a"' >> ~/.bashrc -echo 'alias lss="eza -1 -l --icons=auto -h -g --total-size -o --no-permissions -a"' >> ~/.bashrc -echo 'source ~/.fzf.bash' >> ~/.bashrc -echo 'source ~/.local/share/blesh/ble.sh' >> ~/.bashrc -echo 'eval "$(zoxide init bash)"' >> ~/.bashrc -echo 'eval "$(starship init bash)"' >> ~/.bashrc - -if [ $DESKTOP == "no" ] && [ $WSL == "no" ]; then - # Add tmux/nvim autostart to bashrc - printf -- '\033[33m Adding tmux/nvim autostart to bashrc\n\033[37m' - echo "# TMUX" >> ~/.bashrc - echo "if [[ ! \$TERM =~ screen ]]; then" >> ~/.bashrc - echo "if which tmux >/dev/null 2>&1; then" >> ~/.bashrc - echo ' test -z "$TMUX" && (tmux attach || tmux new-session ~/.start)' >> ~/.bashrc - echo "fi" >> ~/.bashrc - echo "fi" >> ~/.bashrc -fi - -if [ $DESKTOP == "yes" ] || [ $WSL == "yes" ]; then - # Add tmux/nvim autostart to bashrc - printf -- '\033[33m Adding tmux/nvim autostart to bashrc\n\033[37m' - echo "# TMUX" >> ~/.bashrc - echo "if [[ ! \$TERM =~ screen ]]; then" >> ~/.bashrc - echo "if which tmux >/dev/null 2>&1; then" >> ~/.bashrc - echo ' tmux new-session' >> ~/.bashrc - echo "fi" >> ~/.bashrc - echo "fi" >> ~/.bashrc -fi +# # Restore default .bashrc +# printf -- '\033[33m Restoring default .bashrc\n\033[37m' +# sudo /bin/cp /etc/skel/.bashrc ~/.bashrc +# +# # Add path to bashrc +# printf -- '\033[33m Adding path to bashrc\n\033[37m' +# echo 'PATH="$HOME/.local/bin:$HOME/.cargo/bin:$PATH"' >> ~/.bashrc +# echo 'alias lz="lazygit"' >> ~/.bashrc +# echo 'alias vi="nvim"' >> ~/.bashrc +# echo 'alias vim="nvim"' >> ~/.bashrc +# echo 'alias ls="eza -1 -l --icons=auto --git-repos --git -h -g -o --no-permissions"' >> ~/.bashrc +# echo 'alias lsa="eza -1 -l --icons=auto --git-repos --git -h -g -o --no-permissions -a"' >> ~/.bashrc +# echo 'alias lss="eza -1 -l --icons=auto --git-repos --git -h -g --total-size -o --no-permissions -a"' >> ~/.bashrc +# echo 'source ~/.fzf.bash' >> ~/.bashrc +# echo 'source ~/.local/share/blesh/ble.sh' >> ~/.bashrc +# echo 'eval "$(zoxide init bash)"' >> ~/.bashrc +# echo 'eval "$(starship init bash)"' >> ~/.bashrc +# +# if [ $DESKTOP == "no" ] && [ $WSL == "no" ]; then +# # Add tmux/nvim autostart to bashrc +# printf -- '\033[33m Adding tmux/nvim autostart to bashrc\n\033[37m' +# echo "# TMUX" >> ~/.bashrc +# echo "if [[ ! \$TERM =~ screen ]]; then" >> ~/.bashrc +# echo "if which tmux >/dev/null 2>&1; then" >> ~/.bashrc +# echo ' test -z "$TMUX" && (tmux attach || tmux new-session ~/.start)' >> ~/.bashrc +# echo "fi" >> ~/.bashrc +# echo "fi" >> ~/.bashrc +# fi +# +# if [ $DESKTOP == "yes" ] || [ $WSL == "yes" ]; then +# # Add tmux/nvim autostart to bashrc +# printf -- '\033[33m Adding tmux/nvim autostart to bashrc\n\033[37m' +# echo "# TMUX" >> ~/.bashrc +# echo "if [[ ! \$TERM =~ screen ]]; then" >> ~/.bashrc +# echo "if which tmux >/dev/null 2>&1; then" >> ~/.bashrc +# echo ' tmux new-session' >> ~/.bashrc +# echo "fi" >> ~/.bashrc +# echo "fi" >> ~/.bashrc +# fi printf -- '\033[32m \n\n***** Update complete! Please restart your terminal. *****\n\n\033[37m' diff --git a/wallpaper/wallpaper1.jpg b/wallpaper/wallpaper1.jpg new file mode 100644 index 0000000..59748a8 Binary files /dev/null and b/wallpaper/wallpaper1.jpg differ diff --git a/wezterm.lua b/wezterm.lua index 938500b..5b777dd 100644 --- a/wezterm.lua +++ b/wezterm.lua @@ -18,7 +18,7 @@ config.keys = { } config.enable_tab_bar = false -config.window_decorations = "RESIZE" +-- config.window_decorations = "RESIZE" config.colors = { -- The default text color