1 files changed, 39 insertions, 4 deletions
diff --git a/shoshin-config.el b/shoshin-config.el
index 803af5d..f14c432 100644
--- a/shoshin-config.el
+++ b/shoshin-config.el
@@ -1,19 +1,54 @@
 ;;; shoshimacs.el --- Beginner's Mind Config  -*- lexical-binding:t -*-
 
 ;;; Package Management
-(when (string< "28.1" emacs-version)
+(when (< emacs-major-version 28)
   (add-to-list 'package-archives '("nongnu" . "https://elpa.nongnu.org/nongnu/")))
 
+(when (and (functionp #'native-comp-available-p) (native-comp-available-p))
+  (setq native-comp-always-compile t
+	package-native-compile t))
+
+;;; Major Keybinding
+(package-install 'xah-fly-keys)
+(xah-fly-keys-set-layout "qwerty")
+(setq xah-fly-use-control-key nil
+      xah-fly-use-meta-key nil)
+(xah-fly-keys t)
+
 ;;; Completion
+(setq completion-styles '(flex basic partial-completion emacs22)
+      completion-cycle-threshold 3
+      tab-always-indent 'complete)
+
 (package-install 'consult)
+(define-key xah-fly-leader-key-map (kbd "f") #'consult-buffer)
+(define-key xah-fly-command-map (kbd "n") #'consult-line)
 
-(package-install 'corfu)
+(global-set-key (kbd "C-x b") #'consult-buffer)
+(define-key xah-fly-leader-key-map (kbd "f") #'consult-buffer)
+(define-key xah-fly-command-map (kbd "n") #'consult-line)
 
-(package-install 'marginalia)
+(package-install 'corfu)
+(setq corfu-auto t
+      corfu-cycle t
+      corfu-quit-no-match t)
+(global-corfu-mode t)
 
 (package-install 'embark)
 
+(package-install 'marginalia)
+(marginalia-mode)
+
 (package-install 'vertico)
+(setq minibuffer-prompt-properties
+      '(read-only t cursor-intangible t face minibuffer-prompt))
+(add-hook 'minibuffer-setup-hook #'cursor-intangible-mode)
+(setq read-extended-command-predicate
+      #'command-completion-default-include-p)
+(setq enable-recursive-minibuffers t)
+
+(package-install 'which-key)
+(which-key-mode)
 
 ;;; Editing
 (electric-pair-mode)
@@ -42,7 +77,7 @@
 
 (package-install 'darkroom)
 
-(set-frame-font "Victor Mono" t t t)
+(set-frame-font "Victor Mono")
 
 (global-hl-line-mode t)