A mixed bad of updates
= Housekeeping, missing shrc.d and some changing in order. Most notably, split of editor aliases to separate file. + The missing .shrc.d files that were added: * keyboard mappings * bin.path - which includes cleanup * oh-my-posh compltions + edit-with-spacemacs ready for us, almost feature complete I still plan on making it resue existing frames is possible. + oh-my-posh config to include `systemctl is-system-running` to prompt when stat is not 'running' (mostly it will be shown when 'degraded')
This commit is contained in:
parent
8cb6f49db9
commit
f445d39fc6
|
@ -0,0 +1,9 @@
|
||||||
|
# set PATH so it includes user's private bin if it exists
|
||||||
|
if [[ -d "$HOME/bin" ]] ; then
|
||||||
|
export PATH="~/bin:$PATH"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# set PATH so it includes user's private bin if it exists
|
||||||
|
if [[ -d "$HOME/.local/bin" ]] ; then
|
||||||
|
export PATH="~/.local/bin:$PATH"
|
||||||
|
fi
|
|
@ -1,22 +1,5 @@
|
||||||
alias sudo="/usr/bin/sudo "
|
alias sudo="/usr/bin/sudo "
|
||||||
PREFERED_VI=$(type -fP nvim vim | head -1)
|
|
||||||
if [[ -z "$PREFERED_VI" ]]; then
|
|
||||||
PREFERED_VI=$(type -fP vi | head -1)
|
|
||||||
|
|
||||||
if [[ -z "$PREFERED_VI" ]]; then
|
|
||||||
alias vi_editor='eval $EDITOR '
|
|
||||||
else
|
|
||||||
alias vi_editor="$PREFERED_VI "
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
alias vi_editor="$PREFERED_VI -p "
|
|
||||||
fi
|
|
||||||
alias nvim="vi_editor "
|
|
||||||
alias vim="vi_editor "
|
|
||||||
alias vi="vi_editor "
|
|
||||||
|
|
||||||
alias lessr="less --raw-control-chars "
|
alias lessr="less --raw-control-chars "
|
||||||
|
|
||||||
alias ed="nvim "
|
|
||||||
|
|
||||||
alias sz-edshrc="ed ~/.sz.shrc.d ; exec $SHELL"
|
alias sz-edshrc="ed ~/.sz.shrc.d ; exec $SHELL"
|
||||||
|
|
|
@ -0,0 +1,21 @@
|
||||||
|
if [[ -n "$(type -fP emacsclient)" && -n "$(type -fP emacs)" && -n "$(type -fP edit-with-spacemacs)" ]]; then
|
||||||
|
alias vi_editor='edit-with-spacemacs'
|
||||||
|
else
|
||||||
|
PREFERED_VI=$(type -fP nvim vim | head -1)
|
||||||
|
if [[ -z "$PREFERED_VI" ]]; then
|
||||||
|
PREFERED_VI=$(type -fP vi | head -1)
|
||||||
|
|
||||||
|
if [[ -z "$PREFERED_VI" ]]; then
|
||||||
|
alias vi_editor='eval $EDITOR '
|
||||||
|
else
|
||||||
|
alias vi_editor="$PREFERED_VI"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
alias vi_editor="$PREFERED_VI -p"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
alias nvim="vi_editor"
|
||||||
|
alias vim="vi_editor"
|
||||||
|
alias vi="vi_editor"
|
||||||
|
|
||||||
|
alias ed="vi_editor"
|
|
@ -0,0 +1,5 @@
|
||||||
|
if [[ -n "$(type -fP setxkbmap)" ]]; then
|
||||||
|
setxkbmap -option
|
||||||
|
setxkbmap -option caps:escape
|
||||||
|
setxkbmap -option caps:ctrl_modifier
|
||||||
|
fi
|
|
@ -0,0 +1 @@
|
||||||
|
[[ -n "$(type -fP gcloud)" ]] && source <(oh-my-posh completion bash)
|
|
@ -0,0 +1,58 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
###
|
||||||
|
### edit-with-spacemacs, ensures a daemon named spacemacs is working
|
||||||
|
### if it's already running, the editor will open a new frame attached to it
|
||||||
|
### if it's not, it will first launch the daemon
|
||||||
|
###
|
||||||
|
|
||||||
|
MY_EMACS_PROFILE=${CHEMACS_PROFILE:-spacemacs}
|
||||||
|
MY_SILENT="/dev/null"
|
||||||
|
MY_EMACS_CREATEFRAME="--create-frame"
|
||||||
|
MY_EMACS_NO_WAIT="--no-wait"
|
||||||
|
|
||||||
|
# MY_SILENT="/dev/tty"
|
||||||
|
# MY_EMACS_NO_WAIT=""
|
||||||
|
|
||||||
|
if [ "$DISPLAY" = "" ]; then
|
||||||
|
MY_EMACS_NO_WAIT=""
|
||||||
|
fi
|
||||||
|
|
||||||
|
# set | grep '^MY_EMACS' 1>&2
|
||||||
|
|
||||||
|
function q_() { printf "'%s'\n" "${@}"; }
|
||||||
|
|
||||||
|
function myemacs_full() {
|
||||||
|
|
||||||
|
_cli="$(q_ "${@}")"
|
||||||
|
_cli="${_cli// /\\ }"
|
||||||
|
_cli=$(printf "$_cli")
|
||||||
|
# echo $_cli
|
||||||
|
_cli=$(printf "/usr/bin/emacsclient \
|
||||||
|
--socket-name=\"$MY_EMACS_PROFILE\" \
|
||||||
|
$MY_EMACS_CREATEFRAME \
|
||||||
|
$MY_EMACS_NO_WAIT \
|
||||||
|
--alternate-editor='sh -c \"( \
|
||||||
|
/usr/bin/emacs --with-profile '$MY_EMACS_PROFILE' --daemon \
|
||||||
|
); echo ''Daemon started'' > $MY_SILENT; ( \
|
||||||
|
/usr/bin/emacsclient \
|
||||||
|
--socket-name='$MY_EMACS_PROFILE' \
|
||||||
|
$MY_EMACS_NO_WAIT \
|
||||||
|
--create-frame \
|
||||||
|
${_cli//\'/\'\'} \
|
||||||
|
)\"' \
|
||||||
|
$_cli" \
|
||||||
|
)
|
||||||
|
|
||||||
|
# set -x
|
||||||
|
#echo $_cli
|
||||||
|
2>$MY_SILENT eval $_cli
|
||||||
|
}
|
||||||
|
|
||||||
|
# FRAMES was supposed to find existing frames, but it doesn't seem to work right now
|
||||||
|
# Requires more research
|
||||||
|
#
|
||||||
|
# FRAMES=$( 2>/dev/null /usr/bin/emacsclient -n -e "(if (> (length (frame-list)) 1) 't)" | grep t )
|
||||||
|
# echo "FRAMES: {$FRAMES}" 1>&2
|
||||||
|
|
||||||
|
myemacs_full "${@}"
|
|
@ -12,6 +12,21 @@
|
||||||
"template": " {{ if .WSL }}WSL at {{ end }}{{.Icon}}",
|
"template": " {{ if .WSL }}WSL at {{ end }}{{.Icon}}",
|
||||||
"type": "os"
|
"type": "os"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"type": "command",
|
||||||
|
"foreground": "#d3d7cf",
|
||||||
|
"background": "red",
|
||||||
|
"background_templates": [
|
||||||
|
"{{ if contains \"running\" .Output }}#FFA400{{ end }}"
|
||||||
|
],
|
||||||
|
"powerline_symbol": "\ue0b0",
|
||||||
|
"style": "powerline",
|
||||||
|
"properties": {
|
||||||
|
"shell": "bash",
|
||||||
|
"command": "systemctl is-system-running || true"
|
||||||
|
},
|
||||||
|
"template": "{{ if contains \"running\" .Output }}{{ else }} {{ .Output }} {{ end }}"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"background": "#3465a4",
|
"background": "#3465a4",
|
||||||
"foreground": "#e4e4e4",
|
"foreground": "#e4e4e4",
|
||||||
|
|
Loading…
Reference in New Issue