Compare commits
5 Commits
8a2fbc92ff
...
2a1321e961
| Author | SHA1 | Date | |
|---|---|---|---|
| 2a1321e961 | |||
| 997af51bee | |||
| 67988b7ffc | |||
| d32b47dd72 | |||
| 9b73f4cc9b |
25
.bashrc
25
.bashrc
@@ -12,25 +12,26 @@ esac
|
|||||||
[ -z "${PS1-}" ] && return
|
[ -z "${PS1-}" ] && return
|
||||||
|
|
||||||
# lazy loading of ssh agents
|
# lazy loading of ssh agents
|
||||||
_lazy_ssh() {
|
__lazy_ssh_agent() {
|
||||||
if [ -z "$SSH_AUTH_SOCK" ]; then
|
if [ -z "$SSH_AUTH_SOCK" ]; then
|
||||||
eval "$(ssh-agent -s)" >/dev/null
|
eval "$(ssh-agent -s)" >/dev/null
|
||||||
ssh-add "$HOME/.ssh/github" >/dev/null
|
ssh-add "$HOME/.ssh/github" >/dev/null 2>&1
|
||||||
ssh-add "$HOME/.ssh/gitea" >/dev/null
|
ssh-add "$HOME/.ssh/gitea" >/dev/null 2>&1
|
||||||
ssh-add "$HOME/.ssh/admin@homeserver" >/dev/null
|
ssh-add "$HOME/.ssh/admin@homeserver" >/dev/null 2>&1
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
# aliases so the function is called beforehand
|
# aliases so the function is called beforehand
|
||||||
alias ssh='_lazy_ssh; ssh'
|
alias ssh='__lazy_ssh_agent; ssh'
|
||||||
alias sudo='_lazy_ssh; sudo'
|
alias sudo='__lazy_ssh_agent; sudo'
|
||||||
|
|
||||||
# alias to colourise make output
|
# colourises make output, so when it prints via
|
||||||
_make() {
|
# $(warning) or $(error), it is formatted properly
|
||||||
|
__colour_make() {
|
||||||
make "$@" 2> >(sed -E \
|
make "$@" 2> >(sed -E \
|
||||||
-e "s/^([Mm]akefile:[0-9]+:.*)/\x1b[33m\1\x1b[0m/" \
|
-e "s/^([Mm]akefile:[0-9]+:.*)/\x1b[33m\1\x1b[0m/" \
|
||||||
-e "s/^.*error.*$/\x1b[31m&\x1b[0m/I" >&2)
|
-e "s/^.*error.*$/\x1b[31m&\x1b[0m/I" >&2)
|
||||||
}
|
}
|
||||||
alias make='_make'
|
alias make='__colour_make'
|
||||||
|
|
||||||
# lazily loads the git utilities, to prevent slowdowns
|
# lazily loads the git utilities, to prevent slowdowns
|
||||||
__lazy_git_ps1() {
|
__lazy_git_ps1() {
|
||||||
@@ -50,11 +51,13 @@ __regenprompt() {
|
|||||||
local err=$? # acquire the error code of the last executed command
|
local err=$? # acquire the error code of the last executed command
|
||||||
local git=$(__lazy_git_ps1)
|
local git=$(__lazy_git_ps1)
|
||||||
|
|
||||||
|
# Format the error code to be in the last column of the terminal
|
||||||
|
# this shall be printed as non-printable characters, so won't effect text wrapping.
|
||||||
if [ $err -ne 0 ]; then
|
if [ $err -ne 0 ]; then
|
||||||
err="\[\033[$((COLUMNS - 4))G\033[01;31m\]${err}\[\033[0G\]"
|
err="\033[$((COLUMNS - 4))G\033[01;31m${err}\033[0G"
|
||||||
else unset err; fi
|
else unset err; fi
|
||||||
|
|
||||||
PS1="$err" # error code
|
PS1="\[$err\]" # error code
|
||||||
PS1="$PS1\[\033[?25h\]" # show cursor
|
PS1="$PS1\[\033[?25h\]" # show cursor
|
||||||
PS1="$PS1\[\033[01;35m\]\u@\h" # user@host
|
PS1="$PS1\[\033[01;35m\]\u@\h" # user@host
|
||||||
PS1="$PS1\[\033[00m\]:" # separator
|
PS1="$PS1\[\033[00m\]:" # separator
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ vim.g.maplocalleader = ' '
|
|||||||
Autocmd = vim.api.nvim_create_autocmd
|
Autocmd = vim.api.nvim_create_autocmd
|
||||||
Map = vim.keymap.set
|
Map = vim.keymap.set
|
||||||
|
|
||||||
|
---@module 'gruvbox'
|
||||||
---@class userdata
|
---@class userdata
|
||||||
---@field palette GruvboxPalette
|
---@field palette GruvboxPalette
|
||||||
_G.userdat = {}
|
_G.userdat = {}
|
||||||
|
|||||||
@@ -1,9 +1,11 @@
|
|||||||
|
---@module 'lazy'
|
||||||
---@type LazySpec
|
---@type LazySpec
|
||||||
return { {
|
return { {
|
||||||
'ellisonleao/gruvbox.nvim',
|
'ellisonleao/gruvbox.nvim',
|
||||||
lazy = false,
|
lazy = false,
|
||||||
dependencies = { 'johnfrankmorgan/whitespace.nvim' },
|
dependencies = { 'johnfrankmorgan/whitespace.nvim' },
|
||||||
priority = 1000,
|
priority = 1000,
|
||||||
|
---@module 'gruvbox'
|
||||||
---@type GruvboxConfig
|
---@type GruvboxConfig
|
||||||
opts = {
|
opts = {
|
||||||
styles = {
|
styles = {
|
||||||
|
|||||||
Reference in New Issue
Block a user