From f1804c57494eb4a6927a7c85d9f92f66a0a7d10f Mon Sep 17 00:00:00 2001
From: Danny Holman <dholman@gymli.xyz>
Date: Sun, 8 Aug 2021 15:01:33 -0500
Subject: Update a bunch of stuff

Update the SSH configs, Neomutt, Vim, Xorg
---
 .gitignore  |  3 ++-
 .muttrc     | 10 +++-------
 .profile    |  4 ++++
 .ssh/config |  6 +++++-
 .vimrc      |  6 +++++-
 .xinitrc    | 26 ++++++++++++++++++++++++++
 6 files changed, 45 insertions(+), 10 deletions(-)
 create mode 100644 .profile
 create mode 100644 .xinitrc

diff --git a/.gitignore b/.gitignore
index 4ae158b..0111262 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 .config/*
-.ssh/known_hosts
+.ssh/known_hosts*
+.ssh/sockets
 .vim/spell
 .vim/tmp
diff --git a/.muttrc b/.muttrc
index 0f88d65..5a2d79e 100644
--- a/.muttrc
+++ b/.muttrc
@@ -34,19 +34,15 @@ bind index - collapse-thread
 bind index _ collapse-all
 
 # Macros
-macro index,pager A <pipe-message>'git am -s' 'Apply patch in git repo'
 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 <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>
-
-# Hooks
-folder-hook =INBOX 'push "<delete-pattern> ~d>30d\n"'
-folder-hook =INBOX.LKML 'push "<delete-pattern> ~d>7d\n"'
-folder-hook =INBOX.next 'push "<delete-pattern> ~d>30d\n"'
-folder-hook =INBOX.doc 'push "<delete-pattern> ~d>7d\n"'
+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/.profile b/.profile
new file mode 100644
index 0000000..d40a884
--- /dev/null
+++ b/.profile
@@ -0,0 +1,4 @@
+# Add RVM to PATH for scripting. Make sure this is the last PATH variable change.
+export PATH="$PATH:$HOME/.rvm/bin"
+export QT_QPA_PLATFORMTHEME=gtk2
+export TERMINAL="xterm"
diff --git a/.ssh/config b/.ssh/config
index e125eae..8b5637e 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -8,12 +8,16 @@ Host *
 Host Zeus
         HostName www.gymli.xyz
         Port 22
+Host Zeus-idrac
+        HostName 192.168.1.40
+        Port 22
+        ProxyJump Zeus
 Host Wilson
 	HostName Wilson.gymli.xyz
 	Port 22
         ProxyJump Zeus
 Host gateway
-        Hostname gateway.gymli.xyz
+        Hostname 192.168.1.1
         Port 22
         KexAlgorithms diffie-hellman-group-exchange-sha1
         ciphers aes128-cbc
diff --git a/.vimrc b/.vimrc
index 60ca2c8..0897f76 100644
--- a/.vimrc
+++ b/.vimrc
@@ -64,6 +64,9 @@ noremap P P=`[<C-o>
 
 " Per-project indentation
 au BufRead,BufEnter ~/repositories/linux/*.{c,h} set noexpandtab
+au BufRead,BufEnter ~/repositories/linux/*.{c,h} set softtabstop=8
+au BufRead,BufEnter ~/repositories/linux/*.{c,h} set shiftwidth=8
+au BufRead,BufEnter ~/repositories/linux/*.{c,h} set tabstop=8
 
 set nowrap
 set linebreak
@@ -130,7 +133,8 @@ nnoremap <C-L> <C-W><C-L>
 nnoremap <C-H> <C-W><C-H>
 nnoremap <silent> <Leader>n :NERDTreeToggle<CR>
 nnoremap <silent> <Leader>c :silent !ctags -R .<CR><C-L>
-nnoremap <silent> <Leader>t :tag 
+nnoremap <silent> <Leader>t :CtrlPTag<CR>
+nnoremap <silent> <Leader>b :TagbarToggle<CR>
 nnoremap <silent> <F5> :call ToggleSpell()<CR>
 let mapleader = " "
 
diff --git a/.xinitrc b/.xinitrc
new file mode 100644
index 0000000..46cb3a0
--- /dev/null
+++ b/.xinitrc
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+sysresources=/etc/X11/xinit/.Xresources
+sysmodmap=/etc/X11/xinit/.Xmodmap
+
+# merge in defaults and keymaps
+
+if [ -f $sysresources ]; then
+    xrdb -merge $sysresources
+fi
+
+if [ -f $sysmodmap ]; then
+    xmodmap $sysmodmap
+fi
+
+if [ -f "$userresources" ]; then
+    xrdb -merge "$userresources"
+fi
+
+if [ -f "$usermodmap" ]; then
+    xmodmap "$usermodmap"
+fi
+
+exec i3
-- 
cgit v1.2.3