Merge branch 'neptun'

5 files changed, 36 insertions, 19 deletions

diff --git a/dot.config-i3-config b/dot.config-i3-config
index 149a3c9..dd524d8 100644
--- a/dot.config-i3-config
+++ b/dot.config-i3-config
@@ -4,7 +4,7 @@ set $mod Mod4
 
 # Font for window titles. Will also be used by the bar unless a different font
 # is used in the bar {} block below.
-font pango:Source Code Pro Medium 8
+font pango:Source Code Pro Medium 11
 
 # This font is widely installed, provides lots of unicode glyphs, right-to-left
 # text rendering and scalability on retina/hidpi displays (thanks to pango).
@@ -153,6 +153,7 @@ bindsym XF86MonBrightnessUp exec xbacklight -inc 10
 bindsym XF86MonBrightnessDown exec xbacklight -dec 10
 bindsym $mod+Escape exec $lockcommand
 bindsym XF86Sleep exec systemctl suspend
+bindsym $mod+Print exec systemctl suspend
 bindsym XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle
 bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5%
 bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5%
diff --git a/dot.config-polybar-config b/dot.config-polybar-config
index ba7f89d..a554f65 100644
--- a/dot.config-polybar-config
+++ b/dot.config-polybar-config
@@ -9,12 +9,13 @@ secondary = #e60053
 alert = #bd2c40
 
 [bar/top]
-monitor = eDP-1
 width = 100%
-height = 30
-radius = 6.0
+height = 20
+radius = 3.0
 fixed-center = false
 
+monitor = HDMI-0
+
 dpi = -1
 
 background = ${colors.background}
@@ -32,13 +33,13 @@ padding-right = 1
 module-margin-left = 0
 module-margin-right = 1
 
-font-0 = "Source Code Pro Medium:size=8;1"
-font-1 = "Font Awesome 5 Free:size=8;2"
-font-2 = "Font Awesome 5 Free Solid:size=8;2"
+font-0 = "Source Code Pro Medium:size=11;1"
+font-1 = "Font Awesome 5 Free:size=11;2"
+font-2 = "Font Awesome 5 Free Solid:size=11;2"
 
 modules-left = i3
-modules-center =
-modules-right = pulseaudio xkeyboard filesystem memory cpu loadavg wlan eth backlight-acpi battery temperature date
+modules-center = mpd
+modules-right = pulseaudio xkeyboard filesystem memory cpu loadavg eth temperature date
 
 tray-position = right
 tray-padding = 0
@@ -109,7 +110,7 @@ label-unfocused-padding = 1
 ; visible = Active workspace on unfocused monitor
 label-visible = %index%
 label-visible-background = ${self.label-focused-background}
-label-visible-underline = ${self.label-focused-underline}
+label-visible-underline = ${colors.secondary}
 label-visible-padding = ${self.label-focused-padding}
 
 ; urgent = Workspace with urgency hint set
@@ -152,7 +153,7 @@ format-disconnected-underline = #9f78e1
 
 [module/eth]
 type = internal/network
-interface = enp0s31f6
+interface = enp6s0
 interval = 3.0
 
 format-connected-underline = #55aa55
diff --git a/dot.emacs.d/init.el b/dot.emacs.d/init.el
index f56523e..87e338b 100644
--- a/dot.emacs.d/init.el
+++ b/dot.emacs.d/init.el
@@ -337,12 +337,25 @@
    smime-CA-directory "/etc/ssl/certs"
    gnus-select-method '(nntp "news.cis.dfn.de"
 			     (nntp-open-connection-function nntp-open-ssl-stream)
-			     (nntp-port-number 563))
-   gnus-secondary-select-methods '((nnmaildir "mail"
-					      (directory "~/.nnmaildir")
-					      (nnir-search-engine notmuch)))
-   nnir-notmuch-program "/home/qsx/.local/bin/notmuch-gnus"
-   nnir-notmuch-remove-prefix (concat (getenv "HOME") "/.nnmaildir/"))
+			     (nntp-port-number 563)))
+  (let ((maildir (cl-find-if #'file-directory-p
+			     (mapcar (lambda (x) (concat (getenv "HOME") x))
+				     '("/.nnmaildir"
+				       "/.maildir"
+				       "/Maildir"))))
+	(notmuch (let ((notmuch-gnus (concat (getenv "HOME") "/.local/bin/notmuch-gnus")))
+		   (if (file-executable-p notmuch-gnus)
+		       notmuch-gnus
+		     "notmuch")))
+	(notmuch-database-path (car (process-lines "notmuch" "config" "get" "database.path"))))
+    (setq
+     gnus-secondary-select-methods
+     `((nnmaildir
+	"mail"
+	(directory ,maildir)
+	(gnus-search-engine gnus-search-notmuch
+			    (program ,notmuch)
+			    (remove-prefix ,(concat notmuch-database-path "/")))))))
   (add-hook 'message-setup-hook (defun qsx-message-add-my-headers ()
 				  (message-add-header "Openpgp: id=E384009D3B54DCD321BF953295EE94A432583DB1; url=https://keys.openpgp.org/vks/v1/by-fingerprint/E384009D3B54DCD321BF953295EE94A432583DB1; preference=signencrypt"))))
 
diff --git a/dot.xprofile b/dot.xprofile
index 7cdd235..9735b4e 100644
--- a/dot.xprofile
+++ b/dot.xprofile
@@ -2,11 +2,11 @@
 if [ "$XPROFILE_RUN" != "yes" ]; then
 	export XPROFILE_RUN=yes
 	export TERMINAL=kitty-1
-	export GDK_SCALE=2
-	xrandr --dpi 192
 	[ -f ~/.fehbg ] && ~/.fehbg
 	xss-lock -- ~/.local/bin/i3lock-wrapper &
+	owncloud &
 	type nm-applet >/dev/null && nm-applet &
 	(while ! pidof i3; do sleep 1; done; exec polybar -r top) &
 fi
 export XPROFILE_RUN=yes
+systemctl --user start compton
diff --git a/dot.zprofile b/dot.zprofile
index 2246b70..6682141 100644
--- a/dot.zprofile
+++ b/dot.zprofile
@@ -1 +1,3 @@
 [ -f /etc/gentoo-release ] && source ~/.zshenv
+
+export PATH="$HOME/.cargo/bin:$PATH"