Commits

aef  committed bd4fe37 Merge

Committing merge

  • Participants
  • Parent commits e9eec70, 6c8ad74

Comments (0)

Files changed (4)

 
 alias single='xrandr --output VGA1 --mode 1920x1080 --output --off'
 alias double='xrandr --output LVDS2 --mode 1600x900 --pos 0x0 --output VGA2 --mode 1920x1080 --right-of LVDS2'
-alias double1='xrandr --output LVDS1 --mode 1600x900 --pos 0x0 --output VGA1 --mode 1920x1080 --right-of LVDS1'
+alias double1='xrandr --output LVDS1 --mode 1366x768 --pos 0x0 --output VGA1 --mode 1920x1080 --right-of LVDS1'
+
+alias work='ssh -o TCPKeepAlive=yes -i /home/adrian/.ssh/yoke_workling_cluster.pem ubuntu@23.20.58.143'
+
 
 #CONSOLE
 
 
 PS1="\[$BLACK\][\[$PINK\]\u\[$BLACK\]@\[$PINK\]\h\[$BLACK\]]\[$CYAN\] \w \[$RED\]\$ \[$CLEAR\]"
 LSCOLORS="exfxcxdxbxegedabagacad"
+PATH=$PATH:/home/adrian/Dev/play-2.0
+[user]
+	name = Adrian Fraiha
+	email = aef@catch-colt.com
+[merge]
+	tool = vimdiff
+[diff]
+	tool = vimdiff
 bindcode Mod1+46 focus parent; focus up
 bindcode Mod1+47 focus parent; focus right
 # (alternatively, you can use the cursor keys:)
-bindsym Mod1+Left focus parent; focus left
-bindsym Mod1+Down focus parent; focus down
-bindsym Mod1+Up focus parent; focus up
-bindsym Mod1+Right focus parent; focus right
+#bindsym Mod1+Left focus parent; focus left
+#bindsym Mod1+Down focus parent; focus down
+#bindsym Mod1+Up focus parent; focus up
+#bindsym Mod1+Right focus parent; focus right
 
 # Snap (Mod1+Control+j/k/l/;)
 bindcode Mod4+Control+44 layout stacking
 installScript $PWD/Xdefaults ~/.Xdefaults
 installScript $PWD/ctags ~/.ctags
 installScript $PWD/hgrc ~/.hgrc
-
+installScript $PWD/gitconfig ~/.gitconfig