mirror of
https://mau.dev/andreijiroh-dev/dotfiles.git
synced 2025-01-18 22:46:40 +00:00
General configuration changes hellscape
Signed-off-by: Andrei Jiroh Halili <ajhalili2006@andreijiroh.eu.org>
This commit is contained in:
parent
094b8a0009
commit
a41e28d091
7 changed files with 64 additions and 41 deletions
|
@ -12,8 +12,9 @@ fi
|
||||||
# Stage 1: Source the ~/.profile
|
# Stage 1: Source the ~/.profile
|
||||||
source "$HOME/.profile"
|
source "$HOME/.profile"
|
||||||
|
|
||||||
|
|
||||||
# Added by Toolbox App
|
# Added by Toolbox App
|
||||||
export PATH="$PATH:/home/ajhalili2006/.local/share/JetBrains/Toolbox/scripts"
|
export PATH="$PATH:/home/ajhalili2006/.local/share/JetBrains/Toolbox/scripts"
|
||||||
|
|
||||||
_byobu_sourced=1 . /usr/bin/byobu-launch 2>/dev/null || true
|
_byobu_sourced=1 . /usr/bin/byobu-launch 2>/dev/null || true
|
||||||
|
|
||||||
|
if [ -e "$HOME/.nix-profile/etc/profile.d/nix.sh" ]; then . "$HOME/.nix-profile/etc/profile.d/nix.sh"; fi # added by Nix installer
|
||||||
|
|
47
.bashrc
47
.bashrc
|
@ -4,10 +4,11 @@
|
||||||
# oh-my-zsh, although I still use zsh as my default shell. Sorry for a
|
# oh-my-zsh, although I still use zsh as my default shell. Sorry for a
|
||||||
# lot of personal commentary and links hellscape here, it's there for
|
# lot of personal commentary and links hellscape here, it's there for
|
||||||
# in-code docs and for future me to not dig through 'git log' hell.
|
# in-code docs and for future me to not dig through 'git log' hell.
|
||||||
# SPDX-License-Identifier: TBD
|
# SPDX-License-Identifier: MIT AND MPL-2.0
|
||||||
|
|
||||||
## Stage 0: Init keychain + GPG_TTY for pinentry hellscapes in TUI. ##
|
## Stage 0: Init keychain + GPG_TTY for pinentry hellscapes in TUI. ##
|
||||||
## This stage also initalizes oh-my-posh here. ##
|
## This stage also initalizes oh-my-posh or custom
|
||||||
|
## PSI here. ##
|
||||||
if [[ $TERMUX ]]; then
|
if [[ $TERMUX ]]; then
|
||||||
export SSH_AGENT_=todo
|
export SSH_AGENT_=todo
|
||||||
elif command -v keychain >> /dev/null; then
|
elif command -v keychain >> /dev/null; then
|
||||||
|
@ -15,14 +16,21 @@ elif command -v keychain >> /dev/null; then
|
||||||
eval $(keychain --agents gpg,ssh --eval)
|
eval $(keychain --agents gpg,ssh --eval)
|
||||||
fi
|
fi
|
||||||
export GPG_TTY=$(tty)
|
export GPG_TTY=$(tty)
|
||||||
# TODO: Implement feature flag disabling this.
|
|
||||||
if command -v oh-my-posh >>/dev/null; then
|
if command -v oh-my-posh >>/dev/null && [[ $FF_USE_OHMYPOSH != "false" ]]; then
|
||||||
eval "$(oh-my-posh init bash)"
|
eval "$(oh-my-posh init bash)"
|
||||||
|
else
|
||||||
|
if [[ $PROMPT_THEME != "" ]] && [[ -f "$HOME/.config/bash/shell-prompts/${PROMPT_THEME}.bashrc" ]]; then
|
||||||
|
source "$HOME/.config/bash/shell-prompts/${PROMPT_THEME}.bashrc"
|
||||||
|
else
|
||||||
|
source "$HOME/.config/bash/shell-prompts/vern.bashrc"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
## Stage 1: Init custom vars and shortcuts before anything else ##
|
## Stage 1: Init custom vars and shortcuts before anything else ##
|
||||||
|
## Note that ~/.env and ~/.env.local should be loaded eariler on ##
|
||||||
# Dotfiles stuff, maybe should be on ~/.env?
|
# Dotfiles stuff, maybe should be on ~/.env?
|
||||||
export DOTFILES_HOME="$HOME/.dotfiles"
|
#export DOTFILES_HOME="$HOME/.dotfiles"
|
||||||
export DOTFILES_BIN="$DOTFILES_HOME/bin"
|
export DOTFILES_BIN="$DOTFILES_HOME/bin"
|
||||||
# gopath should be on ~/.local/share/go to not fuck up with local install
|
# gopath should be on ~/.local/share/go to not fuck up with local install
|
||||||
# at ~/go if exists
|
# at ~/go if exists
|
||||||
|
@ -33,11 +41,6 @@ export GOPATH="$HOME/.local/share/go"
|
||||||
# to my first editor after Notepad that started my web dev + Linux journey,
|
# to my first editor after Notepad that started my web dev + Linux journey,
|
||||||
# Atom (https://github.com/atom).
|
# Atom (https://github.com/atom).
|
||||||
export EDITOR=nano
|
export EDITOR=nano
|
||||||
# For compartibility reasons and not to fuck things up on ~/go/bin.
|
|
||||||
# Custom path might be also on ~/.env too?
|
|
||||||
# It would be nice if I would work on self-hosted reimplementation of
|
|
||||||
# proxy.golang.org, but in meanwhile, you need to fuck off Google on this.
|
|
||||||
# (Fucking Facebook and Microsoft off your lives are also hard too ICYMI.)
|
|
||||||
# Context: https://git.sr.ht/~sircmpwn/dotfiles/tree/master/item/.profile#L13-15
|
# Context: https://git.sr.ht/~sircmpwn/dotfiles/tree/master/item/.profile#L13-15
|
||||||
# and https://drewdevault.com/2021/08/06/goproxy-breaks-go.html
|
# and https://drewdevault.com/2021/08/06/goproxy-breaks-go.html
|
||||||
export GOPROXY=direct GOSUMDB=off
|
export GOPROXY=direct GOSUMDB=off
|
||||||
|
@ -49,21 +52,15 @@ if [[ -d "$HOME/.bashbox" ]]; then
|
||||||
source "$HOME/.bashbox/env"
|
source "$HOME/.bashbox/env"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
export HOMEBREW_HOME=${HOMEBREW_HOME:-"/home/linuxbrew/.linuxbrew"}
|
# handle hostname generation for importing host-specific configs
|
||||||
test -d "$HOMEBREW_HOME" && eval "$($HOMEBREW_HOME/bin/brew shellenv)"
|
if [[ $WSL_DISTRO_NAME ]] && [[ $WSL_INTEROP ]]; then
|
||||||
[[ -r "$HOMEBREW_HOME/etc/profile.d/bash_completion.sh" ]] && . "$HOMEBREW_HOME/etc/profile.d/bash_completion.sh"
|
HOSTNAME_BASH="${HOSTNAME}-wsl-${WSL_DISTRO_NAME}"
|
||||||
|
export WSL=1 # similar to CODESPACES and GITPOD_WORKSPACE_ID vars
|
||||||
|
else
|
||||||
|
HOSTNAME_BASH="${HOSTNAME}"
|
||||||
|
fi
|
||||||
|
|
||||||
for file in "$HOME/.config/bash/${HOSTNAME}.bash" "$HOME/.config/bash/prompt" "${HOME}/.config/bash/bashrc"; do
|
for file in "$HOME/.config/bash/hosts/${HOSTNAME_BASH}.bashrc" "${HOME}/.config/bash/bashrc"; do
|
||||||
[ -f $file ] && . "$file"
|
[ -f $file ] && . "$file"
|
||||||
done
|
done
|
||||||
|
|
||||||
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
|
|
||||||
|
|
||||||
# make sure shell completions are loaded too
|
|
||||||
. "$HOME/.asdf/asdf.sh"
|
|
||||||
. "$HOME/.asdf/completions/asdf.bash"
|
|
||||||
|
|
||||||
eval "$(gopass completion bash)"
|
|
||||||
eval "$(devbox global shellenv)"
|
|
||||||
|
|
|
@ -1,16 +1,17 @@
|
||||||
# Beware! This file is rewritten by htop when settings are changed in the interface.
|
# Beware! This file is rewritten by htop when settings are changed in the interface.
|
||||||
# The parser is also very primitive, and not human-friendly.
|
# The parser is also very primitive, and not human-friendly.
|
||||||
|
htop_version=3.2.2
|
||||||
|
config_reader_min_version=3
|
||||||
fields=0 48 17 18 38 39 40 2 46 47 49 1
|
fields=0 48 17 18 38 39 40 2 46 47 49 1
|
||||||
sort_key=46
|
|
||||||
sort_direction=-1
|
|
||||||
tree_sort_key=47
|
|
||||||
tree_sort_direction=-1
|
|
||||||
hide_kernel_threads=1
|
hide_kernel_threads=1
|
||||||
hide_userland_threads=0
|
hide_userland_threads=0
|
||||||
|
hide_running_in_container=0
|
||||||
shadow_other_users=1
|
shadow_other_users=1
|
||||||
show_thread_names=0
|
show_thread_names=0
|
||||||
show_program_path=1
|
show_program_path=1
|
||||||
highlight_base_name=1
|
highlight_base_name=1
|
||||||
|
highlight_deleted_exe=1
|
||||||
|
shadow_distribution_path_prefix=0
|
||||||
highlight_megabytes=1
|
highlight_megabytes=1
|
||||||
highlight_threads=1
|
highlight_threads=1
|
||||||
highlight_changes=0
|
highlight_changes=0
|
||||||
|
@ -18,9 +19,8 @@ highlight_changes_delay_secs=5
|
||||||
find_comm_in_cmdline=1
|
find_comm_in_cmdline=1
|
||||||
strip_exe_from_cmdline=1
|
strip_exe_from_cmdline=1
|
||||||
show_merged_command=1
|
show_merged_command=1
|
||||||
tree_view=1
|
|
||||||
tree_view_always_by_pid=0
|
|
||||||
header_margin=1
|
header_margin=1
|
||||||
|
screen_tabs=0
|
||||||
detailed_cpu_time=1
|
detailed_cpu_time=1
|
||||||
cpu_count_from_one=1
|
cpu_count_from_one=1
|
||||||
show_cpu_usage=1
|
show_cpu_usage=1
|
||||||
|
@ -32,8 +32,32 @@ account_guest_in_cpu_meter=1
|
||||||
color_scheme=0
|
color_scheme=0
|
||||||
enable_mouse=1
|
enable_mouse=1
|
||||||
delay=5
|
delay=5
|
||||||
left_meters=AllCPUs Memory Swap
|
|
||||||
left_meter_modes=1 1 1
|
|
||||||
right_meters=Tasks LoadAverage Uptime
|
|
||||||
right_meter_modes=2 2 2
|
|
||||||
hide_function_bar=0
|
hide_function_bar=0
|
||||||
|
header_layout=two_50_50
|
||||||
|
column_meters_0=AllCPUs Memory Swap
|
||||||
|
column_meter_modes_0=1 1 1
|
||||||
|
column_meters_1=Tasks LoadAverage Uptime
|
||||||
|
column_meter_modes_1=2 2 2
|
||||||
|
tree_view=1
|
||||||
|
sort_key=46
|
||||||
|
tree_sort_key=1
|
||||||
|
sort_direction=-1
|
||||||
|
tree_sort_direction=1
|
||||||
|
tree_view_always_by_pid=0
|
||||||
|
all_branches_collapsed=0
|
||||||
|
screen:Main=PID USER PRIORITY NICE M_VIRT M_RESIDENT M_SHARE STATE PERCENT_CPU PERCENT_MEM TIME Command
|
||||||
|
.sort_key=PERCENT_CPU
|
||||||
|
.tree_sort_key=Command
|
||||||
|
.tree_view=1
|
||||||
|
.tree_view_always_by_pid=0
|
||||||
|
.sort_direction=-1
|
||||||
|
.tree_sort_direction=1
|
||||||
|
.all_branches_collapsed=0
|
||||||
|
screen:I/O=PID USER IO_PRIORITY IO_RATE IO_READ_RATE IO_WRITE_RATE Command
|
||||||
|
.sort_key=IO_RATE
|
||||||
|
.tree_sort_key=PID
|
||||||
|
.tree_view=0
|
||||||
|
.tree_view_always_by_pid=0
|
||||||
|
.sort_direction=-1
|
||||||
|
.tree_sort_direction=1
|
||||||
|
.all_branches_collapsed=0
|
||||||
|
|
4
.env
4
.env
|
@ -18,6 +18,10 @@ export DEBEMAIL="releases@andreijiroh.eu.org"
|
||||||
# Customized PATH + Jetbrains Toolbox
|
# Customized PATH + Jetbrains Toolbox
|
||||||
export PATH="$HOME/go/bin:$HOME/.local/bin:$GOPATH/bin:$PATH:$HOME/.local/share/JetBrains/Toolbox/scripts"
|
export PATH="$HOME/go/bin:$HOME/.local/bin:$GOPATH/bin:$PATH:$HOME/.local/share/JetBrains/Toolbox/scripts"
|
||||||
|
|
||||||
|
# Hardcode timezone to PHT unless otherwise specified in ~/.env.local.
|
||||||
|
# You might need tzdata installed on Alpine per https://wiki.alpinelinux.org/wiki/Setting_the_timezone
|
||||||
|
export TZ=Asia/Manila
|
||||||
|
|
||||||
##########################################################################################
|
##########################################################################################
|
||||||
# Code snippets from https://git.sr.ht/~sircmpwn/dotfiles/tree/db5945a4/item/.env
|
# Code snippets from https://git.sr.ht/~sircmpwn/dotfiles/tree/db5945a4/item/.env
|
||||||
##########################################################################################
|
##########################################################################################
|
||||||
|
|
|
@ -7,6 +7,3 @@ max-cache-ttl-ssh 10800
|
||||||
# Let's be serious about our password hygenine
|
# Let's be serious about our password hygenine
|
||||||
min-passphrase-len 12
|
min-passphrase-len 12
|
||||||
min-passphrase-nonalpha 3
|
min-passphrase-nonalpha 3
|
||||||
|
|
||||||
# Use our bloody pinentry handler for that.
|
|
||||||
#pinentry-program bash /home/ajhalili2006/bin/handle-pinentry
|
|
||||||
|
|
3
.vscode/extensions.json
vendored
3
.vscode/extensions.json
vendored
|
@ -1,5 +1,6 @@
|
||||||
{
|
{
|
||||||
"recommendations": [
|
"recommendations": [
|
||||||
"mads-hartmann.bash-ide-vscode"
|
"mads-hartmann.bash-ide-vscode",
|
||||||
|
"jetpack-io.devbox"
|
||||||
]
|
]
|
||||||
}
|
}
|
|
@ -38,7 +38,6 @@ path_detection() {
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
warn "environment can't be detected ($desktop), using pinentry-curses"
|
|
||||||
if command -v pinentry-curses >> /dev/null; then
|
if command -v pinentry-curses >> /dev/null; then
|
||||||
target_bin=pinentry-curses
|
target_bin=pinentry-curses
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in a new issue