Compare commits

...

12 commits

10 changed files with 35 additions and 110 deletions

View file

@ -20,9 +20,8 @@ These are generic dotfiles intended for use across any platform.
Following the best practices of the local platform install `git` and `stow`. Following the best practices of the local platform install `git` and `stow`.
``` ```
$ git clone ssh://git@gitlab.com/amdavidson/dotfiles.git $HOME/.dotfiles $ git clone git@git.sr.ht:~amdavidson/dotfiles $HOME/.dotfiles
$ cd $HOME/.dotfiles $ cd $HOME/.dotfiles
$ ./update.sh
$ stow {scripts,bash,git,tmux,vim} $ stow {scripts,bash,git,tmux,vim}
``` ```

View file

@ -1,81 +0,0 @@
background no
font Sans:size=8
#xftfont Sans:size=10
use_xft yes
xftalpha 0.8
update_interval 2.0
total_run_times 0
own_window yes
own_window_type normal
own_window_argb_visual true
own_window_transparent yes
#own_windiw_class conky
own_window_hints undecorated,below,sticky,skip_taskbar,skip_pager
double_buffer yes
minimum_size 200 5
maximum_width 400
draw_shades yes
draw_outline no
draw_borders no
draw_graph_borders yes
default_color CDE0E7
default_shade_color black
default_outline_color green
alignment top_right
gap_y 35
no_buffers yes
uppercase no
cpu_avg_samples 2
override_utf8_locale no
uppercase yes # set to yes if you want all text to be in uppercase
TEXT
${color CDE0E7}${font OxygenSans:pixelsize=70}${time %l:%M %P}${font}
${hr 1}
${font OxygenSans:pixelsize=20}${time %A} $alignr${color white}${time %Y}-${color white}${time %m}-${color white}${time %d}${font}
${color white}SYSTEM ${hr 3}${color}
Hostname: $alignr$nodename
Uptime: $alignr$uptime
Kernel: $alignr$kernel
Load: $alignr$loadavg
CPU1 ${alignr}${cpu cpu1}%
${cpubar 4 cpu1}
CPU2 ${alignr}${cpu cpu2}%
${cpubar 4 cpu2}
Ram ${alignr}$mem / $memmax ($memperc%)
${membar 4}
Swap ${alignr} $swap / $swapmax ($swapperc%)
${swapbar 4}
Highest CPU $alignr CPU% MEM%
${color aaaaaa}${top name 1}$alignr${top cpu 1}${top mem 1}
${top name 2}$alignr${top cpu 2}${top mem 2}
${top name 3}$alignr${top cpu 3}${top mem 3}${color}
Highest MEM $alignr CPU% MEM%
${color aaaaaa}${top_mem name 1}$alignr${top_mem cpu 1}${top_mem mem 1}
${top_mem name 2}$alignr${top_mem cpu 2}${top_mem mem 2}
${top_mem name 3}$alignr${top_mem cpu 3}${top_mem mem 3}${color}
${color white}Filesystem ${hr 3}${color}
Root (/): ${alignr}${fs_used /} / ${fs_size /}
${fs_bar 4 /}
${color white}NETWORK ${hr 3}${color}
${if_existing /proc/sys/net/ipv4/conf/eth0}
eth0: ${addr eth0}${color aaaaaa}
Down ${downspeed eth0}/s ${alignr}Up ${upspeed eth0}/s
${downspeedgraph eth0 25,107} ${alignr}${upspeedgraph eth0 25,107}
Total ${totaldown eth0} ${alignr}Total ${totalup eth0}${color}
${endif}
${if_existing /proc/sys/net/ipv4/conf/eth1}
eth0: ${addr eth1}${color aaaaaa}
Down ${downspeed eth1} k/s ${alignr}Up ${upspeed eth1} k/s
${downspeedgraph eth1 25,107} ${alignr}${upspeedgraph eth1 25,107}
Total ${totaldown eth1} ${alignr}Total ${totalup eth1}${color}
${endif}

View file

@ -42,6 +42,4 @@
diffFilter = delta --color-only diffFilter = delta --color-only
[commit] [commit]
gpgsign = true gpgsign = false
[gpg]
program = /usr/local/bin/gpg

View file

