From 4db46e190f65c5c3dc2ffd0d173d9dbffd80c5fc Mon Sep 17 00:00:00 2001
From: Philip Henning <mail@philip-henning.com>
Date: Fri, 29 Dec 2017 14:49:28 +0100
Subject: [PATCH] Some Window Manager startup tweaks; Use dmenu instead of
 albert.

---
 config.yaml                        | 16 ++++------------
 dotfiles/{Xdefaults => Xresources} |  2 +-
 dotfiles/config/bspwm/bspwmrc      | 18 +++++++++++++-----
 dotfiles/config/sxhkd/sxhkdrc      |  4 ++++
 dotfiles/xinitrc                   | 13 ++++++++++---
 5 files changed, 32 insertions(+), 21 deletions(-)
 rename dotfiles/{Xdefaults => Xresources} (98%)

diff --git a/config.yaml b/config.yaml
index 6cc324b..de8db94 100644
--- a/config.yaml
+++ b/config.yaml
@@ -19,18 +19,12 @@ dotfiles:
   d_fonts:
     dst: ~/.local/share/fonts
     src: local/share/fonts
-  d_org.albert.frontend.boxmodel.widgets:
-    dst: ~/.local/share/albert/org.albert.frontend.boxmodel.widgets
-    src: local/share/albert/org.albert.frontend.boxmodel.widgets
   d_polybar:
     dst: ~/.config/polybar
     src: config/polybar
   d_sxhkd:
     dst: ~/.config/sxhkd
     src: config/sxhkd
-  f_albert.conf:
-    dst: ~/.config/albert/albert.conf
-    src: config/albert/albert.conf
   f_fehbg:
     dst: ~/.fehbg
     src: fehbg
@@ -45,12 +39,12 @@ dotfiles:
   f_vimrc:
     dst: ~/.vimrc
     src: vimrc
-  f_xdefaults:
-    dst: ~/.Xdefaults
-    src: Xdefaults
   f_xinitrc:
     dst: ~/.xinitrc
     src: xinitrc
+  f_xresources:
+    dst: ~/.Xresources
+    src: Xresources
   f_xsession:
     dst: ~/.xsession
     src: xsession
@@ -62,7 +56,6 @@ dotfiles:
 profiles:
   yoetunheimr:
     dotfiles:
-    - f_xdefaults
     - d_bspwm
     - d_polybar
     - d_sxhkd
@@ -74,6 +67,5 @@ profiles:
     - f_xsession
     - f_zshrc
     - f_powerlevel9krc
-    - f_albert.conf
-    - d_org.albert.frontend.boxmodel.widgets
     - d_colors
+    - f_xresources
diff --git a/dotfiles/Xdefaults b/dotfiles/Xresources
similarity index 98%
rename from dotfiles/Xdefaults
rename to dotfiles/Xresources
index ba4e89a..38e7c56 100644
--- a/dotfiles/Xdefaults
+++ b/dotfiles/Xresources
@@ -1,5 +1,5 @@
 /*
- {{@@ env['dotdrop_warning'] @@}}
+ {{@@ env['dotdrop_warning'] @@}} 
 */
 
 /* Set each shell as loginShell */
diff --git a/dotfiles/config/bspwm/bspwmrc b/dotfiles/config/bspwm/bspwmrc
index 9f97514..de7a66a 100755
--- a/dotfiles/config/bspwm/bspwmrc
+++ b/dotfiles/config/bspwm/bspwmrc
@@ -2,6 +2,19 @@
 #
 # {{@@ env['dotdrop_warning'] @@}}
 #
+
+# https://wiki.archlinux.org/index.php/GNOME/Keyring
+# Launch sxhkd
+sxhkd &
+# Set Wallpaper
+$HOME/.fehbg
+# Launch polybar(s)
+$HOME/.config/polybar/launch.sh &
+# Launch NetworkManager applet
+/usr/bin/nm-applet &
+# Launch Nextcloud
+/usr/bin/nextcloud &
+
 bspc config border_width        2
 bspc config window_gap          5
 
@@ -16,8 +29,3 @@ bspc rule -a Gimp desktop=^8 follow=on floating=on
 bspc rule -a Chromium desktop=^2
 bspc rule -a mplayer2 floating=on
 bspc rule -a Screenkey manage=off
-
-# THIS SHOULD BE THE LAST!
-# Lauch polybar(s)
-$HOME/.config/polybar/launch.sh
-/usr/bin/albert
diff --git a/dotfiles/config/sxhkd/sxhkdrc b/dotfiles/config/sxhkd/sxhkdrc
index af20b8c..0022371 100755
--- a/dotfiles/config/sxhkd/sxhkdrc
+++ b/dotfiles/config/sxhkd/sxhkdrc
@@ -56,6 +56,10 @@ super + w
 # wm independent hotkeys
 ##
 
+# Start dmenu
+super + Space
+  dmenu
+
 # Start urxvt terminal
 super + Return
   urxvt
diff --git a/dotfiles/xinitrc b/dotfiles/xinitrc
index d4fa82f..a7c26a8 100755
--- a/dotfiles/xinitrc
+++ b/dotfiles/xinitrc
@@ -3,8 +3,15 @@
 # {{@@ env['dotdrop_warning'] @@}}
 #
 
+# User Xdefaults
+#if [ -f $HOME/.Xdefaults ]; then
+#	xrdb -merge -I$HOME ~/.Xresources
+#fi
+
+# Start gnome keyring daemon
+eval $(/usr/bin/gnome-keyring-daemon --start --components=gpg,pkcs11,secrets)
+export $(gnome-keyring-daemon --start --components=pkcs11,secrets,gpg)
+# Tells dbus to add DISPLAY to its own environment variables
+dbus-update-activation-environment --systemd DISPLAY
 # load Xresources
-$HOME/.fehbg &
-sxhkd &
 exec bspwm
-xrdb -I$HOME -load ~/.Xresources