From 93c4a76a0d3022358fa61d3306e893d94da9fe94 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Fri, 27 Oct 2023 10:31:36 +0100
Subject: [PATCH] Re-enable new custom-defaults-config, remove projectile

---
 home/emacs/init.el                            |  3 +-
 home/emacs/modules/custom-default-config.el   | 44 +++++++++++++++++++
 ...aults-config.el => ref-defaults-config.el} |  0
 system/emacs.nix                              |  1 -
 4 files changed, 45 insertions(+), 3 deletions(-)
 create mode 100644 home/emacs/modules/custom-default-config.el
 rename home/emacs/modules/{custom-defaults-config.el => ref-defaults-config.el} (100%)

diff --git a/home/emacs/init.el b/home/emacs/init.el
index fc9126d2..92102838 100644
--- a/home/emacs/init.el
+++ b/home/emacs/init.el
@@ -34,8 +34,7 @@
 (setq user-full-name "Evie Litherland-Smith"
       user-mail-address "evie@xenia.me.uk")
 
-;; TODO customise and then re-enable
-;; (require 'custom-defaults-config)
+(require 'custom-defaults-config)
 (require 'custom-email-config)
 (require 'custom-feed-config)
 (require 'custom-ide-config)
diff --git a/home/emacs/modules/custom-default-config.el b/home/emacs/modules/custom-default-config.el
new file mode 100644
index 00000000..71bec04b
--- /dev/null
+++ b/home/emacs/modules/custom-default-config.el
@@ -0,0 +1,44 @@
+;;; custom-defaults-config.el -*- lexical-binding: t; -*-
+
+;;; Code:
+(setq load-prefer-newer t
+      indent-tabs-mode nil
+      global-auto-revert-non-file-buffers t
+      dired-auto-revert-buffer t
+      dired-dwim-target t
+      tab-always-indent 'complete
+      completion-cycle-threshold 3
+      completions-detailed t
+      xref-show-definitions-function #'xref-show-definitions-completing-read
+      kill-do-not-save-duplicates t
+      auto-window-vscroll nil
+      fast-but-imprecise-scrolling t
+      scroll-conservatively 101
+      scroll-margin 0
+      scroll-preserve-screen-position 1)
+
+(global-auto-revert-mode +1)
+(delete-selection-mode)
+
+;; define a key to define the word at point.
+(keymap-set global-map "M-#" #'dictionary-lookup-definition)
+
+;; turn on spell checking, if available.
+(with-eval-after-load 'ispell
+  (when (executable-find ispell-program-name)
+    (add-hook 'text-mode-hook #'flyspell-mode)
+    (add-hook 'prog-mode-hook #'flyspell-prog-mode)))
+
+;; window movement hydra (TODO)
+(when (require 'hydra nil :noerror)
+  (defhydra window (global-map "C-c w")
+    "Window movement"
+    ("u" winner-undo)
+    ("r" winner-redo)
+    ("n" windmove-down)
+    ("p" windmove-up)
+    ("b" windmove-left)
+    ("f" windmove-right)))
+
+;; Make shebang (#!) file executable when saved
+(add-hook 'after-save-hook #'executable-make-buffer-file-executable-if-script-p)
diff --git a/home/emacs/modules/custom-defaults-config.el b/home/emacs/modules/ref-defaults-config.el
similarity index 100%
rename from home/emacs/modules/custom-defaults-config.el
rename to home/emacs/modules/ref-defaults-config.el
diff --git a/system/emacs.nix b/system/emacs.nix
index 0e3ef0c6..7ef35de0 100644
--- a/system/emacs.nix
+++ b/system/emacs.nix
@@ -55,7 +55,6 @@
           org-journal
 
           # project-packages
-          projectile
           magit
 
           # ui-packages