diff --git a/conf.org b/conf.org index 022bcb0..cb2f0ae 100644 --- a/conf.org +++ b/conf.org @@ -53,8 +53,8 @@ work in progress #+BEGIN_SRC emacs-lisp (use-package spacemacs-theme :defer t - :custom - (spacemacs-theme-custom-colors '((lnum . "#64707c")))) + :config + (setq spacemacs-theme-custom-colors '((lnum . "#64707c")))) (defvar nd/theme 'spacemacs-dark) (defvar nd/theme-window-loaded nil) @@ -113,22 +113,20 @@ work in progress :delight :init (helm-mode 1) - :custom - (helm-autoresize-max-height 0) - (helm-autoresize-max-height 40) - (helm-M-x-fuzzy-match t) - (helm-buffers-fuzzy-matching t) - (helm-recentf-fuzzy-match t) - (helm-semantic-fuzzy-match t) - (helm-imenu-fuzzy-match t) - (helm-scroll-amount 8) :config + (setq helm-autoresize-max-height 0 + helm-autoresize-max-height 40 + helm-M-x-fuzzy-match t + helm-buffers-fuzzy-matching t + helm-recentf-fuzzy-match t + helm-semantic-fuzzy-match t + helm-imenu-fuzzy-match t + helm-scroll-amount 8) (add-to-list 'display-buffer-alist `(,(rx bos "*helm" (* not-newline) "*" eos) (display-buffer-in-side-window) (inhibit-same-window . t) (window-height . 0.4))) - (helm-autoresize-mode 1) (require 'helm-config)) #+END_SRC @@ -146,17 +144,20 @@ work in progress #+BEGIN_SRC emacs-lisp (use-package ace-window :ensure t - :custom - (aw-background t) - :custom-face - (aw-leading-char-face ((t (:foreground "#292b2e" :background "#bc6ec5":height 1.0 :box nil))))) + :config + (setq aw-background t) + (set-face-attribute 'aw-leading-char-face nil + :foreground "#292b2e" + :background "#bc6ec5" + :height 1.0 + :box nil)) #+END_SRC ** avy #+BEGIN_SRC emacs-lisp (use-package avy :ensure t - :custom - (avy-background t)) + :config + (setq avy-background t)) #+END_SRC ** sudo edit #+BEGIN_SRC emacs-lisp @@ -171,27 +172,33 @@ work in progress #+END_SRC ** calfw #+BEGIN_SRC emacs-lisp - (use-package calfw - :init - :ensure t) +(use-package calfw + :ensure t + :config + (setq cfw:fchar-junction ?╋ + cfw:fchar-vertical-line ?┃ + cfw:fchar-horizontal-line ?━ + cfw:fchar-left-junction ?┣ + cfw:fchar-right-junction ?┫ + cfw:fchar-top-junction ?┯ + cfw:fchar-top-left-corner ?┏ + cfw:fchar-top-right-corner ?┓)) #+END_SRC ** undo tree #+BEGIN_SRC emacs-lisp (use-package undo-tree :ensure t :delight - :custom - (undo-tree-visualizer-diff t) :config + (setq undo-tree-visualizer-diff t) (global-undo-tree-mode)) #+END_SRC ** fill-column-indicator #+BEGIN_SRC emacs-lisp (use-package fill-column-indicator :ensure t - :init - :custom - (fci-rule-use-dashes t) + :config + (setq fci-rule-use-dashes t) :hook (prog-mode . fci-mode)) #+END_SRC @@ -204,11 +211,10 @@ work in progress #+BEGIN_SRC emacs-lisp (use-package spaceline :ensure t - :custom - (powerline-default-separator 'arrow) - (spaceline-buffer-size-p nil) :config (require 'spaceline-config) + (setq powerline-default-separator 'arrow + spaceline-buffer-size-p nil) (spaceline-spacemacs-theme)) #+END_SRC * library @@ -382,11 +388,9 @@ NOTES: #+BEGIN_SRC emacs-lisp (use-package haskell-mode :ensure t - :custom - (haskell-compile-command - "ghc -dynamic -Wall -ferror-spans -fforce-recomp -c %s" - "enable dynamic linking by default") - (haskell-interactive-popup-errors nil)) + :config + (setq haskell-compile-command "ghc -dynamic -Wall -ferror-spans -fforce-recomp -c %s" + haskell-interactive-popup-errors nil)) #+END_SRC * org-mode ** basic @@ -1667,8 +1671,7 @@ I like being evil. All package and custom bindings go here. :init (setq evil-collection-modes-list '(dired flycheck company which-key helm minibuffer mu4e ediff)) - :custom - (evil-collection-setup-minibuffer t) + (setq evil-collection-setup-minibuffer t) :config (evil-collection-init)) #+END_SRC diff --git a/init.el b/init.el index e664bf5..b583581 100644 --- a/init.el +++ b/init.el @@ -19,38 +19,6 @@ ;; If you edit it by hand, you could mess it up, so be careful. ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. - '(avy-background t) - '(aw-background t) - '(cfw:fchar-horizontal-line 9473) - '(cfw:fchar-junction 9547) - '(cfw:fchar-left-junction 9507) - '(cfw:fchar-right-junction 9515) - '(cfw:fchar-top-junction 9519) - '(cfw:fchar-top-left-corner 9487) - '(cfw:fchar-top-right-corner 9491) - '(cfw:fchar-vertical-line 9475) - '(evil-collection-setup-minibuffer t) - '(fci-rule-use-dashes t) - '(haskell-compile-command "ghc -dynamic -Wall -ferror-spans -fforce-recomp -c %s" t) - '(haskell-interactive-popup-errors nil) - '(helm-M-x-fuzzy-match t) - '(helm-autoresize-max-height 40) - '(helm-buffers-fuzzy-matching t) - '(helm-imenu-fuzzy-match t t) - '(helm-recentf-fuzzy-match t t) - '(helm-scroll-amount 8) - '(helm-semantic-fuzzy-match t t) '(package-selected-packages (quote - (yasnippet-snippets flycheck rainbow-delimiters-mode helm evil-collection haskell-mode fill-column-indicator gtklp delight browse-kill-ring evil-org-agenda evil-org evil calfw calfw-org yaml-mode which-key use-package typit systemd sudo-edit spaceline rainbow-mode rainbow-delimiters pkgbuild-mode pdf-tools org-bullets lua-mode ess elpy diff-hl beacon ace-window))) - '(powerline-default-separator (quote arrow)) - '(spaceline-buffer-size-p nil t) - '(spacemacs-theme-custom-colors (quote ((lnum . "#64707c")))) - '(undo-tree-visualizer-diff t)) -(custom-set-faces - ;; custom-set-faces was added by Custom. - ;; If you edit it by hand, you could mess it up, so be careful. - ;; Your init file should contain only one such instance. - ;; If there is more than one, they won't work right. - '(aw-leading-char-face ((t (:foreground "#292b2e" :background "#bc6ec5" :height 1.0 :box nil))))) -(put 'dired-find-alternate-file 'disabled nil) + (yasnippet-snippets flycheck rainbow-delimiters-mode helm evil-collection haskell-mode fill-column-indicator gtklp delight browse-kill-ring evil-org-agenda evil-org evil calfw calfw-org yaml-mode which-key use-package typit systemd sudo-edit spaceline rainbow-mode rainbow-delimiters pkgbuild-mode pdf-tools org-bullets lua-mode ess elpy diff-hl beacon ace-window))))