Merge branch 'master' of git.friedersdorff.com:max/dotfiles

diff --git a/X/.Xresources.beryllium b/X/.Xresources.beryllium
new file mode 100644 (file)
index 0000000..803b551
--- /dev/null
+++ b/X/.Xresources.beryllium
@@ -0,0 +1 @@
+*faceSize: 12
\ No newline at end of file

diff --git a/X/.xinitrc b/X/.xinitrc
index 17e58e923fb7ff769472f8003de709a2652e938b..a0cce71ef23a37d84ed69493e5fd7b3cff7f540d 100644 (file)
--- a/X/.xinitrc
+++ b/X/.xinitrc
@@ -50,8 +50,16 @@ export _JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=on"
 
 feh --bg-scale ~/Pictures/background.jpg&
 
-twmnd&
+/usr/lib64/xfce4/notifyd/xfce4-notifyd&
 
 xset -b
 
+if ! pgrep -x -u "${USER}" gpg-agent>/dev/null 2>&1; then
+    eval $(gpg-agent --daemon \
+                    --use-standard-socket \
+                    --write-env-file "${HOME}/.gpg-agent-info")
+fi
+
+gpg-connect-agent udatestartuptty /bye >/dev/null
+
 exec /usr/bin/ratpoison

diff --git a/bash/.bashrc b/bash/.bashrc
index c58049c1966f8934c922f0f2ebd81633efe1a8df..3bf2436ee46d77555c31ebec35e180fc0e19c76c 100644 (file)
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -123,14 +123,6 @@ function __prompt_command()
 }
 PROMPT_COMMAND=__prompt_command
 
+
 GPG_TTY=$(tty)
 export GPG_TTY
-
-if ! pgrep -x -u "${USER}" gpg-agent>/dev/null 2>&1; then
-    eval $(gpg-agent --daemon \
-                    --use-standard-socket \
-                    --write-env-file "${HOME}/.gpg-agent-info")
-fi
-
-gpg-connect-agent udatestartuptty /bye >/dev/null
-

diff --git a/emacs/.emacs b/emacs/.emacs
index 9628a42e56d4231027151aa20a29fd33b3a36bdd..a9e7eab1159ef143015d3f4050d67a77c34ffcc4 100644 (file)
--- a/emacs/.emacs
+++ b/emacs/.emacs
@@ -15,14 +15,14 @@
  '(custom-enabled-themes (quote (molokai)))
  '(custom-safe-themes
    (quote
-    ("4e753673a37c71b07e3026be75dc6af3efbac5ce335f3707b7d6a110ecb636a3" "b571f92c9bfaf4a28cb64ae4b4cdbda95241cd62cf07d942be44dc8f46c491f4" default)))
+    ("3c83b3676d796422704082049fc38b6966bcad960f896669dfc21a7a37a748fa" "4e753673a37c71b07e3026be75dc6af3efbac5ce335f3707b7d6a110ecb636a3" "b571f92c9bfaf4a28cb64ae4b4cdbda95241cd62cf07d942be44dc8f46c491f4" default)))
  '(fci-rule-color "#383838")
  '(nrepl-message-colors
    (quote
     ("#CC9393" "#DFAF8F" "#F0DFAF" "#7F9F7F" "#BFEBBF" "#93E0E3" "#94BFF3" "#DC8CC3")))
  '(package-selected-packages
    (quote
-    (mu4e-alert yaml-mode minimap js2-mode editorconfig wanderlust evil-magit evil-leader evil-org molokai-theme org-evil flycheck-mypy jinja2 jinja2-mode highlight-indent-guides projectile helm-projectile zenburn-theme helm helm-config use-package flycheck company-jedi company org evil)))
+    (smart-mode-line sml mu4e-alert yaml-mode minimap js2-mode editorconfig wanderlust evil-magit evil-leader evil-org molokai-theme org-evil flycheck-mypy jinja2 jinja2-mode highlight-indent-guides projectile helm-projectile zenburn-theme helm helm-config use-package flycheck company-jedi company org evil)))
  '(pdf-view-midnight-colors (quote ("#DCDCCC" . "#383838")))
  '(vc-annotate-background "#2B2B2B")
  '(vc-annotate-color-map
@@ -203,7 +203,13 @@
                  "maildir:/personal-gmail/Inbox OR "
                  "maildir:/aber/Inbox "
                  ")") "Unread Interesting Messages" ?i)
-              ))
+              )
+  (setq mu4e-view-show-images t)
+  (setq mu4e-compose-crypto-reply-policy 'sign-and-encrypt)
+  (setq mml-secure-openpgp-sign-with-sender t)
+  (setq mml-default-encrypt-method "pgpmime")
+  (add-hook 'mu4e-compose-mode-hook 'mml-secure-message-sign)
+  )
 
 (use-package mu4e-alert
   :ensure t
@@ -218,9 +224,16 @@
         "maildir:/personal-gmail/Inbox OR "
         "maildir:/aber/Inbox "
         ")"))
-  (mu4e-alert-set-default-style 'notifications)
+  (mu4e-alert-set-default-style 'libnotify)
   (add-hook 'after-init-hook #'mu4e-alert-enable-notifications))
 
+(use-package jl-encrypt)
+
+(use-package smart-mode-line
+  :ensure t
+  :config
+  (sml/setup))
+
 
 ;;;(global-company-mode)
 ;;;(add-hook 'after-init-hook 'global-company-mode)

diff --git a/git/.gitconfig b/git/.gitconfig
index c1dab1f98c84c3e689d91393f7e7d1404b59a4c9..778a22074f6337dab537402c80779e0026b811ec 100644 (file)
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -12,7 +12,7 @@
        excludesfile = /home/max/.gitignore
 [merge]
        tool = diffuse
-        ff = false
+        ff = true
 [push]
        default = simple
 [alias]