Fixed a few comments in emacs and amixer pulse integration.

.emacs.d/init.el

@@ -74,8 +74,8 @@ If point was already at that position, move point to beginning of line."
 (use-package color-theme
   :init
   ;; TODO: Fixes error about missing directory.  Don't know why.
-  (unless (file-exists-p "~/.emacs.d/elpa/color-theme-20070910.1007/themes")
-    (make-directory "~/.emacs.d/elpa/color-theme-20070910.1007/themes"))
+  ;(unless (file-exists-p "~/.emacs.d/elpa/color-theme-20070910.1007/themes")
+  ;  (make-directory "~/.emacs.d/elpa/color-theme-20070910.1007/themes"))
   :config
   (color-theme-initialize)
   (load-theme 'Thomas-Experiement t))
@@ -177,7 +177,7 @@ If point was already at that position, move point to beginning of line."
 ;; ;  :mode ("\\.c\\'" "\\.h\\'")
 
 ;; ------------ Web Mode ------------
-;; TODO: Automatic closing tab would be nice
+;; TODO: Automatic closing tag would be nice
 (defun my-sgml-insert-gt ()
   "Inserts a `>' character and calls 
 `my-sgml-close-tag-if-necessary', leaving point where it is."
@@ -207,6 +207,8 @@ an opening tag that is not followed by a matching closing tag."
     '(define-key sgml-mode-map ">" 'my-sgml-insert-gt)))
 
 ;; ------------ Git Mode ------------
+;; TODO: make resolving merge conflicts hotkeys not use "^"
+;; TODO: Conflict resolution theme is unreadable
 (when (version<= "24.4" emacs-version)
   (use-package magit
     :bind ("C-x g" . magit-status)))
@@ -302,18 +304,3 @@ an opening tag that is not followed by a matching closing tag."
              lpr-region)
   :config
   (pr-update-menus t))
-
-(custom-set-variables
- ;; custom-set-variables was added by Custom.
- ;; If you edit it by hand, you could mess it up, so be careful.
- ;; Your init file should contain only one such instance.
- ;; If there is more than one, they won't work right.
- '(custom-safe-themes
-   (quote
-    ("102c7a106e03ec19e9a31562bc611632fbb4b7f1ca09aca0d2da77e57cb510b0" "eef1aa0f203162ff23ca375cae72922bddff2451d979d9370e79b4357000529d" default))))
-(custom-set-faces
- ;; custom-set-faces was added by Custom.
- ;; If you edit it by hand, you could mess it up, so be careful.
- ;; Your init file should contain only one such instance.
- ;; If there is more than one, they won't work right.
- )

.i3/01_workspaces.config

@@ -1,6 +1,7 @@
 ### 01 Workspace
 
 ##Begin Workspace-Monitor-Associations
+workspace 100			output eDP-1
 workspace 1			output $Mon1
 workspace 2			output $Mon2
 workspace 3			output $Mon1

.i3/04_bindings.config

@@ -19,10 +19,10 @@ bindsym XF86AudioNext			exec "mpc next"
 bindsym Shift+XF86AudioPrev		exec "mpc seek -00:01"
 bindsym Shift+XF86AudioNext		exec "mpc seek +00:01"
 bindsym XF86AudioStop			exec "mpc stop"
-bindsym XF86AudioLowerVolume		exec "amixer sset Master 5%-"
-bindsym XF86AudioRaiseVolume		exec "amixer sset Master 5%+"
-bindsym Shift+XF86AudioLowerVolume	exec "amixer sset Master 2%-"
-bindsym Shift+XF86AudioRaiseVolume	exec "amixer sset Master 2%+"
+bindsym XF86AudioLowerVolume		exec "amixer -D pulse sset Master 5%-"
+bindsym XF86AudioRaiseVolume		exec "amixer -D pulse sset Master 5%+"
+bindsym Shift+XF86AudioLowerVolume	exec "amixer -D pulse sset Master 2%-"
+bindsym Shift+XF86AudioRaiseVolume	exec "amixer -D pulse sset Master 2%+"
 bindsym $alt+Shift+XF86AudioLowerVolume	exec "mpc volume -2"
 bindsym $alt+Shift+XF86AudioRaiseVolume	exec "mpc volume +2"
 bindsym $alt+XF86AudioLowerVolume	exec "mpc volume -5"