miscellaneous changes

.gitconfig

@@ -6,7 +6,7 @@
 [tag]
 	sort = version:refname
 [init]
-	defaultBranch = master
+	defaultBranch = main
 [pull]
 	rebase = false
 [color]

alacritty/alacritty.yml

@@ -1,5 +1,5 @@
 window:
-  opacity: 0.7
+  opacity: 0.8
   # decorations: none
   dimensions:
     lines: 115

conky/conky.conf

@@ -57,6 +57,7 @@ conky.config = {
 
 
 conky.text = [[
+${color green}${alignc}${time %H:%M:%S} ${time %A %d %B %Y}
 ${color green}System $hr
  ${color grey}OS:$color $sysname
  ${color grey}Host:$color $nodename
@@ -64,7 +65,7 @@ ${color green}System $hr
  ${color grey}Arch:$color $machine
  ${color grey}Uptime:$color $uptime
 ${color green}CPU $hr
-${alignc}${color grey}Total: ${hwmon 0 temp 1}°C | CCD1: ${hwmon 0 temp 3}°C | CCD2: ${hwmon 0 temp 4}°C
+${alignc}${color grey}Total: ${hwmon 1 temp 1}°C | CCD1: ${hwmon 1 temp 3}°C | CCD2: ${hwmon 1 temp 4}°C
  ${color grey}${lua_parse conky_mycpus}
 ${color green}Memory $hr
  ${color grey}RAM Usage:$color  $mem/$memmax - $memperc% ${membar 4}
@@ -73,10 +74,14 @@ ${color green}Top $hr
  ${color grey}Processes:$color $processes  ${color grey}Threads:$color $threads  ${color grey}Running:$color $running_threads
 ${color green}File systems $hr
  ${color grey}/ $color${fs_used /}/${fs_size /} ${fs_bar 6 /}
-${if_up enp0s31f6}${color green}Networking $hr
- ${color grey}Interface:$color enp0s31f6
- ${color grey}IP:$color ${addr enp0s31f6}
- ${color grey}Up:$color ${upspeed enp0s31f6}
- ${color grey}Down:$color ${downspeed enp0s31f6}${endif}
-${alignr}${font STIX:size=7}usage:${exec ps -C conky -o pcpu=}%
+${if_up enp14s0}${color green}LAN $hr
+ ${color grey}Interface:$color enp14s0
+ ${color grey}IP:$color ${addr enp14s0}
+ ${color grey}Up:$color ${upspeed enp14s0} ${alignr}${upspeedgraph enp14s0 10,250}
+ ${color grey}Down:$color ${downspeed enp14s0} ${alignr}${downspeedgraph enp14s0 10,250}${endif}
+${if_up wlp13s0}${color green}WLAN $hr
+ ${color grey}Interface:$color wlp13s0
+ ${color grey}IP:$color ${addr wlp13s0}
+ ${color grey}Up:$color ${upspeed wlp13s0} ${alignr}${upspeedgraph wlp13s0 10,250}
+ ${color grey}Down:$color ${downspeed wlp13s0} ${alignr}${downspeedgraph wlp13s0 10,250}${endif}
 ]]

nvim/init.vim

@@ -22,7 +22,8 @@ set signcolumn=yes
 set cmdheight=2
 set notitle
 set updatetime=50
-highlight Normal guibg=none
+au ColorScheme * hi Normal guibg=none ctermbg=none
+au ColorScheme * hi NonText guibg=none ctermbg=none
 
 call plug#begin('~/.vim/plugged')
 

zsh/.zshrc

@@ -29,9 +29,14 @@ fi
 
 alias pls='sudo'
 alias sshdev='ssh jacob@192.168.10.70'
-alias sshdevdesktop='ssh jacob@192.168.10.165'
 alias cddf='cd $HOME/.dotfiles'
 alias nvdf='nvim $HOME/.dotfiles/README.md'
+alias cdjb='cd $HOME/src/github.com/jbohanon'
+
+if [[ $(uname) == Linux ]]; then
+  alias pbcopy='xsel --clipboard --input'
+  alias pbpaste='xsel --clipboard --output'
+fi
 
 alias cls='clear'
 export PATH="/opt/homebrew/opt/protobuf@3.6/bin:$PATH"
@@ -48,3 +53,19 @@ unset conf
 export STARSHIP_CONFIG=~/.config/zsh/starship.toml
 
 eval "$(starship init zsh)"
+
+# >>> conda initialize >>>
+# !! Contents within this block are managed by 'conda init' !!
+__conda_setup="$('/usr/bin/conda' 'shell.zsh' 'hook' 2> /dev/null)"
+if [ $? -eq 0 ]; then
+    eval "$__conda_setup"
+else
+    if [ -f "/usr/etc/profile.d/conda.sh" ]; then
+        . "/usr/etc/profile.d/conda.sh"
+    else
+        export PATH="/usr/bin:$PATH"
+    fi
+fi
+unset __conda_setup
+# <<< conda initialize <<<
+