small adjustments

1 files changed, 7 insertions, 6 deletions

diff --git a/init.org b/init.org
index 64e0cf1..1ccf0cc 100644
--- a/init.org
+++ b/init.org
@@ -233,8 +233,9 @@
               (shell-command-to-string "setxkbmap -query|grep variant"))))
 
       (set-keyboard-coding-system 'latin-1)
-      (setq default-input-method "catalan-prefix")
       (set-language-environment "UTF-8")
+      ;; must be set after current-language-environment
+      (customize-set-variable 'default-input-method "catalan-prefix")
 
       (defun jao--set-kb-system (frame)
         (select-frame frame)
@@ -1344,10 +1345,10 @@
     #+end_src
 *** Frame layout, title, etc.
     #+BEGIN_SRC emacs-lisp
-      (defvar jao-frames-fringe-mode 0)
       (setq frame-title-format '("%b"))
       (use-package fringe)
-      (fringe-mode jao-frames-fringe-mode)
+      (fringe-mode)
+
       (menu-bar-mode (jao-d-l 1 -1))
 
       ;; (setting it to nil avoids mouse wrapping after other-frame)
@@ -4034,10 +4035,10 @@
     #+begin_src emacs-lisp
       (jao-maybe-tangle "lib/media/espotify")
 
-      (use-package espotify)
+      (use-package espotify :demand t)
 
       (when (eq 'consult jao-completion-engine)
-        (use-package espotify-consult :demand t)
+        (require 'espotify-consult)
         (use-package espotify-embark :demand t)
         (defalias 'jao-spotify-album #'espotify-consult-album)
         (defalias 'jao-spotify-track #'espotify-consult-track)
@@ -4045,7 +4046,7 @@
         (defalias 'jao-spotify-playlist #'espotify-consult-playlist))
 
       (when (eq 'counsel jao-completion-engine)
-        (use-package espotify-counsel :demand t)
+        (require 'espotify-counsel)
         (defalias 'jao-spotify-album #'espotify-counsel-album)
         (defalias 'jao-spotify-track #'espotify-counsel-track)
         (defalias 'jao-spotify-artist #'espotify-counsel-artist)