Skip to content

Commit

Permalink
Update files based on submodule changes
Browse files Browse the repository at this point in the history
  • Loading branch information
StrangeRanger committed Nov 27, 2024
1 parent 2fafc98 commit 636543a
Show file tree
Hide file tree
Showing 6 changed files with 129 additions and 88 deletions.
1 change: 1 addition & 0 deletions includes/neovim-init-files/neovim-init-lua.lua
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ require('nvim-treesitter.configs').setup {
"query",
"regex",
"requirements",
"rust",
"sql",
--"strace", -- Good to have on standbye.
--"tmux", -- Maybe...
Expand Down
1 change: 1 addition & 0 deletions includes/neovim-init-files/neovim-init-vim-plug.vim
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ let g:strip_whitespace_on_save = 1
""""[ Lua Configurations ]""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""


" Load 'nvim-treesitter' configurations.
lua dofile(vim.fn.stdpath('config') .. '/second_init.lua')


Expand Down
16 changes: 8 additions & 8 deletions includes/zshrc-files/zshrc-linux-snippet.zsh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# --8<-- [start:user_config]
####[[ Aliases ]]#######################################################################
####[ Aliases ]#########################################################################


###
Expand All @@ -9,6 +9,8 @@
## General aliases.
alias zls="eza"
alias formatc="find . -name '*.cs' -type f -exec clang-format --style='file:$HOME/Programs/Mine/Formatter Configs/CSharp_clang-format/_clang-format' -i {} +"
alias rm="trash" # Used to prevent accidental and permanent deletion of files.
alias rrm="rm" # Stands for 'real rm'.
hash xdg-open 2>/dev/null && alias open="xdg-open"

## Update based aliases.
Expand All @@ -25,7 +27,7 @@ alias updatepacman="sudo pacman -Syu && yay && yay -Yc"
###

alias lt="echo -e \"
####[ Package Manager installed commands ]##############################################
####[ Installed Commands ]##############################################################
bandwhich - Terminal bandwidth utilization tool.
bat - A cat(1) clone with wings.
Expand All @@ -37,30 +39,28 @@ ncdu - ncdu (NCurses Disk Usage) is a curses-based version of the well-kno
pstree - List processes as a tree.
tmux - Terminal multiplexer.
####[[ Grouped commands ]]##############################################################
####[[ Grouped Commands ]]##############################################################
lt_conversion - List of programs used for converting the formats of videos, images, etc.
lt_git - List of programs used for git related commands.
####[ Keyboard combinations ]###########################################################
####[ Keyboard Combinations ]###########################################################
Ctrl + O - Allows you to copy what you are currently typing, via 'Ctrl' + 'O'.
\""
alias lt_conversion="echo -e \"
########################################################################################
#### [ Image and video formatters ]
####[ Image and Video Formatters ]######################################################
ffmpeg - FFmpeg is a collection of libraries and tools to process multimedia content.
magick - Convert between image formats as well as resize an image, blur, crop,
despeckle, dither, draw on, flip, join, re-sample, and much more.
\""
alias lt_git="echo -e \"
####[ Git Related Commands ]###########################################################
####[ Git Related Commands ]############################################################
lazygit - Simple terminal UI for git commands.
git open - Opens the GitHub page for a repo/branch in your browser.
ugit - ugit helps you undo git commands without much effort.
\""


Expand Down
75 changes: 47 additions & 28 deletions includes/zshrc-files/zshrc-linux.zsh
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
####[ Oh-My-Zsh Configurations ]########################################################


# Path to your oh-my-zsh installation.
export ZSH="$HOME/.oh-my-zsh"

Expand Down Expand Up @@ -39,16 +42,29 @@ HIST_STAMPS="yyyy-mm-dd"
#plugins=(colored-man-pages copybuffer copypath copyfile bgnotify command-not-found) # Desktop
plugins=(colored-man-pages command-not-found) # Server

# Zsh "plugin" installed via git and the following command:
# git clone https://github.com/zsh-users/zsh-completions ${ZSH_CUSTOM:-${ZSH:-~/.oh-my-zsh}/custom}/plugins/zsh-completions

####[ Pre `compinit` ]##################################################################
#### These are configurations that have to be set before the `compinit` function is
#### called, which is done when sourcing the 'oh-my-zsh.sh' file.


## Zsh plugin for completions.
## This plugin is installed via chezmoi, specified in the '.chezmoiexternal.toml' file.
zsh_completion="${ZSH_CUSTOM:-${ZSH:-~/.oh-my-zsh}/custom}/plugins/zsh-completions/src"
[[ -d $zsh_completion ]] && fpath+=${zsh_completion}

# Rustup completions.
# $ rustup completions zsh > ~/.zfunc/_rustup
[[ -f ~/.zfunc/_rustup ]] && fpath+=~/.zfunc


####[ Source Oh-My-Zsh ]################################################################


source "$ZSH/oh-my-zsh.sh"


####[ Personal Configurations ]#########################################################
####[[ Aliases ]]#######################################################################
####[ Aliases ]#########################################################################


###
Expand All @@ -58,6 +74,8 @@ source "$ZSH/oh-my-zsh.sh"
## General aliases.
alias zls="eza"
alias formatc="find . -name '*.cs' -type f -exec clang-format --style='file:$HOME/Programs/Mine/Formatter Configs/CSharp_clang-format/_clang-format' -i {} +"
alias rm="trash" # Used to prevent accidental and permanent deletion of files.
alias rrm="rm" # Stands for 'real rm'.
hash xdg-open 2>/dev/null && alias open="xdg-open"

## Update based aliases.
Expand All @@ -74,7 +92,7 @@ alias updatepacman="sudo pacman -Syu && yay && yay -Yc"
###

alias lt="echo -e \"
####[ Package Manager installed commands ]##############################################
####[ Installed Commands ]##############################################################
bandwhich - Terminal bandwidth utilization tool.
bat - A cat(1) clone with wings.
Expand All @@ -86,38 +104,39 @@ ncdu - ncdu (NCurses Disk Usage) is a curses-based version of the well-kno
pstree - List processes as a tree.
tmux - Terminal multiplexer.
####[[ Grouped commands ]]##############################################################
####[[ Grouped Commands ]]##############################################################
lt_conversion - List of programs used for converting the formats of videos, images, etc.
lt_git - List of programs used for git related commands.
####[ Keyboard combinations ]###########################################################
####[ Keyboard Combinations ]###########################################################
Ctrl + O - Allows you to copy what you are currently typing, via 'Ctrl' + 'O'.
\""
alias lt_conversion="echo -e \"
########################################################################################
#### [ Image and video formatters ]
####[ Image and Video Formatters ]######################################################
ffmpeg - FFmpeg is a collection of libraries and tools to process multimedia content.
magick - Convert between image formats as well as resize an image, blur, crop,
despeckle, dither, draw on, flip, join, re-sample, and much more.
\""
alias lt_git="echo -e \"
####[ Git Related Commands ]###########################################################
####[ Git Related Commands ]############################################################
lazygit - Simple terminal UI for git commands.
git open - Opens the GitHub page for a repo/branch in your browser.
ugit - ugit helps you undo git commands without much effort.
\""


####[[ Environmental Variables ]]#######################################################
####[ Environmental Variables ]#########################################################


# PATH value...
export PATH="$PATH:$HOME/.local/bin:/opt/nvim-linux64/bin"
## Path purpose:
## $HOME/.local/bin: User installed binaries.
## /opt/nvim-linux64/bin: Neovim binary.
export PATH="$HOME/.local/bin:$PATH"
[[ -d /opt/nvim-linux64/bin ]] && export PATH="/opt/nvim-linux64/bin:$PATH"

# Modifies the colors of files and directories in the terminal.
export LS_COLORS="di=34:ln=36:so=35:pi=1;33:ex=32:bd=34;46:cd=1;33;40:su=30;41:sg=30;46:tw=30;42:ow=30;1;43"
Expand All @@ -132,34 +151,34 @@ fi
export NVM_DIR="$HOME/.nvm"


####[[ Sourced Files ]]#################################################################
####[ Sourced Files ]###################################################################


## Load 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

## Source the plugins.sh file for the `op` command.
[[ -f $HOME/.config/op/plugins.sh ]] \
&& source "$HOME/.config/op/plugins.sh"

# Zsh "plugin" installed via git and the following command:
# git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting
## Zsh plugin for syntax highlighting.
## This plugin is installed via chezmoi, specified in the '.chezmoiexternal.toml' file.
zsh_syntax_highlighting="${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh"
[[ -f $zsh_syntax_highlighting ]] && source "$zsh_syntax_highlighting"

# Zsh "plugin" installed via git and the following command:
# git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions
## Zsh plugin for autosuggestions.
## This plugin is installed via chezmoi, specified in the '.chezmoiexternal.toml' file.
zsh_autosuggestions="${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh"
[[ -f $zsh_autosuggestions ]] && source "$zsh_autosuggestions"

# Zsh "plugin" installed via git and the following command:
# git clone https://github.com/Aloxaf/fzf-tab ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/fzf-tab
## Zsh plugin for fzf-tab.
## This plugin is installed via chezmoi, specified in the '.chezmoiexternal.toml' file.
fzf_tab="${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/fzf-tab/fzf-tab.plugin.zsh"
[[ -f $fzf_tab ]] && hash fzf 2>/dev/null && source "$fzf_tab"

## Source the plugins.sh file for the `op` command.
[[ -f $HOME/.config/op/plugins.sh ]] \
&& source "$HOME/.config/op/plugins.sh"


####[[ Zsh Style Configurations ]]######################################################
####[ Zsh Style Configurations ]########################################################


# Disable sort when completing `git checkout`.
Expand All @@ -176,7 +195,7 @@ hash eza 2>/dev/null \
zstyle ':fzf-tab:*' switch-group '<' '>'


####[[ End of File Configurations ]]####################################################
####[ End of File Configurations ]######################################################
#### These are configurations that are specified to be placed at the end of the file, by
#### the developer/documentation.

Expand All @@ -187,6 +206,6 @@ hash starship 2>/dev/null \
&& eval "$(starship init zsh)"


####[[ Others ]]########################################################################
####[ Others ]##########################################################################
#### These are generally configurations set up by setup scripts or other programs.

37 changes: 19 additions & 18 deletions includes/zshrc-files/zshrc-macos-snippet.zsh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# --8<-- [start:user_config]
####[[ Aliases ]]#######################################################################
####[ Aliases ]#########################################################################


###
Expand All @@ -14,6 +14,8 @@ alias rmdsstore="find . -name '*.DS_Store' -type f -delete"
alias code="open -a 'Visual Studio Code.app' ."
alias formatc="find . -name '*.cs' -type f -exec clang-format --style='file:$HOME/Programs/Mine/Formatter Configs/CSharp_clang-format/_clang-format' -i {} +"
alias updatebrew="brew update && brew upgrade && brew autoremove && brew cleanup && brew doctor"
alias rm="trash" # Used to prevent accidental and permanent deletion of files.
alias rrm="rm" # Stands for 'real rm'.

###
### [ Group 2 ]
Expand All @@ -25,41 +27,40 @@ alias updatebrew="brew update && brew upgrade && brew autoremove && brew cleanup
###

alias lt="echo -e \"
####[ Package Manager installed commands ]##############################################
####[ Installed Commands ]##############################################################
bandwhich - Terminal bandwidth utilization tool.
bat - A cat(1) clone with wings.
codespell - Check code for common misspellings.
duf - Disk Usage/Free Utility - a better 'df' alternative.
fzf - A command-line fuzzy finder.
ncdu - ncdu (NCurses Disk Usage) is a curses-based version of the well-known 'du'.
pstree - List processes as a tree.
tmux - Terminal multiplexer.
bandwhich - Terminal bandwidth utilization tool.
bat - A cat(1) clone with wings.
cheat - Allows you to create and view interactive cheatsheets on the command-line.
codespell - Check code for common misspellings.
duf - Disk Usage/Free Utility - a better 'df' alternative.
fzf - A command-line fuzzy finder.
ncdu - ncdu (NCurses Disk Usage) is a curses-based version of the well-known 'du'.
pstree - List processes as a tree.
tmux - Terminal multiplexer.
####[[ Grouped commands ]]##############################################################
####[[ Grouped Commands ]]##############################################################
lt_conversion - List of programs used for converting the formats of videos, images, etc.
lt_git - List of programs used for git related commands.
####[ Keyboard combinations ]###########################################################
####[ Keyboard Combinations ]###########################################################
Ctrl + O - Allows you to copy what you are currently typing, via 'Ctrl' + 'O'.
\""
alias lt_conversion="echo -e \"
########################################################################################
#### [ Image and video formatters ]
####[ Image and Video Formatters ]######################################################
ffmpeg - FFmpeg is a collection of libraries and tools to process multimedia content.
magick - Convert between image formats as well as resize an image, blur, crop,
despeckle, dither, draw on, flip, join, re-sample, and much more.
\""
alias lt_git="echo -e \"
####[ Git Related Commands ]###########################################################
####[ Git Related Commands ]############################################################
lazygit - Simple terminal UI for git commands.
git open - Opens the GitHub page for a repo/branch in your browser.
ugit - ugit helps you undo git commands without much effort.
\""


Expand All @@ -68,8 +69,8 @@ ugit - ugit helps you undo git commands without much effort.
# Modifies the colors of files and directories when using `ls`.
export LSCOLORS="exgxfxDxcxegDaabagacaD"
## Version of LSCOLORS compatible with zsh and GNU based commands.
## You can find more information about LS_COLORS and why it's needed in addition to LSCOLORS,
## here: https://github.com/ohmyzsh/ohmyzsh/issues/6060#issuecomment-327934559
## You can find more information about LS_COLORS and why it's needed in addition to
## LSCOLORS, here: https://github.com/ohmyzsh/ohmyzsh/issues/6060#issuecomment-327934559
export LS_COLORS="di=34:ln=36:so=35:pi=1;33:ex=32:bd=34;46:cd=1;33;40:su=30;41:sg=30;46:tw=30;42:ow=30;1;43"

# Set list-colors to enable filename colorizing.
Expand Down
Loading

0 comments on commit 636543a

Please sign in to comment.