Merge remote-tracking branch 'origin/carbon'

7 files changed, 18 insertions, 3 deletions

diff --git a/.gdbinit b/.gdbinit
index b61f392..f8b971d 100644
--- a/.gdbinit
+++ b/.gdbinit
@@ -1,2 +1,3 @@
 set disassembly-flavor intel
-set listsize 25
+set print pretty on
+set prompt \ngdb>
diff --git a/.vimrc b/.vimrc
index 6d49624..c5634d7 100644
--- a/.vimrc
+++ b/.vimrc
@@ -96,7 +96,6 @@ let g:lightline.colorscheme = 'solarized'  " lightline theme to solarized
 " let g:lightline.colorscheme = 'jellybeans'  " lightline theme to onedark
 " }}}
 
-
 """"""""""""
 " mappings "
 """"""""""""
diff --git a/.xinitrc b/.xinitrc
new file mode 100644
index 0000000..c3213b0
--- /dev/null
+++ b/.xinitrc
@@ -0,0 +1,2 @@
+redshift -c /home/charles/.config/redshift.conf &
+exec xmonad
diff --git a/.zprofile b/.zprofile
new file mode 100755
index 0000000..de50afc
--- /dev/null
+++ b/.zprofile
@@ -0,0 +1,4 @@
+if [[ "$(tty)" = "/dev/tty1" ]]; then
+    startx
+    poweroff
+fi
diff --git a/.zsh_aliases b/.zsh_aliases
index cfded2f..4c4724f 100644
--- a/.zsh_aliases
+++ b/.zsh_aliases
@@ -6,6 +6,7 @@
 alias grep="grep --color=auto"
 alias tree="tree -C"
 alias pacman="pacman --color=auto"
+alias valgrind="colour-valgrind"
 
 # common commands
 alias less="less -N"   # enable line number
@@ -76,6 +77,10 @@ alias vimrc="vim $DOTFILES/.vimrc"
 alias vimplugrc="vim $DOTFILES/.pluggins.vim"
 alias xmonadrc="vim $DOTFILES/xmonad.hs"
 
+
+# other
+alias date="date -R"
+
 # parent directory jump
 alias ..='cd ..'
 alias ...='cd ../..'
diff --git a/install.sh b/install.sh
index 96d1496..ff71c27 100755
--- a/install.sh
+++ b/install.sh
@@ -35,6 +35,9 @@ create_dotfile_link_same .gitconfig
 [ ! -d $HOME/.config ] && mkdir $HOME/.config
 create_dotfile_link redshift.conf .config/redshift.conf
 
+ln -sf $DOTDIR/.xinitrc $HOME/.xinitrc
+ln -sf $DOTDIR/.zprofile $HOME/.zprofile
+
 ################
 # dependencies #
 ################
diff --git a/xmonad.hs b/xmonad.hs
index 72bda69..f409cc0 100644
--- a/xmonad.hs
+++ b/xmonad.hs
@@ -32,8 +32,8 @@ myLayouts = tiledBigMaster        -- bigger master for code and smaller slave fo
           tiledEven      = Tall 1 (3 / 100) (1 / 2)
 
 myStartupHook = do
-    spawnOnce "redshift -c /home/charles/.config/redshift.conf &"  -- start redshift
     spawnOnce "xinput disable 'ETPS/2 Elantech Touchpad' &"        -- disable touchpad
+    -- spawnOnce "redshift -c /home/charles/.config/redshift.conf &"  -- start redshift
 
 myManageHook = insertPosition End Newer  -- insert new window at the end of the current layout
 
@@ -42,4 +42,5 @@ myKeys = [ ("<XF86AudioRaiseVolume>",  spawn "pulseaudio-ctl up")    -- volume u
          , ("<XF86AudioMute>",         spawn "pulseaudio-ctl mute")  -- volume mute
          , ("<XF86MonBrightnessUp>",   spawn "xbacklight -inc 5")    -- backlight up
          , ("<XF86MonBrightnessDown>", spawn "xbacklight -dec 5")    -- backlight down
+         , ("<XF86ScreenSaver>",       spawn "slock")                -- lock screen
          ]