@ -137,7 +137,7 @@ endif " has("autocmd")
"let g:dracula_colorterm = 0 "let g:dracula_colorterm = 0
"silent! colorscheme dracula "silent! colorscheme dracula
set background=dark set background=dark
colorscheme gruvbox silent! colorscheme gruvbox
" ==================== Code Folding ==================== " ==================== Code Folding ====================

View file

@ -20,12 +20,6 @@ alias vim='nvim'
alias vi='nvim' alias vi='nvim'
alias nv='nvim' alias nv='nvim'
# remote access
alias mroyal='mosh royal -- tmux new-session -A -s main'
alias mari='mosh ari -- tmux new-session -A -s main'
alias muzi='mosh uzi -- tmux new-session -A -s main'
alias mnf='mosh amdavidson@needleandfoot.com -- tmux new-session -A -s main'
# fix sudo autocorrections # fix sudo autocorrections
alias sudo="nocorrect sudo" alias sudo="nocorrect sudo"

View file

@ -7,6 +7,10 @@ export TERM=xterm-256color
export CLICOLOR=1 export CLICOLOR=1
export LSCOLORS=Gxfxcxdxbxegedabagacad export LSCOLORS=Gxfxcxdxbxegedabagacad
# Setup XDG
export XDG_CONFIG_HOME="$HOME/.config"
export XDG_DATA_HOME="$HOME/.local/share"
# Enable grep colors # Enable grep colors
export GREP_COLOR='3;33' export GREP_COLOR='3;33'
@ -19,6 +23,3 @@ export GPG_TTY=$(tty)
# Fix GOPATH # Fix GOPATH
export GOPATH="$HOME/dev/go" export GOPATH="$HOME/dev/go"
export PATH="$HOME/dev/go/bin:$PATH" export PATH="$HOME/dev/go/bin:$PATH"
# tmux command for use with ssh / mosh commands
export TM="tmux new-session -A -s main"

View file

@ -34,6 +34,20 @@ extract() {
fi fi
} }
# create an archive of a list of files, compress the archive, and encrypt the compressed archive
function archive-and-encrypt {
echo -n "Enter desired output filename: "
read filename
tar cJ $1 | \
gpg -q -r andrew@amdavidson.com -s -e -o "$filename.tar.xz.gpg"
}
# run mosh and tmux to a specific host
function mt {
mosh $1 -- tmux new-session -A -s main
}
# blank-chrome # blank-chrome
function blank-chrome { function blank-chrome {
if [ "$@" ]; then if [ "$@" ]; then

View file

@ -7,14 +7,14 @@ function precmd {
echo -ne "\e]1;$PWD:h:t/$PWD:t\a" echo -ne "\e]1;$PWD:h:t/$PWD:t\a"
} }
function set_running_app { #function set_running_app {
printf "\e]1; $PWD:t:$(history $HISTCMD | cut -b7- ) \a" # printf "\e]1; $PWD:t:$(history $HISTCMD | cut -b7- ) \a"
} #}
#
function preexec { #function preexec {
set_running_app # set_running_app
} #}
#
function postexec { #function postexec {
set_running_app # set_running_app
} #}

View file

@ -87,10 +87,10 @@ unsetopt menu_complete
### Correction ### Correction
# Enable spelling correction for commands # Enable spelling correction for commands
setopt correct # setopt correct
# Enable spelling correciton for arguments # Enable spelling correciton for arguments
setopt correctall # setopt correctall

View file

@ -61,5 +61,5 @@ function check_reboot {
test -f /var/run/reboot-required && echo "R " test -f /var/run/reboot-required && echo "R "
} }
PROMPT='${PR_BOLD_RED}$(check_reboot)%{$reset_color%}%m ${PR_BOLD_YELLOW}$(truncated_pwd 3)$(git_prompt)%(?.%F{magenta}.%F{red})%f ' PROMPT='${PR_BOLD_RED}$(check_reboot)%{$reset_color%}%m ${PR_BOLD_YELLOW}$(truncated_pwd 3)$(git_prompt)%(?.%F{magenta}.%F{red})%f %{$reset_color%}%'
#PROMPT='$(check_reboot)%m $(truncated_pwd 3) $(git_branch) $(git_unstaged)$(git_is_ahead)$(git_is_behind)> ' #PROMPT='$(check_reboot)%m $(truncated_pwd 3) $(git_branch) $(git_unstaged)$(git_is_ahead)$(git_is_behind)> '