From 787559b1263182e063e5630fb794f0372ea30cbc Mon Sep 17 00:00:00 2001
From: Danny Holman <dholman@gymli.org>
Date: Tue, 22 Feb 2022 11:48:46 -0600
Subject: Update to current version of files

---
 .Xresources    |  2 ++
 .i3blocks.conf | 14 ++++++++++++++
 .muttrc        |  5 +----
 .ssh/config    | 12 +++++++++++-
 4 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/.Xresources b/.Xresources
index e7e18f5..0bab407 100644
--- a/.Xresources
+++ b/.Xresources
@@ -44,6 +44,8 @@ XTerm.vt100.saveLines: 4096
 XTerm.vt100.scrollBar: false
 XTerm.vt100.faceName: Fantasque Sans Mono:size=12:antialias=true
 XTerm.vt100.bellIsUrgent: true
+XTerm.vt100.backarrowkey: false
+XTerm.ttyModes: erase ^?
 XTerm.vt100.translations: #override \n\
         Ctrl Shift <Key>C: copy-selection(CLIPBOARD) \n\
         Ctrl Shift <Key>V: insert-selection(CLIPBOARD)
diff --git a/.i3blocks.conf b/.i3blocks.conf
index 39fc597..32df7e2 100644
--- a/.i3blocks.conf
+++ b/.i3blocks.conf
@@ -31,6 +31,20 @@ interval=3
 command=~/bin/memory
 interval=3
 
+[iface_wifi]
+command=~/bin/iface
+LABEL=WIFI:
+IFACE=wlp3s0
+interval=10
+display_wifi_name=1
+
+[iface_eth]
+command=~/bin/iface
+LABEL=ETH:
+IFACE=enp2s0f1
+interval=10
+display_wifi_name=0
+
 [updates]
 command=echo "UPD" $(pacman -Qu | wc -l)
 interval=10
diff --git a/.muttrc b/.muttrc
index c7839a5..8864d85 100644
--- a/.muttrc
+++ b/.muttrc
@@ -37,12 +37,9 @@ bind index _ collapse-all
 macro pager \cb <pipe-entry>'urlview'<enter> 'Follow links with urlview'
 macro index,pager S "<save-message>=INBOX.Spam<enter><enter-command>echo 'Saved to INBOX.Spam'<enter>" 'Mark message as Spam'
 macro index,pager H "<save-message>=INBOX.Ham<enter><enter-command>echo 'Saved to INBOX.Ham'<enter>" 'Mark message as Ham'
-macro index,pager R "<save-message>=Archive<enter><enter-command>echo 'Saved to Archive'<enter>" 'Move message to archives'
+macro index,pager A "<save-message>=Archive<enter><enter-command>echo 'Saved to Archive'<enter>" 'Move message to archives'
 macro index,pager <f2> '<sync-mailbox><enter-command>source ~/.mutt/gymli<enter><change-folder>!<enter>
 macro index,pager <f3> '<sync-mailbox><enter-command>source ~/.mutt/tech<enter><change-folder>!<enter>
-macro index A "<modify-labels>+archive -unread -inbox<enter>" "Archive message"
-macro index c "<change-vfolder>?" "Change to vfolder overview"
-macro index \\\\ "<vfolder-from-query>" "Search mailbox"
 
 # -*-muttrc-*-
 
diff --git a/.ssh/config b/.ssh/config
index ab82b2c..96dba83 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -1,6 +1,6 @@
 User dholman
 Host *
-	ControlMaster auto
+        ControlMaster auto
 	ControlPath ~/.ssh/sockets/socket-%r@%h:%p
 	ControlPersist 1h
         GSSAPIAuthentication yes
@@ -11,15 +11,25 @@ Host Zeus
 Host Zeus-idrac
         HostName 192.168.1.40
         Port 22
+        ProxyJump Wilson-alt
 Host Wilson
         HostName Wilson.gymli.org
         Port 22
         ProxyJump Zeus
+Host Wilson-alt
+        HostName www.gymli.org
+        Port 8008
+Host MLaptop
+        HostName MLaptop.gymli.org
+        Port 22
+        ProxyJump Zeus
 Host gateway
         Hostname 192.168.1.1
         Port 22
         KexAlgorithms diffie-hellman-group-exchange-sha1
         ciphers aes128-cbc
+        HostKeyAlgorithms ssh-rsa
+        ProxyJump Zeus
 Host schlorp
         User schlorp
         Hostname localhost
-- 
cgit v1.2.3