From 4f3b29401c7ff6b42a84b9aca53877783212ec5d Mon Sep 17 00:00:00 2001 From: Tucker Evans Date: Tue, 20 Feb 2018 22:06:38 -0500 Subject: Made files templates for new systems. --- README.rst | 21 ++++++++++++++++++++- X/.Xresources | 8 ++++---- X/.xinitrc | 8 +++++--- bash/.bashrc | 10 ++-------- i3/.config/i3/config | 8 ++++---- 5 files changed, 35 insertions(+), 20 deletions(-) diff --git a/README.rst b/README.rst index 5ec3bd3..b45134e 100644 --- a/README.rst +++ b/README.rst @@ -4,7 +4,26 @@ Tucker's Dotfiles These dotfiles are here mostly to move them between my computers and as a backup, but feel free to use them yourself. -vim plugins +Branches +-------- + +I keep the master branch as templates for new systems. Each of my +computers then have their own branch, this is to account for different +font size and other necessary changes. Any changes that need to be +made i.e. font change, are changed to "!INPUT" in files for easy +search/repace. Example, Xresourses: +:: + XTerm*faceName: !FONT + UXTerm*faceName: !FONT + + XTerm*faceSize: !FONT_SIZE + UXTerm*faceSize: !FONT_SIZE + + XTerm*allowBoldFont: false + UXTerm*allowBoldFont: false + + +Vim Plugins ----------- I keep my vim plugins as submodules in this repo, I use `github.com/tuckerevans/plugVim `_ diff --git a/X/.Xresources b/X/.Xresources index 4c30093..f8ae77d 100644 --- a/X/.Xresources +++ b/X/.Xresources @@ -1,8 +1,8 @@ -XTerm*faceName: Terminus -UXTerm*faceName: Terminus +XTerm*faceName: !FONT +UXTerm*faceName: !FONT -XTerm*faceSize: 16 -UXTerm*faceSize: 16 +XTerm*faceSize: !FONT_SIZE +UXTerm*faceSize: !FONT_SIZE XTerm*allowBoldFont: false UXTerm*allowBoldFont: false diff --git a/X/.xinitrc b/X/.xinitrc index 448cc30..a0368a7 100644 --- a/X/.xinitrc +++ b/X/.xinitrc @@ -1,4 +1,6 @@ -feh --bg-fill /home/tje/Pictures/Wallpapers/Resistor.png -xrdb -merge /home/tje/.Xresources -start-pulseaudio-x11 & +#Basic startx file uncomment lines for more functionality + +#feh --bg-fill !PATH_TO_WALLPAPER +#xrdb -merge /home/tje/.Xresources +#start-pulseaudio-x11 & exec i3 diff --git a/bash/.bashrc b/bash/.bashrc index c5d7852..339a22e 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -1,20 +1,14 @@ # .bashrc set -o vi -source ~/.pass_completion +#source ~/.pass_completion # If not running interactively, don't do anything [[ $- != *i* ]] && return alias ls='ls --color=auto' alias ll='ls -la' -alias school='cd /home/tje/Documents/landmark' -alias embed='school && cd CS2771' -alias os='school && cd CS3871' -alias web='school && cd CSC2621' -alias mobile='school && cd CSC2636' -alias pol='school && cd POL1011' -alias art='school && cd HIS1031' +#alias school='cd !SCHOOL_FOLDER' alias xcopy='xclip -selection clipboard' alias xpaste='xclip -selection clipboard -o' diff --git a/i3/.config/i3/config b/i3/.config/i3/config index f18f5fc..01e0749 100644 --- a/i3/.config/i3/config +++ b/i3/.config/i3/config @@ -13,7 +13,7 @@ set $mod Mod1 # Font for window titles. Will also be used by the bar unless a different font # is used in the bar {} block below. -font pango:Courier Prime 14 +font pango: !FONT !FONT_SIZE # This font is widely installed, provides lots of unicode glyphs, right-to-left # text rendering and scalability on retina/hidpi displays (thanks to pango). @@ -30,7 +30,7 @@ font pango:Courier Prime 14 floating_modifier $mod # start a terminal - bindsym $mod+Return exec uxterm + bindsym $mod+Return exec !TERMINAL # kill focused window bindsym $mod+Shift+q kill @@ -187,5 +187,5 @@ bindsym XF86AudioPrev exec playerctl previous exec --no-startup-id synclient NaturalScrolling=1 VertScrollDelta=-113 exec --no-startup-id /home/tje/i3-battery-popup -N -bindsym $mod+b exec firefox - +bindsym $mod+b exec !BROWSER +bindsym $mod+p exec passmenu -- cgit v1.1 From c59acdaf21d22d4afd25faf9f6fb562864de0946 Mon Sep 17 00:00:00 2001 From: Tucker Evans Date: Sun, 11 Mar 2018 23:37:12 -0400 Subject: Adds .bash_profile --- bash/.bash_profile | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 bash/.bash_profile diff --git a/bash/.bash_profile b/bash/.bash_profile new file mode 100644 index 0000000..6d8c25b --- /dev/null +++ b/bash/.bash_profile @@ -0,0 +1,4 @@ +# .bash_profile + +# Get the aliases and functions +[ -f $HOME/.bashrc ] && . $HOME/.bashrc -- cgit v1.1 From 988c4a263efb8a40f758d61d9d6021fc3f92e9ae Mon Sep 17 00:00:00 2001 From: Tucker Evans Date: Mon, 12 Mar 2018 15:56:35 -0400 Subject: Changes fonts & minor changes for devon --- X/.Xresources | 8 ++++---- X/.screenSetup.sh | 2 ++ X/.xinitrc | 5 +++-- i3/.config/i3/config | 14 +++++++------- i3/.config/i3status/config | 2 -- 5 files changed, 16 insertions(+), 15 deletions(-) create mode 100755 X/.screenSetup.sh diff --git a/X/.Xresources b/X/.Xresources index f8ae77d..505bef0 100644 --- a/X/.Xresources +++ b/X/.Xresources @@ -1,8 +1,8 @@ -XTerm*faceName: !FONT -UXTerm*faceName: !FONT +XTerm*faceName: Dina +UXTerm*faceName: Dina -XTerm*faceSize: !FONT_SIZE -UXTerm*faceSize: !FONT_SIZE +XTerm*faceSize: 6 +UXTerm*faceSize: 6 XTerm*allowBoldFont: false UXTerm*allowBoldFont: false diff --git a/X/.screenSetup.sh b/X/.screenSetup.sh new file mode 100755 index 0000000..b089114 --- /dev/null +++ b/X/.screenSetup.sh @@ -0,0 +1,2 @@ +#!/bin/sh +xrandr --output DVI-I-1 --primary --mode 1920x1080 --pos 0x840 --rotate normal --output DP-1 --off --output HDMI-1 --mode 1920x1080 --pos 1920x0 --rotate right diff --git a/X/.xinitrc b/X/.xinitrc index a0368a7..8d1173f 100644 --- a/X/.xinitrc +++ b/X/.xinitrc @@ -1,6 +1,7 @@ #Basic startx file uncomment lines for more functionality #feh --bg-fill !PATH_TO_WALLPAPER -#xrdb -merge /home/tje/.Xresources -#start-pulseaudio-x11 & +xrdb -merge /home/tje/.Xresources +start-pulseaudio-x11 & +~/.screenSetup.sh exec i3 diff --git a/i3/.config/i3/config b/i3/.config/i3/config index 6af3601..9bb9a12 100644 --- a/i3/.config/i3/config +++ b/i3/.config/i3/config @@ -13,7 +13,7 @@ set $mod Mod1 # Font for window titles. Will also be used by the bar unless a different font # is used in the bar {} block below. -font pango: !FONT !FONT_SIZE +font pango: Courier 8 # This font is widely installed, provides lots of unicode glyphs, right-to-left # text rendering and scalability on retina/hidpi displays (thanks to pango). @@ -30,7 +30,7 @@ font pango: !FONT !FONT_SIZE floating_modifier $mod # start a terminal - bindsym $mod+Return exec !TERMINAL + bindsym $mod+Return exec uxterm # kill focused window bindsym $mod+Shift+q kill @@ -160,7 +160,7 @@ bindsym $mod+r mode "resize" bar { status_command i3status separator_symbol " | " - font pango: 3270Medium Nerd Font 14 + font pango: GohuFonmmmt 10 # colors { # background #414A59 # statusline #F5F6F7 @@ -168,9 +168,9 @@ bar { } # Pulse Audio controls -bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume 0 +5% #increase sound volume -bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume 0 -5% #decrease sound volume -bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute 0 toggle # mute sound +bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume 1 +5% #increase sound volume +bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume 1 -5% #decrease sound volume +bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute 1 toggle # mute sound # Sreen brightness controls bindsym XF86MonBrightnessUp exec xbacklight -inc 5 # increase screen brightness @@ -189,7 +189,7 @@ bindsym XF86AudioPrev exec playerctl previous exec --no-startup-id synclient NaturalScrolling=1 VertScrollDelta=-113 exec --no-startup-id /home/tje/i3-battery-popup -N -bindsym $mod+b exec !BROWSER +bindsym $mod+b exec firefox bindsym $mod+p exec passmenu for_window [class="mpv"] floating enable diff --git a/i3/.config/i3status/config b/i3/.config/i3status/config index b4f4c36..781c9bc 100644 --- a/i3/.config/i3status/config +++ b/i3/.config/i3status/config @@ -14,10 +14,8 @@ general { order += "ipv6" order += "disk /" -order += "wireless _first_" order += "ethernet _first_" order += "volume master" -order += "battery all" order += "load" order += "cpu_temperature 0" order += "tztime local" -- cgit v1.1 From b5e08c7f88afef0747e1e88dfc91e18ab3a32390 Mon Sep 17 00:00:00 2001 From: Tucker Evans Date: Sat, 21 Apr 2018 11:51:23 -0400 Subject: Fixes formatting error in README --- README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index b45134e..3d4962f 100644 --- a/README.rst +++ b/README.rst @@ -11,8 +11,8 @@ I keep the master branch as templates for new systems. Each of my computers then have their own branch, this is to account for different font size and other necessary changes. Any changes that need to be made i.e. font change, are changed to "!INPUT" in files for easy -search/repace. Example, Xresourses: -:: +search/repace. Example, Xresourses:: + XTerm*faceName: !FONT UXTerm*faceName: !FONT -- cgit v1.1 From 0bb0e49021e267713986240333d0cffe936f8dac Mon Sep 17 00:00:00 2001 From: Tucker Evans Date: Sun, 2 Sep 2018 15:53:41 -0400 Subject: Adds minor changes to devon configs --- X/.Xresources | 11 +++++++---- X/.screenSetup.sh | 2 +- i3/.config/i3/config | 1 + 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/X/.Xresources b/X/.Xresources index 505bef0..1c5429a 100644 --- a/X/.Xresources +++ b/X/.Xresources @@ -1,8 +1,8 @@ -XTerm*faceName: Dina -UXTerm*faceName: Dina +XTerm*faceName: Courier 10 Pitch +UXTerm*faceName: Courier 10 Pitch -XTerm*faceSize: 6 -UXTerm*faceSize: 6 +XTerm*faceSize: 10 +UXTerm*faceSize: 10 XTerm*allowBoldFont: false UXTerm*allowBoldFont: false @@ -11,6 +11,9 @@ UXTerm*boldMode: false XTerm*colorBDMode: true UXTerm*colorBDMode: true + +*VT100*translations: #override Shift : exec-formatted("firefox '%t'", PRIMARY) +XTerm*on3Clicks: regex ([[:alpha:]]+://)?([[:alnum:]!#+,./=?@_~-]|(%[[:xdigit:]][[:xdigit:]]))+ !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !!!!!!! COLORS (serious business) !!!!!!! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! diff --git a/X/.screenSetup.sh b/X/.screenSetup.sh index b089114..0c65708 100755 --- a/X/.screenSetup.sh +++ b/X/.screenSetup.sh @@ -1,2 +1,2 @@ #!/bin/sh -xrandr --output DVI-I-1 --primary --mode 1920x1080 --pos 0x840 --rotate normal --output DP-1 --off --output HDMI-1 --mode 1920x1080 --pos 1920x0 --rotate right +xrandr --output DVI-I-1 --primary --mode 1920x1080 --pos 0x840 --rotate normal --output DP-1 --off --output HDMI-0 --mode 1920x1080 --pos 1920x0 --rotate right diff --git a/i3/.config/i3/config b/i3/.config/i3/config index 9bb9a12..f849312 100644 --- a/i3/.config/i3/config +++ b/i3/.config/i3/config @@ -188,6 +188,7 @@ bindsym XF86AudioPrev exec playerctl previous exec --no-startup-id synclient NaturalScrolling=1 VertScrollDelta=-113 exec --no-startup-id /home/tje/i3-battery-popup -N +exec /home/tje/.screenSetup.sh bindsym $mod+b exec firefox bindsym $mod+p exec passmenu -- cgit v1.1 From cae1e1a50a4e9a0a43e797a348660596d2a12f28 Mon Sep 17 00:00:00 2001 From: Tucker Evans Date: Sun, 2 Sep 2018 21:18:14 -0400 Subject: Updates vim plugins --- vim/.vim/.netrwhist | 3 +++ vim/.vim/pack/tje/opt/nerdtree | 2 +- vim/.vim/pack/tje/start/vim-gitgutter | 2 +- vim/.vim/pack/tje/start/vim-go | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 vim/.vim/.netrwhist diff --git a/vim/.vim/.netrwhist b/vim/.vim/.netrwhist new file mode 100644 index 0000000..453c056 --- /dev/null +++ b/vim/.vim/.netrwhist @@ -0,0 +1,3 @@ +let g:netrw_dirhistmax =10 +let g:netrw_dirhist_cnt =1 +let g:netrw_dirhist_1='/home/tje/.ssh' diff --git a/vim/.vim/pack/tje/opt/nerdtree b/vim/.vim/pack/tje/opt/nerdtree index 3595304..808f5b2 160000 --- a/vim/.vim/pack/tje/opt/nerdtree +++ b/vim/.vim/pack/tje/opt/nerdtree @@ -1 +1 @@ -Subproject commit 35953042fbf5535a7e905b52a6973c3f7f8a5536 +Subproject commit 808f5b225b090bb4a94a2c47bb08d1bc1f7f8a4e diff --git a/vim/.vim/pack/tje/start/vim-gitgutter b/vim/.vim/pack/tje/start/vim-gitgutter index a7206c4..50a7062 160000 --- a/vim/.vim/pack/tje/start/vim-gitgutter +++ b/vim/.vim/pack/tje/start/vim-gitgutter @@ -1 +1 @@ -Subproject commit a7206c41fc174f576b3f7085d48319dbdad760a5 +Subproject commit 50a7062909d91a290fae04219887b1b45f3138db diff --git a/vim/.vim/pack/tje/start/vim-go b/vim/.vim/pack/tje/start/vim-go index 4d7dbea..aee811a 160000 --- a/vim/.vim/pack/tje/start/vim-go +++ b/vim/.vim/pack/tje/start/vim-go @@ -1 +1 @@ -Subproject commit 4d7dbea42fa58e99c48e3dfabdb5afdeadd3d346 +Subproject commit aee811af627aea8022530213236e985281a59431 -- cgit v1.1 From df2dcc9a5df4f5cc2d0891737affb21496ca01d7 Mon Sep 17 00:00:00 2001 From: Tucker Evans Date: Sun, 2 Sep 2018 21:18:55 -0400 Subject: Updates git-prompt --- bash/.git-prompt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bash/.git-prompt b/bash/.git-prompt index 19c8def..9c07945 160000 --- a/bash/.git-prompt +++ b/bash/.git-prompt @@ -1 +1 @@ -Subproject commit 19c8def6a90d72f2a99d781752271126b1b9ff66 +Subproject commit 9c07945385121e1e4d09074da04d1b5c04722a35 -- cgit v1.1 From 6f19fd6b4b1dd9ac86c8d80f1233e3f25006cef0 Mon Sep 17 00:00:00 2001 From: Tucker Evans Date: Wed, 3 Oct 2018 13:33:47 -0400 Subject: Updates vim plugins --- vim/.vim/pack/tje/opt/nerdtree | 2 +- vim/.vim/pack/tje/start/vim-go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vim/.vim/pack/tje/opt/nerdtree b/vim/.vim/pack/tje/opt/nerdtree index 808f5b2..599238a 160000 --- a/vim/.vim/pack/tje/opt/nerdtree +++ b/vim/.vim/pack/tje/opt/nerdtree @@ -1 +1 @@ -Subproject commit 808f5b225b090bb4a94a2c47bb08d1bc1f7f8a4e +Subproject commit 599238ad99642e8767c4be6adda75bd84afdfd42 diff --git a/vim/.vim/pack/tje/start/vim-go b/vim/.vim/pack/tje/start/vim-go index aee811a..3d8e82e 160000 --- a/vim/.vim/pack/tje/start/vim-go +++ b/vim/.vim/pack/tje/start/vim-go @@ -1 +1 @@ -Subproject commit aee811af627aea8022530213236e985281a59431 +Subproject commit 3d8e82ecb4f66a151f3c1bff84728fa4e3db0ca9 -- cgit v1.1 From a44145a27b7708e18daf8f261a7d4fbac7f1993b Mon Sep 17 00:00:00 2001 From: Tucker Evans Date: Wed, 3 Oct 2018 13:34:25 -0400 Subject: Changes terminal font --- X/.Xresources | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/X/.Xresources b/X/.Xresources index 1c5429a..e13b021 100644 --- a/X/.Xresources +++ b/X/.Xresources @@ -1,5 +1,5 @@ -XTerm*faceName: Courier 10 Pitch -UXTerm*faceName: Courier 10 Pitch +XTerm*faceName: Terminus +UXTerm*faceName: Terminus XTerm*faceSize: 10 UXTerm*faceSize: 10 -- cgit v1.1 From 67968363708f82d471f49f119a4713c944173ff8 Mon Sep 17 00:00:00 2001 From: Tucker Evans Date: Wed, 3 Oct 2018 13:37:17 -0400 Subject: Moves ftplugins to after file for vim --- bash/.bashrc | 2 ++ vim/.vim/after/ftplugin/asm.vim | 0 vim/.vim/after/ftplugin/by.vim | 2 ++ vim/.vim/after/ftplugin/c.vim | 3 +++ vim/.vim/after/ftplugin/conf.vim | 2 ++ vim/.vim/after/ftplugin/go.vim | 2 ++ vim/.vim/after/ftplugin/haskell.vim | 6 ++++++ vim/.vim/after/ftplugin/java.vim | 2 ++ vim/.vim/after/ftplugin/mail.vim | 3 +++ vim/.vim/after/ftplugin/nroff.vim | 2 ++ vim/.vim/after/ftplugin/python.vim | 7 +++++++ vim/.vim/after/ftplugin/rst.vim | 6 ++++++ vim/.vim/after/ftplugin/tex.vim | 1 + vim/.vim/after/ftplugin/tr.vim | 2 ++ vim/.vim/after/ftplugin/tree.vim | 13 +++++++++++++ vim/.vim/after/ftplugin/txt.vim | 2 ++ vim/.vim/ftplugin/asm.vim | 0 vim/.vim/ftplugin/by.vim | 2 -- vim/.vim/ftplugin/c.vim | 3 --- vim/.vim/ftplugin/conf.vim | 2 -- vim/.vim/ftplugin/go.vim | 2 -- vim/.vim/ftplugin/java.vim | 2 -- vim/.vim/ftplugin/mail.vim | 3 --- vim/.vim/ftplugin/python.vim | 7 ------- vim/.vim/ftplugin/tex.vim | 1 - vim/.vim/ftplugin/tr.vim | 1 - vim/.vim/ftplugin/tree.vim | 13 ------------- vim/.vim/ftplugin/txt.vim | 2 -- 28 files changed, 55 insertions(+), 38 deletions(-) create mode 100644 vim/.vim/after/ftplugin/asm.vim create mode 100644 vim/.vim/after/ftplugin/by.vim create mode 100644 vim/.vim/after/ftplugin/c.vim create mode 100644 vim/.vim/after/ftplugin/conf.vim create mode 100644 vim/.vim/after/ftplugin/go.vim create mode 100644 vim/.vim/after/ftplugin/haskell.vim create mode 100644 vim/.vim/after/ftplugin/java.vim create mode 100644 vim/.vim/after/ftplugin/mail.vim create mode 100644 vim/.vim/after/ftplugin/nroff.vim create mode 100644 vim/.vim/after/ftplugin/python.vim create mode 100644 vim/.vim/after/ftplugin/rst.vim create mode 100644 vim/.vim/after/ftplugin/tex.vim create mode 100644 vim/.vim/after/ftplugin/tr.vim create mode 100644 vim/.vim/after/ftplugin/tree.vim create mode 100644 vim/.vim/after/ftplugin/txt.vim delete mode 100644 vim/.vim/ftplugin/asm.vim delete mode 100644 vim/.vim/ftplugin/by.vim delete mode 100644 vim/.vim/ftplugin/c.vim delete mode 100644 vim/.vim/ftplugin/conf.vim delete mode 100644 vim/.vim/ftplugin/go.vim delete mode 100644 vim/.vim/ftplugin/java.vim delete mode 100644 vim/.vim/ftplugin/mail.vim delete mode 100644 vim/.vim/ftplugin/python.vim delete mode 100644 vim/.vim/ftplugin/tex.vim delete mode 100644 vim/.vim/ftplugin/tr.vim delete mode 100644 vim/.vim/ftplugin/tree.vim delete mode 100644 vim/.vim/ftplugin/txt.vim diff --git a/bash/.bashrc b/bash/.bashrc index 391bc5e..f1463cc 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -1,6 +1,8 @@ # .bashrc set -o vi +PATH=~/bin:$PATH + source ~/.pass_completion HISTSIZE=1000 HISTFILESIZE=8000 diff --git a/vim/.vim/after/ftplugin/asm.vim b/vim/.vim/after/ftplugin/asm.vim new file mode 100644 index 0000000..e69de29 diff --git a/vim/.vim/after/ftplugin/by.vim b/vim/.vim/after/ftplugin/by.vim new file mode 100644 index 0000000..7f2b61c --- /dev/null +++ b/vim/.vim/after/ftplugin/by.vim @@ -0,0 +1,2 @@ +set nospell +set tw=0 diff --git a/vim/.vim/after/ftplugin/c.vim b/vim/.vim/after/ftplugin/c.vim new file mode 100644 index 0000000..a445f6f --- /dev/null +++ b/vim/.vim/after/ftplugin/c.vim @@ -0,0 +1,3 @@ +set tw=0 +set cindent +set nospell diff --git a/vim/.vim/after/ftplugin/conf.vim b/vim/.vim/after/ftplugin/conf.vim new file mode 100644 index 0000000..7f2b61c --- /dev/null +++ b/vim/.vim/after/ftplugin/conf.vim @@ -0,0 +1,2 @@ +set nospell +set tw=0 diff --git a/vim/.vim/after/ftplugin/go.vim b/vim/.vim/after/ftplugin/go.vim new file mode 100644 index 0000000..736e482 --- /dev/null +++ b/vim/.vim/after/ftplugin/go.vim @@ -0,0 +1,2 @@ +set tw=0 +set cindent diff --git a/vim/.vim/after/ftplugin/haskell.vim b/vim/.vim/after/ftplugin/haskell.vim new file mode 100644 index 0000000..109cd5b --- /dev/null +++ b/vim/.vim/after/ftplugin/haskell.vim @@ -0,0 +1,6 @@ +" Tab specific option +set tabstop=8 "A tab is 8 spaces +set expandtab "Always uses spaces instead of tabs +set softtabstop=4 "Insert 4 spaces when tab is pressed +set shiftwidth=4 "An indent is 4 spaces +set shiftround "Round indent to nearest shiftwidth multiple diff --git a/vim/.vim/after/ftplugin/java.vim b/vim/.vim/after/ftplugin/java.vim new file mode 100644 index 0000000..736e482 --- /dev/null +++ b/vim/.vim/after/ftplugin/java.vim @@ -0,0 +1,2 @@ +set tw=0 +set cindent diff --git a/vim/.vim/after/ftplugin/mail.vim b/vim/.vim/after/ftplugin/mail.vim new file mode 100644 index 0000000..c6e2b8a --- /dev/null +++ b/vim/.vim/after/ftplugin/mail.vim @@ -0,0 +1,3 @@ +set softtabstop=4 +set shiftwidth=4 +set expandtab diff --git a/vim/.vim/after/ftplugin/nroff.vim b/vim/.vim/after/ftplugin/nroff.vim new file mode 100644 index 0000000..031c8d9 --- /dev/null +++ b/vim/.vim/after/ftplugin/nroff.vim @@ -0,0 +1,2 @@ +set spell +autocmd BufWritePost * silent! !grap % | pic | tbl | eqn | troff -ms | grops > %:r.ps diff --git a/vim/.vim/after/ftplugin/python.vim b/vim/.vim/after/ftplugin/python.vim new file mode 100644 index 0000000..643e63d --- /dev/null +++ b/vim/.vim/after/ftplugin/python.vim @@ -0,0 +1,7 @@ +set nospell +set tw=0 +set tabstop=8 +set softtabstop=8 +set shiftwidth=8 +set noexpandtab + diff --git a/vim/.vim/after/ftplugin/rst.vim b/vim/.vim/after/ftplugin/rst.vim new file mode 100644 index 0000000..c5fc1a9 --- /dev/null +++ b/vim/.vim/after/ftplugin/rst.vim @@ -0,0 +1,6 @@ +" Tab specific option +set tabstop=4 "A tab is 8 spaces +set expandtab "Always uses spaces instead of tabs +set softtabstop=4 "Insert 4 spaces when tab is pressed +set shiftwidth=4 "An indent is 4 spaces +set shiftround "Round indent to nearest shiftwidth multiple diff --git a/vim/.vim/after/ftplugin/tex.vim b/vim/.vim/after/ftplugin/tex.vim new file mode 100644 index 0000000..87f4512 --- /dev/null +++ b/vim/.vim/after/ftplugin/tex.vim @@ -0,0 +1 @@ +set spell diff --git a/vim/.vim/after/ftplugin/tr.vim b/vim/.vim/after/ftplugin/tr.vim new file mode 100644 index 0000000..3098f3d --- /dev/null +++ b/vim/.vim/after/ftplugin/tr.vim @@ -0,0 +1,2 @@ +set spell +autocmd BufWritePost * !pic % | tbl | eqn | troff -ms | grops > %:r.ps diff --git a/vim/.vim/after/ftplugin/tree.vim b/vim/.vim/after/ftplugin/tree.vim new file mode 100644 index 0000000..073abf6 --- /dev/null +++ b/vim/.vim/after/ftplugin/tree.vim @@ -0,0 +1,13 @@ +set tw=0 +set nolist +set nospell + +map pp a, 01 +map PP a, 09 +map tt a, 06 +map bb a, 07 +map ss a, 03 +map SS a, 04 +map nn a, 05 +map vv a, 02 +map cc a, Cull diff --git a/vim/.vim/after/ftplugin/txt.vim b/vim/.vim/after/ftplugin/txt.vim new file mode 100644 index 0000000..7dcafeb --- /dev/null +++ b/vim/.vim/after/ftplugin/txt.vim @@ -0,0 +1,2 @@ +set spell +set tw=70 diff --git a/vim/.vim/ftplugin/asm.vim b/vim/.vim/ftplugin/asm.vim deleted file mode 100644 index e69de29..0000000 diff --git a/vim/.vim/ftplugin/by.vim b/vim/.vim/ftplugin/by.vim deleted file mode 100644 index 7f2b61c..0000000 --- a/vim/.vim/ftplugin/by.vim +++ /dev/null @@ -1,2 +0,0 @@ -set nospell -set tw=0 diff --git a/vim/.vim/ftplugin/c.vim b/vim/.vim/ftplugin/c.vim deleted file mode 100644 index a445f6f..0000000 --- a/vim/.vim/ftplugin/c.vim +++ /dev/null @@ -1,3 +0,0 @@ -set tw=0 -set cindent -set nospell diff --git a/vim/.vim/ftplugin/conf.vim b/vim/.vim/ftplugin/conf.vim deleted file mode 100644 index 7f2b61c..0000000 --- a/vim/.vim/ftplugin/conf.vim +++ /dev/null @@ -1,2 +0,0 @@ -set nospell -set tw=0 diff --git a/vim/.vim/ftplugin/go.vim b/vim/.vim/ftplugin/go.vim deleted file mode 100644 index 736e482..0000000 --- a/vim/.vim/ftplugin/go.vim +++ /dev/null @@ -1,2 +0,0 @@ -set tw=0 -set cindent diff --git a/vim/.vim/ftplugin/java.vim b/vim/.vim/ftplugin/java.vim deleted file mode 100644 index 736e482..0000000 --- a/vim/.vim/ftplugin/java.vim +++ /dev/null @@ -1,2 +0,0 @@ -set tw=0 -set cindent diff --git a/vim/.vim/ftplugin/mail.vim b/vim/.vim/ftplugin/mail.vim deleted file mode 100644 index c6e2b8a..0000000 --- a/vim/.vim/ftplugin/mail.vim +++ /dev/null @@ -1,3 +0,0 @@ -set softtabstop=4 -set shiftwidth=4 -set expandtab diff --git a/vim/.vim/ftplugin/python.vim b/vim/.vim/ftplugin/python.vim deleted file mode 100644 index 643e63d..0000000 --- a/vim/.vim/ftplugin/python.vim +++ /dev/null @@ -1,7 +0,0 @@ -set nospell -set tw=0 -set tabstop=8 -set softtabstop=8 -set shiftwidth=8 -set noexpandtab - diff --git a/vim/.vim/ftplugin/tex.vim b/vim/.vim/ftplugin/tex.vim deleted file mode 100644 index 87f4512..0000000 --- a/vim/.vim/ftplugin/tex.vim +++ /dev/null @@ -1 +0,0 @@ -set spell diff --git a/vim/.vim/ftplugin/tr.vim b/vim/.vim/ftplugin/tr.vim deleted file mode 100644 index 87f4512..0000000 --- a/vim/.vim/ftplugin/tr.vim +++ /dev/null @@ -1 +0,0 @@ -set spell diff --git a/vim/.vim/ftplugin/tree.vim b/vim/.vim/ftplugin/tree.vim deleted file mode 100644 index 073abf6..0000000 --- a/vim/.vim/ftplugin/tree.vim +++ /dev/null @@ -1,13 +0,0 @@ -set tw=0 -set nolist -set nospell - -map pp a, 01 -map PP a, 09 -map tt a, 06 -map bb a, 07 -map ss a, 03 -map SS a, 04 -map nn a, 05 -map vv a, 02 -map cc a, Cull diff --git a/vim/.vim/ftplugin/txt.vim b/vim/.vim/ftplugin/txt.vim deleted file mode 100644 index 7dcafeb..0000000 --- a/vim/.vim/ftplugin/txt.vim +++ /dev/null @@ -1,2 +0,0 @@ -set spell -set tw=70 -- cgit v1.1 From fe98c4a33562815593838eebb780a94446a1c38f Mon Sep 17 00:00:00 2001 From: Tucker Evans Date: Wed, 3 Oct 2018 13:38:06 -0400 Subject: Adds tje@tuckerevans.com email account --- mbsync/.mbsyncrc | 50 ++++++++++++++++++++++++++++++++++++++++++++++ msmtp/.msmtprc | 9 +++++++++ mutt/.mutt/tuckerevans.com | 11 ++++++++++ mutt/.muttrc | 6 ++++-- 4 files changed, 74 insertions(+), 2 deletions(-) create mode 100644 mutt/.mutt/tuckerevans.com diff --git a/mbsync/.mbsyncrc b/mbsync/.mbsyncrc index 09c0a01..2cde563 100644 --- a/mbsync/.mbsyncrc +++ b/mbsync/.mbsyncrc @@ -176,3 +176,53 @@ SyncState * Group clarkson Channel clarkson-default Channel clarkson-sent + +################### +# tuckerevans.com # +################### + +IMAPAccount tuckerevans +Host banshee.mxlogin.com +User tje@tuckerevans.com +PassCmd "pass show email/tuckerevans.com" +SSLType IMAPS +Port 993 +CertificateFile /etc/ssl/certs/ca-certificates.crt + +IMAPStore tuckerevans-remote +Account tuckerevans + +MaildirStore tuckerevans-local +Path ~/Mail/tuckerevans/ +Inbox ~/Mail/tuckerevans/inbox + +Channel tuckerevans-default +Master :tuckerevans-remote: +Slave :tuckerevans-local:inbox + +Channel tuckerevans-sent +Master :tuckerevans-remote:"Sent" +Slave :tuckerevans-local:sent + +#Channel tuckerevans-trash +#Master :tuckerevans-remote:"Trash" +#Slave :tuckerevans-local:trash + +#Channel tuckerevans-archive +#Master :tuckerevans-remote:"Archives" +#Slave :tuckerevans-local:all + +#Channel tuckerevans-junk +#Master :tuckerevans-remote:"spam" +#Slave :tuckerevans-local:junk + +Create Both +Expunge Both +SyncState * + +Group tuckerevans +Channel tuckerevans-default +#Channel tuckerevans-trash +#Channel tuckerevans-archive +Channel tuckerevans-sent +#Channel tuckerevans-junk diff --git a/msmtp/.msmtprc b/msmtp/.msmtprc index 4da69b0..6813c12 100644 --- a/msmtp/.msmtprc +++ b/msmtp/.msmtprc @@ -42,3 +42,12 @@ tls on tls_starttls on user "evanst@clarkson.edu" passwordeval "pass show clarkson/app-passwords/msmtp" + +account tuckerevans +host banshee.mxlogin.com +from "tje@tuckerevans.com" +port 465 +tls on +tls_starttls off +user "tje@tuckerevans.com" +passwordeval "pass show email/tuckerevans.com" diff --git a/mutt/.mutt/tuckerevans.com b/mutt/.mutt/tuckerevans.com new file mode 100644 index 0000000..5a6c965 --- /dev/null +++ b/mutt/.mutt/tuckerevans.com @@ -0,0 +1,11 @@ +set from="Tucker Evans " +set hostname="tuckerevans.com" +set folder="~/Mail/tuckerevans" +set mbox="~/Mail/tuckerevans" +set record="~/Mail/tuckerevans/sent" +set postponed="~/Mail/tuckerevans/drafts" +set spoolfile="~/Mail/tuckerevans/inbox" + +set sendmail="/usr/bin/msmtp -a tuckerevans" + +color status black cyan diff --git a/mutt/.muttrc b/mutt/.muttrc index 11f52b0..4646224 100644 --- a/mutt/.muttrc +++ b/mutt/.muttrc @@ -48,10 +48,12 @@ folder-hook '~/Mail/gmail.com' 'source ~/.mutt/gmail.com' folder-hook '~/Mail/ohmnii.com/inbox' 'source ~/mutt/ohmnii.com' folder-hook '~/Mail/landmark.edu' 'source ~/mutt/landmark.edu' folder-hook '~/Mail/clarkson.edu' 'source ~/mutt/clarkson.edu +folder-hook '~/Mail/tuckerevans.com/inbox' 'source ~/mutt/tuckerevans.com' -macro index '~/Mail/gmail/inboxsource ~/.mutt/gmail.com' -macro index '~/Mail/ohmnii/inboxsource ~/.mutt/ohmnii.com' +macro index '~/Mail/gmail/inboxsource ~/.mutt/gmail.com' +macro index '~/Mail/ohmnii/inboxsource ~/.mutt/ohmnii.com' +macro index '~/Mail/tuckerevans/inboxsource ~/.mutt/tuckerevans.com' macro index '~/Mail/clarkson/inboxsource ~/.mutt/clarkson.edu' macro index '~/Mail/landmark/inboxsource ~/.mutt/landmark.edu' -- cgit v1.1 From 15af8ec917a361fd6f16865859286b4dc066c8e2 Mon Sep 17 00:00:00 2001 From: Tucker Evans Date: Wed, 3 Oct 2018 13:41:30 -0400 Subject: Removes vim .netrwhist and adds it to .gitignore --- .gitignore | 1 + vim/.vim/.netrwhist | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) create mode 100644 .gitignore delete mode 100644 vim/.vim/.netrwhist diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5d9095b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +vim/.vim/.netrwhist diff --git a/vim/.vim/.netrwhist b/vim/.vim/.netrwhist deleted file mode 100644 index 453c056..0000000 --- a/vim/.vim/.netrwhist +++ /dev/null @@ -1,3 +0,0 @@ -let g:netrw_dirhistmax =10 -let g:netrw_dirhist_cnt =1 -let g:netrw_dirhist_1='/home/tje/.ssh' -- cgit v1.1