@@ -44,13 +44,13 @@ :config (crux-reopen-as-root-mode -1)) 
 ;;; Styles
 
-(custom-set-variables
  ;; I prefer an always-visible cursor.  Feels less distracting.
- '(blink-cursor-mode nil)
- ;; Disable all the bars, unless on OSX, in which case, keep the menu bar.
- `(menu-bar-mode ,(eq system-type 'darwin))
- '(scroll-bar-mode nil)
- '(tool-bar-mode nil))
+(blink-cursor-mode -1)
+;; Disable all the bars, unless on OSX, in which case, keep the menu bar.
+(unless (eq system-type 'darwin)
+  (menu-bar-mode -1))
+(scroll-bar-mode -1)
+(tool-bar-mode -1)
 (set-fringe-mode '(4 . 4))
 
 ;; Ring the bell sometimes, but not so often
@@ -95,9 +95,8 @@ (add-to-list 'default-frame-alist '(height . 40)) 
 ;;; Dates & Times
 
-(custom-set-variables
- '(calendar-week-start-day 1)
- '(calendar-date-style 'iso))
+(defvar calendar-week-start-day 1)
+(defvar calendar-date-style 'iso)
 
 (defun insert-date (prefix)
   "Insert the current date.
@@ -120,20 +119,14 @@ (insert (format-time-string format)))) 
 ;;; Keybindings
 
-;; I think =set-keyboard-coding-system= stops OS X from doing something
-;; annoying to add accents.  The modifier setup is to match my
-;; re-arrangement of modifiers on OSX: Cmd on the outside, then
-;; Option/alt, then Control.
-
 (when (eq system-type 'darwin)
-  (custom-set-variables
-   '(mac-option-modifier 'meta)
-   '(mac-right-option-modifier 'none)
-   '(mac-control-modifier 'control)
-   '(mac-right-control-modifier 'left)
-   '(mac-command-modifier 'super)
-   '(mac-right-command-modifier 'left)
-   '(mac-function-modifier 'hyper)))
+  (setq mac-option-modifier 'meta
+        mac-right-option-modifier 'none
+        mac-control-modifier 'control
+        mac-right-control-modifier 'left
+        mac-command-modifier 'super
+        mac-right-command-modifier 'left
+        mac-function-modifier 'hyper))
 
 (use-package general
   :functions (general-unbind general-define-key)
@@ -530,13 +523,12 @@ :defer 1) 
 ;;; Directories
 
-(custom-set-variables
- '(dired-dwim-target t)
- '(dired-recursive-copies 'top)
- '(dired-listing-switches "-alh")
- '(dired-recursive-deleted (if delete-by-moving-to-trash
-                              'always
-                            'top)))
+(setq dired-dwim-target t
+      dired-recursive-copies 'top
+      dired-listing-switches "-alh"
+      dired-recursive-deleted (if delete-by-moving-to-trash
+                                  'always
+                                'top))
 
 (add-hook 'dired-mode-hook
           (lambda ()
@@ -625,11 +617,11 @@ ;;; Major modes
 
 ;;;; js
-(custom-set-variables '(js-indent-level 2)
-                      '(js-enabled-frameworks '(javascript)))
+(setq js-indent-level 2
+      js-enabled-frameworks '(javascript))
 
 ;;;; typescript
-(custom-set-variables '(typescript-indent-level 2))
+(setq typescript-indent-level 2)
 (autoload 'ansi-color-apply-on-region "ansi-color")
 (defun colorise-compilation-buffer ()
   (ansi-color-apply-on-region compilation-filter-start (point-max)))
@@ -657,7 +649,7 @@ (lambda ()                     (setq-local indent-tabs-mode t)))
 
 ;;;; nix
-(custom-set-variables '(nix-indent-function #'nix-indent-line))
+(setq nix-indent-function #'nix-indent-line)
 
 (use-package nix-update
   :commands (nix-update-fetch))
@@ -667,7 +659,7 @@ (with-eval-after-load 'git-gutter-fringe               (fringe-helper-define 'flycheck-fringe-bitmap-double-arrow '(center repeated)
                 "XXX....."))
 
-(custom-set-variables '(gitlab-ci-url "https://gitlab.satoshipay.tech"))
+(setq gitlab-ci-url "https://gitlab.satoshipay.tech")
 (use-package gitlab-ci-mode-flycheck
   :ghook ('gitlab-ci-mode-hook (list #'gitlab-ci-mode-flycheck-enable
                                      #'flycheck-mode)))
@@ -677,7 +669,7 @@ (use-package gitignore-mode   :mode ((".dockerignore\\'" . gitignore-mode)))
 
 ;;;; kubernetes
-(custom-set-variables '(k8s-site-docs-version "v1.13"))
+(setq k8s-site-docs-version "v1.13")
 
 ;;;; beancount
 
@@ -712,8 +704,8 @@ :ghook '(ledger-mode-hook)) 
 ;;;; org
 
-(custom-set-variables '(org-ellipsis "…")
-                      `(org-directory "~/Documents/org"))
+(setq org-ellipsis "…"
+      org-directory "~/Documents/org")
 
 (use-package org-journal
   :commands (org-journal-new-date-entry