From 596de9befbc4db2438421d21037a38c0236b5139 Mon Sep 17 00:00:00 2001 From: Danny Holman Date: Fri, 17 Apr 2020 23:44:22 -0500 Subject: General updates Update everything in this folder to be current with my setup. --- .config/i3/config | 36 +++++++++++------------------------- .muttrc | 12 ++++++------ .ssh/config | 1 - .vimrc | 1 + .zshenv | 4 +++- 5 files changed, 21 insertions(+), 33 deletions(-) diff --git a/.config/i3/config b/.config/i3/config index 4b4263a..7df77ba 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -75,25 +75,13 @@ bindsym $mod+Shift+c reload bindsym $mod+Shift+r restart # resize window (you can also use the mouse for that) -mode "resize" { - # These bindings trigger as soon as you enter the resize mode - - # Pressing left will shrink the window’s width. - # Pressing right will grow the window’s width. - # Pressing up will shrink the window’s height. - # Pressing down will grow the window’s height. - bindsym j resize shrink width 10 px or 10 ppt - bindsym k resize grow height 10 px or 10 ppt - bindsym l resize shrink height 10 px or 10 ppt - bindsym semicolon resize grow width 10 px or 10 ppt - - # same bindings, but for the arrow keys - bindsym Left resize shrink width 10 px or 10 ppt - bindsym Down resize grow height 10 px or 10 ppt - bindsym Up resize shrink height 10 px or 10 ppt - bindsym Right resize grow width 10 px or 10 ppt - - # back to normal: Enter or Escape +set $mode_resize Resize window +mode "$mode_resize" { + bindsym h resize shrink width 10 px or 10 ppt + bindsym j resize grow height 10 px or 10 ppt + bindsym k resize shrink height 10 px or 10 ppt + bindsym l resize grow width 10 px or 10 ppt + bindsym Return mode "default" bindsym Escape mode "default" } @@ -112,16 +100,11 @@ mode "$mode_system" { bindsym Escape mode "default" } -# Resize windows -bindsym $mod+Shift+k resize grow height 10 px or 10 ppt -bindsym $mod+Shift+j resize shrink height 10 px or 10 ppt -bindsym $mod+Shift+l resize grow width 10 px or 10 ppt -bindsym $mod+Shift+h resize shrink width 10 px or 10 ppt - # Volume bindsym $mod+Shift+greater exec --no-startup-id amixer sset Master 5%+ bindsym $mod+Shift+less exec --no-startup-id amixer sset Master 5%- bindsym $mod+Shift+m exec --no-startup-id amixer sset Master toggle +bindsym $mod+Shift+t exec --no-startup-id amixer sset Front toggle bindsym XF86AudioRaiseVolume exec --no-startup-id amixer sset Master 5%+ bindsym XF86AudioLowerVolume exec --no-startup-id amixer sset Master 5%- bindsym XF86AudioMute exec --no-startup-id amixer sset Master toggle @@ -136,6 +119,9 @@ bindsym $mod+Print exec --no-startup-id scrot # System menu bindsym $mod+Shift+s mode "$mode_system" +# Resize +bindsym $mod+r mode "$mode_resize" + # Cycle focused workspace bindsym $mod+Tab workspace next bindsym $mod+Shift+Tab workspace prev diff --git a/.muttrc b/.muttrc index 01a1d89..c95612d 100644 --- a/.muttrc +++ b/.muttrc @@ -8,8 +8,8 @@ auto_view text/html # IMAP set imap_user=dholman -set imap_pass=`pass gymli.org/mail/dholman` -set folder=imaps://mail.gymli.org +set imap_pass=`pass gymli.xyz/mail/dholman` +set folder=imaps://mail.gymli.xyz set spoolfile=+INBOX set postponed=+Drafts set trash=+Trash @@ -24,9 +24,9 @@ set mail_check = 120 # SMTP set record=+Sent -set smtp_url=smtp://$imap_user:$imap_pass@mail.gymli.org +set smtp_url=smtp://$imap_user:$imap_pass@mail.gymli.xyz set realname=$my_name -set from=$imap_user@gymli.org +set from=$imap_user@gymli.xyz set ssl_force_tls = yes set ssl_starttls @@ -36,7 +36,7 @@ set pgp_replysign set pgp_replysignencrypted set pgp_show_unusable=no set pgp_verify_sig=yes -set pgp_sign_as=90D8F8E2C830F6129B2FBB1133836B30AA014B82 +set pgp_sign_as=87B76D64AF9090B9C527B4D44EE2AB8BAFCB5561 source ~/.gpg.rc # Keybinds @@ -47,7 +47,7 @@ bind index _ collapse-all # Macros macro index,pager A 'git am -s' 'Apply patch in git repo' macro pager \cb 'urlview' 'Follow links with urlview' -macro index,pager S ":set confirmappend=no resolve=no\nN=Spam" 'Mark message as read and move into Spam folder' +macro index,pager S ":set confirmappend=no resolve=no\nN=Spam\n" 'Mark message as read and move into Spam folder' # Hooks folder-hook =INBOX 'push " ~d>30d\n"' diff --git a/.ssh/config b/.ssh/config index 00affa0..b2b84a5 100644 --- a/.ssh/config +++ b/.ssh/config @@ -2,4 +2,3 @@ User dholman Host Zeus HostName 192.168.1.26 Port 22 - GSSAPIAuthentication yes diff --git a/.vimrc b/.vimrc index c7c4d92..5afbba3 100644 --- a/.vimrc +++ b/.vimrc @@ -108,6 +108,7 @@ nnoremap nnoremap nnoremap b :TagbarToggle nnoremap n :NERDTreeToggle +nnoremap c :silent !ctags -R . nnoremap t :tag nnoremap qq :quit let mapleader = " " diff --git a/.zshenv b/.zshenv index 412512b..2cbc002 100644 --- a/.zshenv +++ b/.zshenv @@ -13,11 +13,13 @@ appendpath '/home/dholman/bin' appendpath '/home/dholman/.local/bin' appendpath '/home/dholman/.gem/ruby/2.7.0/bin' appendpath '/home/dholman/.rvm/bin' +export PATH="/usr/lib/distcc/bin:$PATH" export PATH +export DISTCC_HOSTS="192.168.1.26/24" export EDITOR="vim" export SUDO_EDITOR="vim" export SDL_VIDEO_MINIMIZE_ON_FOCUS_LOSS=0 -export GPGKEY=90D8F8E2C830F6129B2FBB1133836B30AA014B82 +export GPGKEY=87B76D64AF9090B9C527B4D44EE2AB8BAFCB5561 export GPG_TTY=$(tty) export SSH_AUTH_SOCK=${XDG_RUNTIME_DIR}/gnupg/S.gpg-agent.ssh unset SSH_AGENT_PID -- cgit v1.2.3