1 files changed, 22 insertions, 8 deletions

@@ -17,7 +17,7 @@
   "Where various Emacs files are placed."
   :makedir)
 
-(defdir sync/ "~/Sync/"
+(defdir sync/ "~/sync/"
   "My Syncthing directory."
   :makedir)
 
@@ -142,7 +142,7 @@
 
 ;; Text editing
 (setq-default fill-column 80
-              sentence-end-double-space t
+              sentence-end-double-space nil
               tab-width 8
               tab-always-indent 'complete)
 (global-so-long-mode)
@@ -295,13 +295,27 @@ N spaces."
   (interactive "*p")
   (cycle-spacing (- n)))
 
+(defun +comment-dwim (&optional prefix)
+  "Comments or uncomments current line or region.
+When called with PREFIX, start a comment at the end of the
+current line."
+  (interactive "P")
+  (if prefix
+      (comment-indent)
+    (apply #'comment-or-uncomment-region
+           (if (region-active-p)
+               (list (region-beginning)
+                     (region-end))
+             (list (line-beginning-position)
+                   (line-end-position))))))
+
 (global-set-key [remap eval-expression] #'pp-eval-expression)
 (global-set-key (kbd "M-o") #'other-window|switch-buffer)
-(global-set-key (kbd "C-x 0") #'delete-window|bury-buffer)
-(global-set-key (kbd "M-SPC") #'+cycle-spacing)
+(global-set-key [remap delete-window] #'delete-window|bury-buffer)
+(global-set-key [remap cycle-spacing] #'+cycle-spacing)
 (global-set-key (kbd "C-x C-k") #'kill-this-buffer)
-(global-set-key (kbd "C-/") #'undo-only)
-(global-set-key (kbd "C-?") #'undo-redo)
+(global-set-key [remap comment-dwim] #'+comment-dwim)
+(global-set-key [remap undo] #'undo-only)
 
 (global-set-key [f10] #'tmm-menubar)
 (advice-add 'tmm-add-prompt :after 'minibuffer-hide-completions)
@@ -408,7 +422,7 @@ N spaces."
 (use-package vertico-directory
   :after vertico
   :bind (:map vertico-map
-              ("C-DEL" . vertico-directory-delete-word))
+              ("C-<backspace>" . vertico-directory-delete-word))
   :hook (rfn-shadow-update-overlay-hook . vertico-directory-tidy))
 
 (use-package vertico-mouse
@@ -531,7 +545,7 @@ N spaces."
 (use-package orderless
   :ensure t :demand t
   :init
-  (setopt completion-styles '(substring orderless basic)
+  (setopt completion-styles '(orderless substring basic)
           completion-category-defaults nil
           completion-category-overrides
           '((file (styles basic partial-completion orderless)))))