.

2 files changed, 37 insertions, 22 deletions

diff --git a/emacs b/emacs
index 81a532d..81864c5 100644
--- a/emacs
+++ b/emacs
@@ -1,3 +1,4 @@
+;; -*- lexical-binding: t; -*-
 
 (fset 'yes-or-no-p 'y-or-n-p)
 
@@ -125,10 +126,26 @@
   (exwm-xim-mode)
   (push ?\C-\\ exwm-input-prefix-keys)
   :hook
-  ((emacs-startup . (lambda ()
-			(set-face-attribute 'default nil :height 170)))
+  ((exwm-init . (lambda ()
+		  (set-face-attribute 'default nil :height 170)))
+   ;; Make sure titles match X window
+   (exwm-update-title . (lambda ()
+			  (exwm-workspace-rename-buffer
+			   (concat exwm-class-name ":"
+				   (if (<= (length exwm-title) 50) exwm-title
+				     (concat (substring exwm-title 0 49) "..."))))))
    (exwm-update-class . (lambda ()
-			 (exwm-workspace-rename-buffer exwm-class-name)))))
+			  (exwm-workspace-rename-buffer
+			   (concat exwm-class-name ":"
+				   (if (<= (length exwm-title) 50) exwm-title
+				     (concat (substring exwm-title 0 49) "..."))))))))
+
+(use-package org-crypt
+  :init
+  (setenv "GPG_AGENT_INFO" nil)
+  (setq auth-source-debug t
+	epg-gpg-program "gpg2")
+  (org-crypt-use-before-save-magic))
 
 (use-package pinentry
   :ensure t
@@ -138,16 +155,9 @@
 (use-package epa-file
   :init
   (epa-file-enable)
-  :config
   (setq
-   epa-pinentry-mode 'loopback
    epa-pinentry-mode 'loopback))
 
-(use-package org-crypt
-  :config
-  (setenv "GPG_AGENT_INFO" nil)
-  (setq auth-source-debug t)
-  (org-crypt-use-before-save-magic))
 
 (use-package avy
   :ensure t
@@ -354,9 +364,9 @@ Uses `marcc/timestamp-format' for formatting the date/time."
 	   "#emacs"
 	   "#permacomputing"
 	   "#oldcomputerchallenge"
-	   "#lobsters"
 	   "#netbsd"
-	   "#erc")))
+	   "#nonguix"
+	   "#guix")))
   :init
   (global-set-key 
    "\C-cef"
@@ -439,6 +449,7 @@ Uses `marcc/timestamp-format' for formatting the date/time."
 (use-package magit-extras)
 
 (use-package yasnippet
+  :diminish t
   :ensure t
   :init
   (yas-global-mode 1))
@@ -612,7 +623,7 @@ Uses `marcc/timestamp-format' for formatting the date/time."
  '(font-lock-type-face ((t (:foreground "black"))))
  '(font-lock-variable-name-face ((t (:foreground "black"))))
  '(fringe ((t (:background "white"))))
- '(header-line ((t (:inherit default :foreground "grey20" :box (:line-width (8 . 8) :color "#FFFFFF") :underline (:color "gray80" :style line :position 0) :family "Iosevka Aile"))))
+ '(header-line ((t (:inherit default :foreground "grey20" :box (:line-width (8 . 8) :color "#FFFFFF") :underline (:color "#e0e0e0" :style line :position 0) :family "Iosevka Aile"))))
  '(highlight ((t (:background "azure2"))))
  '(info-header-xref ((t (:inherit info-xref :underline (:color "RoyalBlue3" :style line :position t)))))
  '(info-node ((t (:foreground "brown" :box (:line-width (4 . 4) :color "white") :slant italic :weight bold))))
@@ -621,8 +632,8 @@ Uses `marcc/timestamp-format' for formatting the date/time."
  '(markdown-inline-code-face ((t (:inherit markdown-code-face))))
  '(markdown-pre-face ((t (:inherit markdown-code-face))))
  '(mastodon-display-name-face ((t (:inherit nil :weight bold))))
- '(mode-line ((t (:foreground "black" :box (:line-width (8 . 8) :style flat-button) :overline "gray80" :family "Iosevka Aile"))))
- '(mode-line-inactive ((t (:inherit mode-line :background "grey95" :foreground "grey20" :underline (:color "grey80" :style line :position 0) :weight light))))
+ '(mode-line ((t (:foreground "black" :box (:line-width (8 . 8) :style flat-button) :overline "#e0e0e0" :family "Iosevka Aile"))))
+ '(mode-line-inactive ((t (:inherit mode-line :background "grey95" :foreground "grey20" :underline (:color "#e0e0e0" :style line :position 0) :weight light))))
  '(mu4e-header-highlight-face ((t (:inherit hl-line :extend t :weight bold))))
  '(mu4e-highlight-face ((t (:inherit highlight))))
  '(org-date ((t (:inherit fixed-pitch :foreground "gray40" :underline t))))
@@ -631,13 +642,14 @@ Uses `marcc/timestamp-format' for formatting the date/time."
  '(org-tag ((t (:inherit fixed-pitch :foreground "gray40" :weight regular))))
  '(org-time-grid ((t (:foreground "gray"))))
  '(outline-4 ((t (:inherit outline-2))))
- '(tab-bar ((t (:box (:line-width (8 . 8) :style flat-button) :weight light :family "Iosevka Aile"))))
+ '(tab-bar ((t (:box (:line-width (12 . 12) :style flat-button) :weight light :family "Iosevka Aile"))))
  '(tldr-code-block ((t (:background "cornsilk" :foreground "black"))))
  '(tldr-command-argument ((t (:background "cornsilk" :foreground "black"))))
  '(tldr-command-itself ((t (:background "khaki" :foreground "black" :weight bold))))
  '(tldr-introduction ((t (:foreground "black" :slant italic))))
  '(tldr-title ((t (:inherit variable-pitch :foreground "black" :weight bold :height 1.2))))
- '(variable-pitch ((t (:family "Iosevka Aile")))))
+ '(variable-pitch ((t (:family "Iosevka Aile"))))
+ '(window-divider ((t (:foreground "gray90")))))
 (custom-set-variables
  ;; custom-set-variables was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
@@ -645,6 +657,9 @@ Uses `marcc/timestamp-format' for formatting the date/time."
  ;; If there is more than one, they won't work right.
  '(custom-safe-themes
    '("cbd85ab34afb47003fa7f814a462c24affb1de81ebf172b78cb4e65186ba59d2" default))
+ '(erc-mode-line-format "")
+ '(erc-modules
+   '(autojoin button completion fill irccontrols list match menu move-to-prompt netsplit networks noncommands notifications readonly ring services stamp spelling))
  '(magit-section-visibility-indicator '("..." . t))
  '(markdown-list-item-bullets '("-"))
  '(mastodon-tl--enable-proportional-fonts t)
@@ -653,8 +668,8 @@ Uses `marcc/timestamp-format' for formatting the date/time."
  '(mode-line-format
    '("%e" mode-line-front-space
      (:propertize
-      ("" mode-line-modified " " mode-line-position))
-     mode-line-buffer-identification))
+      ("" mode-line-modified " "))
+     mode-line-buffer-identification " " mode-line-modes))
  '(mode-line-percent-position nil)
  '(mode-line-position-line-format '(" "))
  '(mu4e-bookmarks
@@ -665,7 +680,6 @@ Uses `marcc/timestamp-format' for formatting the date/time."
  '(org-fold-core-style 'overlays)
  '(package-selected-packages
    '(pinentry exwm emms company orglink web-mode flycheck nix-mode nix-ts-mode avy pdf-tools elfeed-protocol lem yasnippet-snippets elfeed yasnippet smartparens markdown-mode mastodon tldr almost-mono-themes rec-mode magit go-mode expand-region devdocs))
- '(tab-bar-format
-   '(tab-bar-separator tab-bar-format-align-right tab-bar-format-global))
+ '(tab-bar-format '(tab-bar-format-align-right tab-bar-format-global))
  '(yank-from-kill-ring-rotate t))
 (put 'secrets-mode 'disabled nil)
diff --git a/gnupg/gpg-agent.conf b/gnupg/gpg-agent.conf
index b003ab0..819ca6b 100755
--- a/gnupg/gpg-agent.conf
+++ b/gnupg/gpg-agent.conf
@@ -1,6 +1,7 @@
 default-cache-ttl 999999999 
 max-cache-ttl 999999999  
 allow-preset-passphrase
+enable-ssh-support
 allow-emacs-pinentry
 allow-loopback-pinentry
-pinentry-program /usr/bin/pinentry-tty
+#pinentry-program /usr/bin/pinentry-tty