use-package more hints when to laod, exwm+server not ask start twice

9 files changed, 22 insertions, 11 deletions

diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index b36732b..80edf5a 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -80,7 +80,6 @@
 (require 'guix-autoloads)
 (guix-prettify-global-mode 1)
 
-(require 'use-package-ensure)
 
 ;;;; add my modules to load path
 (mapc
diff --git a/.config/emacs/modules/bd--dictionary.el b/.config/emacs/modules/bd--dictionary.el
index f6e67fb..bf83544 100644
--- a/.config/emacs/modules/bd--dictionary.el
+++ b/.config/emacs/modules/bd--dictionary.el
@@ -4,7 +4,6 @@
 
 
 (use-package dictionary
-  :defer t
   :bind (("C-c i" . dictionary-lookup-definition))
   :config
   (setopt dictionary-server "localhost"
diff --git a/.config/emacs/modules/bd--emms.el b/.config/emacs/modules/bd--emms.el
index 5efe6c6..2ecb684 100644
--- a/.config/emacs/modules/bd--emms.el
+++ b/.config/emacs/modules/bd--emms.el
@@ -4,6 +4,10 @@
 
 
 (use-package emms
+  :bind (("C-z C-s" . #'emms-quickstart)
+	 ("C-z C-m" . #'switch-to-emms)
+	 :map emms-playlist-mode-map
+	 ("q" . #'quit-window))
   :config
   (require 'emms-setup)
   (require 'emms-player-mpv)
@@ -25,10 +29,6 @@ playback."
         (display-buffer emms-playlist-buffer-name)
       (message "The Ainur cannot hear you...")))
 
-  (keymap-global-set "C-z C-s" #'emms-quickstart)
-  (keymap-global-set "C-z C-m" #'switch-to-emms)
-  (keymap-set emms-playlist-mode-map "q" #'quit-window)
-
   (add-to-list 'emms-player-list 'emms-player-mpv)
   (emms-playing-time-disable-display)
   (setq-default emms-playlist-default-major-mode 'emms-playlist-mode
diff --git a/.config/emacs/modules/bd--exwm-windowing.el b/.config/emacs/modules/bd--exwm-windowing.el
index e5084bb..320fd3d 100644
--- a/.config/emacs/modules/bd--exwm-windowing.el
+++ b/.config/emacs/modules/bd--exwm-windowing.el
@@ -6,6 +6,7 @@
 (bd/set-bg)
 
 (use-package exwm
+  :demand t
   :config
   (defun bd/exwm-update-title ()
     "Changes the buffer name to reflect the class name for
@@ -15,8 +16,8 @@ that buffer."
 
   (define-key exwm-mode-map [?\C-q] 'exwm-input-send-next-key)
   (exwm-enable)
-  (server-start)
-  (setopt exwm-input-prefix-keys
+  (setopt exwm-replace nil
+	  exwm-input-prefix-keys
 	  `(?\C-x
 	    ?\C-u
 	    ?\C-g
@@ -76,6 +77,13 @@ that buffer."
 	    ([?\H-b] . [M-left])
 	    ([?\H-f] . [M-right]))))
 
+(use-package server
+  :defer 1
+  :config
+  (setopt server-client-instructions nil)
+  (unless (server-running-p)
+    (server-start)))
+
 (setopt tab-bar-select-tab-modifiers '(super))
 
 (defvar new-mode-line nil)
diff --git a/.config/emacs/modules/bd--files.el b/.config/emacs/modules/bd--files.el
index c242487..4e19c11 100644
--- a/.config/emacs/modules/bd--files.el
+++ b/.config/emacs/modules/bd--files.el
@@ -4,6 +4,7 @@
 
 
 (use-package recentf
+  :demand t
   :init
   (recentf-mode 1)
   :config
@@ -53,6 +54,7 @@
 (advice-add #'find-file :around #'bd/external-find-file-wrapper)
 
 (use-package dired
+  :demand t
   :bind
   (("C-c d" . dired-jump))
   :config
@@ -66,7 +68,6 @@
 	    (,(regexp-opt '(".html")) "icecat &"))))
 
 (use-package transmission
-  :defer t
   :bind
   (:map transmission-mode-map
         ("R" . #'transmission-move)))
diff --git a/.config/emacs/modules/bd--gpg.el b/.config/emacs/modules/bd--gpg.el
index 3f912b3..2c5dca8 100644
--- a/.config/emacs/modules/bd--gpg.el
+++ b/.config/emacs/modules/bd--gpg.el
@@ -54,6 +54,7 @@
   (selector (list (bd/selector-passwords))))
 
 (use-package pinentry
+  :defer t
   :config
   (pinentry-start)
   (defun pinentry-toggle ()
diff --git a/.config/emacs/modules/bd--irc.el b/.config/emacs/modules/bd--irc.el
index 9368144..659e5d0 100644
--- a/.config/emacs/modules/bd--irc.el
+++ b/.config/emacs/modules/bd--irc.el
@@ -5,7 +5,6 @@
 
 (require 'fill-column)
 (use-package rcirc
-  :defer t
   :hook
   ((rcirc-mode . (lambda ()
 		   (setq-local fill-column-desired-width 80)
diff --git a/.config/emacs/modules/bd--notes.el b/.config/emacs/modules/bd--notes.el
index 0bfdc4a..eaea365 100644
--- a/.config/emacs/modules/bd--notes.el
+++ b/.config/emacs/modules/bd--notes.el
@@ -34,7 +34,8 @@ then pastes the active region."
 (use-package denote
   :hook
   ((dired-mode . denote-dired-mode-in-directories))
-  :bind (("H-d f" . 'denote-open-or-create)
+  :bind (("H-d d" . 'denote)
+	 ("H-d f" . 'denote-open-or-create)
          ("H-d j" . 'denote-journal-extras-new-or-existing-entry)
          :map org-mode-map
          ("C-c l" . 'denote-link))
diff --git a/.config/emacs/modules/bd--tabs.el b/.config/emacs/modules/bd--tabs.el
index 264d85b..3c6b53a 100644
--- a/.config/emacs/modules/bd--tabs.el
+++ b/.config/emacs/modules/bd--tabs.el
@@ -4,6 +4,7 @@
 
 
 (use-package time
+  :demand t
   :init
   (display-time)
   :config
@@ -11,12 +12,14 @@
 	  display-time-default-load-average nil))
 
 (use-package battery
+  :demand t
   :init
   (display-battery-mode)
   :config
   (setopt battery-update-interval 90))
 
 (use-package tab-bar
+  :demand t
   :bind (("H-f" . tab-bar-history-forward)
          ("H-b" . tab-bar-history-back))
   :config