From d651cce8cabdc751af02f26b8f46a0127e30e511 Mon Sep 17 00:00:00 2001 From: Nigel Date: Tue, 9 Apr 2024 22:13:23 +0200 Subject: [PATCH] FEAT: Added activate script, Cleaned up dotfiles folder - hidden files now make use of the dot- prefix - Activate.sh can be used to activate all stow packages - I used to append tons of paths to my PATH environment variable I have now changed to moving build binaries into /opt and symlinking the necessary binaries to /usr/bin/local. This makes all tools build also available as the root user - Replaced the dmenu in i3 with rofi and a nice fitting colourscheme --- activate.sh | 2 ++ bash/{.bash_logout => dot-bash_logout} | 0 bash/{.bashrc => dot-bashrc} | 36 +++++--------------------- git/{.gitconfig => dot-gitconfig} | 0 i3/config | 7 +++-- install.sh | 2 +- tmux/{.tmux.conf => dot-tmux.conf} | 0 zsh/{.zshrc => dot-zshrc} | 26 +++++-------------- 8 files changed, 22 insertions(+), 51 deletions(-) create mode 100755 activate.sh rename bash/{.bash_logout => dot-bash_logout} (100%) rename bash/{.bashrc => dot-bashrc} (84%) rename git/{.gitconfig => dot-gitconfig} (100%) mode change 100644 => 100755 install.sh rename tmux/{.tmux.conf => dot-tmux.conf} (100%) rename zsh/{.zshrc => dot-zshrc} (84%) diff --git a/activate.sh b/activate.sh new file mode 100755 index 0000000..1494ef5 --- /dev/null +++ b/activate.sh @@ -0,0 +1,2 @@ +#!/bin/zsh +stow --restow --dotfiles bash alacritty i3 nvim zsh tmux git diff --git a/bash/.bash_logout b/bash/dot-bash_logout similarity index 100% rename from bash/.bash_logout rename to bash/dot-bash_logout diff --git a/bash/.bashrc b/bash/dot-bashrc similarity index 84% rename from bash/.bashrc rename to bash/dot-bashrc index cb2d586..0b33228 100644 --- a/bash/.bashrc +++ b/bash/dot-bashrc @@ -106,39 +106,17 @@ setxkbmap us # 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 +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 # export NVM_DIR="$HOME/.nvm" [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion -# Add java to the path -export PATH=$PATH:/opt/jdk-16/bin - -# Add Ghidra to the path -export PATH=$PATH:/opt/ghidra -alias ghidra=ghidraRun - -# Add Go to the path -export PATH=$PATH:/usr/local/go/bin - -# Add sqlite3 tools -export PATH=$PATH:/opt/sqlite3-tools - -# Add Clang-Tools -export PATH=$PATH:$HOME/llvm/build/bin - # Add cargo source "$HOME/.cargo/env" - -# Manualy added binaries to the path -export PATH=$PATH:/opt - -# Add path for CLION -export PATH=$PATH:/home/nigel/Programs/clion/bin diff --git a/git/.gitconfig b/git/dot-gitconfig similarity index 100% rename from git/.gitconfig rename to git/dot-gitconfig diff --git a/i3/config b/i3/config index 9f1d356..7806ffc 100755 --- a/i3/config +++ b/i3/config @@ -38,7 +38,9 @@ bindsym $mod+Return exec alacritty bindsym $mod+q kill # start dmenu (a program launcher) -bindsym $mod+d exec dmenu_run +# bindsym $mod+d exec dmenu_run +bindsym $mod+d exec --no-startup-id rofi -show run + # There also is the (new) i3-dmenu-desktop which only displays applications # shipping a .desktop file. It is a wrapper around dmenu, so you need that # installed. @@ -167,6 +169,7 @@ bindsym $mod+r mode "resize" # Start i3bar to display a workspace bar (plus the system information i3status # finds out, if available) +# COLORSCHEME USED : https://www.icolorpalette.com/imagepalette/otter_mammal_fauna-7 bar { position top status_command i3status --transparency @@ -187,7 +190,7 @@ bar { #class border backgr. text indicator child_border -client.focused #4f3b22 #4f3b22 #FFFFFF #8c5831 #7c2c09 +client.focused #b38a5b #4f3b22 #FFFFFF #8c5831 #7c2c09 client.focused_inactive #b38a5b #b38a5b #CCCCCC #8c5831 #7c2c09 client.unfocused #b38a5b #b38a5b #CCCCCC #8c5831 #7c2c09 diff --git a/install.sh b/install.sh old mode 100644 new mode 100755 index 81692f0..d25f927 --- a/install.sh +++ b/install.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/zsh # install fzf git clone --depth 1 https://github.com/junegunn/fzf.git /tmp/fzf-source diff --git a/tmux/.tmux.conf b/tmux/dot-tmux.conf similarity index 100% rename from tmux/.tmux.conf rename to tmux/dot-tmux.conf diff --git a/zsh/.zshrc b/zsh/dot-zshrc similarity index 84% rename from zsh/.zshrc rename to zsh/dot-zshrc index 38e95c6..1333e57 100644 --- a/zsh/.zshrc +++ b/zsh/dot-zshrc @@ -1,4 +1,8 @@ - +# +# _ _ _ _ ___ ____ _ _ ____ ____ _ _ ____ _ ____ +# |\/| \_/ / [__ |__| | | | |\ | |___ | | __ +# | | | /__ ___] | | |___ |__| | \| | | |__] +# # attach to an existing tmux session or create a new one if none exist if [ "$TMUX" = "" ] && [ -z "$TMUX"]; then tmux attach -t $(tmux display-message -p '#S') || tmux new-session @@ -23,6 +27,8 @@ bindkey '^S' history-incremental-search-forward ZSH_THEME="lambda" +setxkbmap us + # Use case-sensitive completion. CASE_SENSITIVE="true" @@ -43,9 +49,6 @@ source $ZSH/oh-my-zsh.sh source /usr/share/fzf/key-bindings.zsh source /usr/share/fzf/completion.zsh -# User configuration -source ~/.bashrc - # Set my language environment export LANG=en_GB.UTF-8 @@ -61,26 +64,11 @@ alias zshconfig="nvim ~/.zshrc" alias ohmyzsh="nvim ~/.oh-my-zsh" alias dev="cd /home/nigel/Development" alias dotfiles="cd /home/nigel/.dotfiles" -# Set Environment Variables -DOTNET_ROOT=$HOME/dotnet -PATH=$PATH:$HOME/dotnet -export PATH=$PATH:/home/nigel/Hacking/Development/depot_tools # Personal Aliases alias zshconfig="mate ~/.zshrc" alias ohmyzsh="mate ~/.oh-my-zsh" -# Add Clang-Tools -export PATH=$PATH:/usr/local/llvm - -# Add nvim -export PATH=$PATH:/usr/local/bin/nvim/bin: -export PATH=$PATH:/opt/gradle/gradle-8.7/bin - -# Add GoLang -export PATH=$PATH:/usr/local/go/bin - - # Add Autocompletion tools _dotnet_zsh_complete() {