From 541556461a54ee4373b1527124d85a7bb79e8f11 Mon Sep 17 00:00:00 2001
From: Marcel Kapfer <marcelmichaelkapfer@gmail.com>
Date: Fri, 21 Jul 2017 10:13:45 +0200
Subject: [PATCH] merge

---
 emacs/emacs.el          |  8 ++++++--
 shells/fish/config.fish |  2 +-
 stumpwm/stumpwmrc       | 19 +++++++++++++++----
 x/xinitrc               |  8 ++++++--
 4 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/emacs/emacs.el b/emacs/emacs.el
index 97adaa8..c3765c9 100644
--- a/emacs/emacs.el
+++ b/emacs/emacs.el
@@ -74,7 +74,7 @@
  '(org-agenda-files (quote ("~/ownCloud/todo.org")))
  '(package-selected-packages
    (quote
-    (prolog web-mode fixme-mode ob-dart ac-python ac-slime ant auctex-lua auto-compile csv-mode csv ac-haskell-process ghc haskell-mode arduino-mode json-mode gruvbox-theme focus literate-coffee-mode jdee pkgbuild-mode vala-snippets vala-mode phpunit ac-php php-completion php+-mode fish-mode hugo mips-mode stumpwm-mode slime muttrc-mode diff-hl magit wanderlust ## auctex yaml-mode typescript sass-mode php-mode monokai-theme markdown-mode fill-column-indicator edit-server dracula-theme coffee-mode auto-complete atom-one-dark-theme atom-dark-theme)))
+    (fic-mode markdown-preview-mode web-mode ob-dart ac-python ac-slime ant auctex-lua auto-compile auto-complete-auctex csv-mode csv ac-haskell-process ghc haskell-mode arduino-mode json-mode gruvbox-theme focus literate-coffee-mode jdee javadoc-lookup pkgbuild-mode vala-snippets vala-mode phpunit ac-php php-completion php+-mode fish-mode hugo mips-mode stumpwm-mode slime muttrc-mode diff-hl magit wanderlust ## auctex yaml-mode typescript sass-mode php-mode outlined-elisp-mode monokai-theme markdown-mode fill-column-indicator edit-server dracula-theme coffee-mode auto-complete atom-one-dark-theme atom-dark-theme)))
  '(safe-local-variable-values (quote ((TeX-Engine . luatex))))
  '(send-mail-function (quote smtpmail-send-it))
  '(standard-indent 2)
@@ -88,7 +88,8 @@
  ;; 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.
- '(default ((t (:family "Hermit" :foundry "unknown" :slant normal :weight normal :height 90 :width normal)))))
+ '(default ((t (:family "Hermit" :foundry "unknown" :slant normal :weight normal :height 90 :width normal))))
+ '(cursor ((t (:background "light gray")))))
 
 
 ;; edit-server
@@ -217,3 +218,6 @@
 ;;; syntax highlighting
 
 (setq org-src-fontify-natively t)
+
+;; WIP: set cursor coloer
+(set-cursor-color "#ebdbb2")
diff --git a/shells/fish/config.fish b/shells/fish/config.fish
index cf0a386..ca1bd48 100644
--- a/shells/fish/config.fish
+++ b/shells/fish/config.fish
@@ -1,7 +1,7 @@
 set -x PATH $PATH /usr/local/bin /usr/bin /bin /usr/local/games /usr/games ~/.pub-cache/bin ~/.gem/ruby/2.4.0/bin
 
 set -x ARCHFLAGS -arch_x86_64
-set -Ux GPG_TTY (tty)
+set -x GPG_TTY (tty)
 
 eval (thefuck --alias | tr '\n' ';')
 alias l="ls"
diff --git a/stumpwm/stumpwmrc b/stumpwm/stumpwmrc
index 8e381e8..1dffbf0 100644
--- a/stumpwm/stumpwmrc
+++ b/stumpwm/stumpwmrc
@@ -4,6 +4,9 @@
 
 (in-package :stumpwm)
 
+(setf *debug-level* 10)
+(redirect-all-output "/tmp/stumpwm-debug.log")
+
 (defparameter *key-layout* "us -variant altgr-intl" "Stores the current key layout")
 
 ;; creating groups
@@ -36,9 +39,9 @@
 (gravity :center)
 
 ;; root keybindings
-
-;;; browser
-(define-key *root-map* (kbd "C-c") "exec /opt/firefox/firefox")
+;
+;; browser
+(define-key *root-map* (kbd "C-c") "exec /opt/google/chrome-unstable/google-chrome-unstable --password-store=gnome")
 
 ;;; terminal
 (define-key *root-map* (kbd "c") "exec urxvt")
@@ -57,8 +60,11 @@
 (define-key *root-map* (kbd "C-8") "change-workspace 8")
 (define-key *root-map* (kbd "C-9") "change-workspace 9")
 
+;;; mode-line key
+(define-key *root-map* (kbd "Menu") "mode-line")
+
 ;; xserver
-(run-shell-command "xmodmap ~/.Xmodmap")
+
 (run-shell-command "xrdb -merge ~/.Xresources")
 ;;; HiDPI stuff.
 ;;; TODO: Only run if required
@@ -162,3 +168,8 @@
     (unless (eq frame old-frame)
       (show-frame-indicator group))))
 
+(load-module "stumptray")
+
+(switch-layout-to *key-layout*)
+
+(run-shell-command "xmodmap $HOME/.Xmodmap" t)
diff --git a/x/xinitrc b/x/xinitrc
index e8b1c2c..32c2e4d 100644
--- a/x/xinitrc
+++ b/x/xinitrc
@@ -22,9 +22,15 @@ if [ -f "$userresources" ]; then
 fi
 
 if [ -f "$usermodmap" ]; then
+    echo "Found a user modmap at $usermodpad"
     xmodmap "$usermodmap"
 fi
 
+# start gnome keyring daemon
+dbus-update-activation-environment --systemd DISPLAY
+eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh)
+export SSH_AUTH_SOCK
+
 # start some nice programs
 
 if [ -d /etc/X11/xinit/xinitrc.d ] ; then
@@ -65,5 +71,3 @@ case $session in
     # No known session, try to run it as command
     *) exec "$1";;
 esac
-
-export PATH="${PATH}:/usr/local/texlive/2015/bin/x86_64-linux"