diff options
-rw-r--r-- | desktop/.config/kglobalshortcutsrc | 14 | ||||
-rw-r--r-- | emacs/.config/emacs-kj/init.el | 10 | ||||
-rw-r--r-- | emacs/.config/emacs-kj/lisp/kj-org.el | 2 |
3 files changed, 13 insertions, 13 deletions
diff --git a/desktop/.config/kglobalshortcutsrc b/desktop/.config/kglobalshortcutsrc index 3066593..a8fd78b 100644 --- a/desktop/.config/kglobalshortcutsrc +++ b/desktop/.config/kglobalshortcutsrc @@ -92,12 +92,12 @@ mic_mute=Microphone Mute\tMeta+Volume Mute,Microphone Mute\tMeta+Volume Mute,Mut mute=Volume Mute,Volume Mute,Mute [ksmserver] -Halt Without Confirmation=none,none,Halt Without Confirmation +Halt Without Confirmation=none,,Halt Without Confirmation Lock Session=Meta+L\tScreensaver,Meta+L\tScreensaver,Lock Session Log Out=Ctrl+Alt+Del,Ctrl+Alt+Del,Log Out -Log Out Without Confirmation=none,none,Log Out Without Confirmation -Reboot Without Confirmation=none,none,Reboot Without Confirmation -_k_friendly_name=KWin +Log Out Without Confirmation=none,,Log Out Without Confirmation +Reboot Without Confirmation=none,,Reboot Without Confirmation +_k_friendly_name=Session Management [kwin] Activate Window Demanding Attention=Meta+Ctrl+A,Meta+Ctrl+A,Activate Window Demanding Attention @@ -259,11 +259,11 @@ view_zoom_out=Meta+-,Meta+-,Zoom Out [mediacontrol] _k_friendly_name=Media Controller -mediavolumedown=none,,Media volume down -mediavolumeup=none,,Media volume up +mediavolumedown=none,none,Media volume down +mediavolumeup=none,none,Media volume up nextmedia=Media Next,Media Next,Media playback next pausemedia=Media Pause,Media Pause,Pause media playback -playmedia=none,,Play media playback +playmedia=none,none,Play media playback playpausemedia=Media Play,Media Play,Play/Pause media playback previousmedia=Media Previous,Media Previous,Media playback previous stopmedia=Media Stop,Media Stop,Stop media playback diff --git a/emacs/.config/emacs-kj/init.el b/emacs/.config/emacs-kj/init.el index 77c68f9..a18a8f0 100644 --- a/emacs/.config/emacs-kj/init.el +++ b/emacs/.config/emacs-kj/init.el @@ -688,11 +688,6 @@ (kill-region (region-beginning) (region-end)) (backward-kill-word (or arg 1)))) -(let ((google-config-file - (expand-file-name "google.el" user-emacs-directory))) - (when (file-exists-p google-config-file) - (load-file google-config-file))) - (define-key isearch-mode-map (kbd "C-RET") #'isearch-exit-other-end) ;; Why does C-RET not always work? @@ -822,3 +817,8 @@ ;;; Email settings (setq message-kill-buffer-on-exit t) ;; After sending a message. + +(let ((google-config-file + (expand-file-name "google.el" user-emacs-directory))) + (when (file-exists-p google-config-file) + (load-file google-config-file))) diff --git a/emacs/.config/emacs-kj/lisp/kj-org.el b/emacs/.config/emacs-kj/lisp/kj-org.el index 5caa667..e1e7064 100644 --- a/emacs/.config/emacs-kj/lisp/kj-org.el +++ b/emacs/.config/emacs-kj/lisp/kj-org.el @@ -9,7 +9,7 @@ org-return-follows-link t ) - ;; If you use `org' and don't want your org files in the default location below, +;; If you use `org' and don't want your org files in the default location below, ;; change `org-directory'. It must be set before org loads! (setq org-directory "~/org/") (setq org-todo-keywords |