From 2beef2a403977f6bea549bdef389aa63f878541d Mon Sep 17 00:00:00 2001
From: Marcel Kapfer <opensource@mmk2410.org>
Date: Sat, 21 Oct 2017 18:08:51 +0200
Subject: [PATCH] merge

---
 emacs/emacs.el  | 8 +++++---
 screen/screenrc | 4 +++-
 x/Xresources    | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/emacs/emacs.el b/emacs/emacs.el
index 6f66cea..5842947 100644
--- a/emacs/emacs.el
+++ b/emacs/emacs.el
@@ -47,17 +47,19 @@
  '(custom-enabled-themes (quote (atom-one-dark)))
  '(custom-safe-themes
    (quote
-    ("a4c9e536d86666d4494ef7f43c84807162d9bd29b0dfd39bdf2c3d845dcc7b2e" "e9460a84d876da407d9e6accf9ceba453e2f86f8b86076f37c08ad155de8223c" "d29231b2550e0d30b7d0d7fc54a7fb2aa7f47d1b110ee625c1a56b30fea3be0f" "c7a9a68bd07e38620a5508fef62ec079d274475c8f92d75ed0c33c45fbe306bc" "eb0a314ac9f75a2bf6ed53563b5d28b563eeba938f8433f6d1db781a47da1366" "a1289424bbc0e9f9877aa2c9a03c7dfd2835ea51d8781a0bf9e2415101f70a7e" "10e231624707d46f7b2059cc9280c332f7c7a530ebc17dba7e506df34c5332c4" "08b8807d23c290c840bbb14614a83878529359eaba1805618b3be7d61b0b0a32" "43bc55af3857f9e2dc14c4413739f36d758e4d75bcd9b67e9b7dc6d9fcc1db68" "6254372d3ffe543979f21c4a4179cd819b808e5dd0f1787e2a2a647f5759c1d1" "1160f5fc215738551fce39a67b2bcf312ed07ef3568d15d53c87baa4fd1f4d4e" default)))
+    ("ff7625ad8aa2615eae96d6b4469fcc7d3d20b2e1ebc63b761a349bebbb9d23cb" "a4c9e536d86666d4494ef7f43c84807162d9bd29b0dfd39bdf2c3d845dcc7b2e" "e9460a84d876da407d9e6accf9ceba453e2f86f8b86076f37c08ad155de8223c" "d29231b2550e0d30b7d0d7fc54a7fb2aa7f47d1b110ee625c1a56b30fea3be0f" "c7a9a68bd07e38620a5508fef62ec079d274475c8f92d75ed0c33c45fbe306bc" "eb0a314ac9f75a2bf6ed53563b5d28b563eeba938f8433f6d1db781a47da1366" "a1289424bbc0e9f9877aa2c9a03c7dfd2835ea51d8781a0bf9e2415101f70a7e" "10e231624707d46f7b2059cc9280c332f7c7a530ebc17dba7e506df34c5332c4" "08b8807d23c290c840bbb14614a83878529359eaba1805618b3be7d61b0b0a32" "43bc55af3857f9e2dc14c4413739f36d758e4d75bcd9b67e9b7dc6d9fcc1db68" "6254372d3ffe543979f21c4a4179cd819b808e5dd0f1787e2a2a647f5759c1d1" "1160f5fc215738551fce39a67b2bcf312ed07ef3568d15d53c87baa4fd1f4d4e" default)))
  '(ecb-options-version "2.50")
  '(fci-rule-color "#5B6268")
  '(flycheck-python-pylint-executable "pylint3")
  '(inhibit-startup-screen t)
  '(jdee-global-classpath (quote ("/home/wilson/jdee-libs/")))
  '(jdee-server-dir "/opt/jdee-emacs-server/")
- '(org-agenda-files (quote ("~/ownCloud/todo.org")))
+ '(org-agenda-files
+   (quote
+    ("~/Documents/uni/uulm-2017-2/priv/organisatorisches.org" "~/ownCloud/todo.org")))
  '(package-selected-packages
    (quote
-    (org haskell-mode haskell-tab-indent beginend doom-themes neotree rainbow-delimiters projectile nlinum powerline airline-themes fic-mode markdown-preview-mode web-mode ob-dart ac-python ac-slime ant auctex-lua auto-compile auto-complete-auctex csv-mode csv ghc 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)))
+    (avandu org company company-math counsel ivy beginend doom-themes neotree rainbow-delimiters projectile nlinum powerline airline-themes 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 . pdftex) (TeX-Engine . luatex))))
  '(send-mail-function (quote smtpmail-send-it))
  '(standard-indent 2)
diff --git a/screen/screenrc b/screen/screenrc
index 7a1d77a..4dea3a0 100644
--- a/screen/screenrc
+++ b/screen/screenrc
@@ -7,7 +7,7 @@ defscrollback 65000
 
 startup_message off
 
-term screen-256color
+# term screen-256color
 # termcapinfo xterm* ti@:te@
 attrcolor b ".I"
 term rxvt-unicode-256color
@@ -35,3 +35,5 @@ altscreen on
 
 vbell off
 shell "fish"
+
+altscreen on
diff --git a/x/Xresources b/x/Xresources
index 24038da..163cd63 100644
--- a/x/Xresources
+++ b/x/Xresources
@@ -69,7 +69,7 @@ URxvt.depth: 32
 URxvt.perl-ext-common: default,matcher,keyboard-select
 
 ! URLs
-URxvt.url-launcher: /usr/bin/xdg-open
+URxvt.url-launcher: /usr/local/bin/firefox-nightly
 URxvt.matcher.button: 3
 URxvt.keysym.M-u: matcher:select