aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.rst21
-rw-r--r--X/.Xresources9
-rw-r--r--X/.xinitrc8
-rw-r--r--bash/.bashrc9
-rw-r--r--i3/.config/i3/config9
5 files changed, 37 insertions, 19 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 <https://www.github.com/tuckerevans/plugvim>`_
diff --git a/X/.Xresources b/X/.Xresources
index 96a1863..f8ae77d 100644
--- a/X/.Xresources
+++ b/X/.Xresources
@@ -1,9 +1,8 @@
-XTerm*faceName: 3270Medium Nerd Font
-UXTerm*faceName: 3270Medium Nerd Font
+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 6453f1e..1a634db 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -1,20 +1,13 @@
# .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 -laF'
-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 xcopy='xclip -selection clipboard'
alias xpaste='xclip -selection clipboard -o'
diff --git a/i3/.config/i3/config b/i3/.config/i3/config
index dae7dec..86f89dd 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 xterm
+ bindsym $mod+Return exec !TERMINAL
# kill focused window
bindsym $mod+Shift+q kill
@@ -188,8 +188,13 @@ bindsym XF86AudioPrev exec playerctl previous
exec --no-startup-id synclient NaturalScrolling=1 VertScrollDelta=-113
exec --no-startup-id /home/tje/i3-battery-popup -N
+<<<<<<< HEAD
+bindsym $mod+b exec !BROWSER
+bindsym $mod+p exec passmenu
+=======
bindsym $mod+b exec qutebrowser
bindsym $mod+p exec passmenu
for_window [class="mpv"] floating enable
for_window [class="feh"] floating enable
+>>>>>>> ursa_minor