From 81755845fe9fbd35154c73d102db9da0dba4c010 Mon Sep 17 00:00:00 2001
From: jao <jao@gnu.org>
Date: Wed, 2 Feb 2022 04:54:00 +0000
Subject: H-s relics (either sway or emacs got a fix)
---
blog.org | 3 +--
init.org | 11 +++++------
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/blog.org b/blog.org
index e259828..29b35f0 100644
--- a/blog.org
+++ b/blog.org
@@ -138,8 +138,7 @@
(advice-add 'org-static-blog-generate-post-path :override
#'jao-org-static-post-path)
- :bind (("H-s-b" . jao-transient-org-blog)
- :map org-mode-map (("C-c B" . jao-transient-org-blog))))
+ :bind (:map org-mode-map (("C-c B" . jao-transient-org-blog))))
#+end_src
* Commands
*** New entries
diff --git a/init.org b/init.org
index 97bb54c..ffecd87 100644
--- a/init.org
+++ b/init.org
@@ -158,8 +158,7 @@
#+begin_src emacs-lisp
(jao-load-path "app-launcher")
(use-package app-launcher
- :bind (("s-r" . app-launcher-run-app)
- ("H-s-r" . app-launcher-run-app)))
+ :bind (("s-r" . app-launcher-run-app)))
#+end_src
*** Brightness control
#+begin_src emacs-lisp
@@ -526,7 +525,7 @@
(when jao-sway-enabled (add-hook 'after-init-hook #'jao-sway-enable))
#+end_src
-*** Wallpaper
+*** wallpaper
#+begin_src emacs-lisp
(defvar jao-wallpaper-dir "~/.wallpapers/")
@@ -555,7 +554,8 @@
(defun jao-set-random-wallpaper ()
(interactive)
- (when jao-wallpaper-random-wake
+ (when (or (called-interactively-p 'interactive)
+ jao-wallpaper-random-wake)
(let* ((ws (if (jao-colors-scheme-dark-p)
jao-wallpaper-random-candidates
jao-wallpaper-random-candidates-light))
@@ -565,7 +565,7 @@
(add-to-list 'jao-sleep-awake-functions #'jao-set-random-wallpaper)
#+end_src
-*** Screensaver and lock
+*** screensaver and lock
#+begin_src emacs-lisp
(defun jao-screensaver-enabled ()
(string= (jao-exec-string "xdg-screensaver status") "enabled"))
@@ -1157,7 +1157,6 @@
(defalias 'jao-other-window 'other-window)
(global-set-key (kbd "s-a") #'jao-first-window)
- (global-set-key (kbd "H-s-a") #'jao-first-window)
(global-set-key (kbd "C-x p") 'jao-prev-window)
(global-set-key (kbd "M-o") #'jao-other-window)
(global-set-key (kbd "M-p") #'jao-prev-window)
--
cgit v1.2.3