From fb71358a8d622b7bb6eca3907fcb31fc8365e91e Mon Sep 17 00:00:00 2001 From: Raphael Roberts Date: Mon, 3 Feb 2020 21:27:51 -0600 Subject: [PATCH] Initial config not working --- custom.el | 122 ++++++++++++++++++++++++++++++++++++++++++++++----- settings.org | 31 ++++++------- 2 files changed, 128 insertions(+), 25 deletions(-) diff --git a/custom.el b/custom.el index d8f33e1..306759f 100644 --- a/custom.el +++ b/custom.el @@ -13,6 +13,14 @@ '(browse-kill-ring-display-duplicates nil) '(company-show-numbers t) + '(custom-safe-themes + (quote + ("b9e9ba5aeedcc5ba8be99f1cc9301f6679912910ff92fdf7980929c2fc83ab4d" + "84d2f9eeb3f82d619ca4bfffe5f157282f4779732f48a5ac1484d94d5ff5b279" + "c74e83f8aa4c78a121b52146eadb792c9facc5b1f02c917e3dbb454fca931223" + "855eb24c0ea67e3b64d5d07730b96908bac6f4cd1e5a5986493cbac45e9d9636" + "3c83b3676d796422704082049fc38b6966bcad960f896669dfc21a7a37a748fa" + default))) '(delete-by-moving-to-trash t) '(dired-listing-switches "-alhv") @@ -89,7 +97,9 @@ nil) '(package-selected-packages (quote - (counsel + (paradox + smart-mode-line-atom-one-dark-theme + counsel ibuffer-tramp dockerfile-mode docker @@ -103,7 +113,6 @@ elmacro ace-window winum - spaceline use-package kv lispy @@ -149,11 +158,104 @@ '(safe-local-variable-values (quote ((project-venv)))) '(scroll-bar-mode nil) + '(sml/mode-width + (if (eq (powerline-current-separator) + (quote arrow)) + (quote right) + (quote full))) + '(sml/pos-id-separator + (quote + ("" + (:propertize " " + face + powerline-active1) + (:eval (propertize + " " + (quote display) + (funcall + (intern + (format + "powerline-%s-%s" + (powerline-current-separator) + (car powerline-default-separator-dir))) + (quote powerline-active1) + (quote powerline-active2)))) + (:propertize " " + face + powerline-active2)))) + '(sml/pos-minor-modes-separator + (quote + ("" + (:propertize " " + face + powerline-active1) + (:eval (propertize + " " + (quote display) + (funcall + (intern + (format + "powerline-%s-%s" + (powerline-current-separator) + (cdr powerline-default-separator-dir))) + (quote powerline-active1) + (quote sml/global)))) + (:propertize " " + face + sml/global)))) + '(sml/pre-id-separator + (quote + ("" + (:propertize " " + face + sml/global) + (:eval (propertize + " " + (quote display) + (funcall + (intern + (format + "powerline-%s-%s" + (powerline-current-separator) + (car powerline-default-separator-dir))) + (quote sml/global) + (quote powerline-active1)))) + (:propertize " " + face + powerline-active1)))) + '(sml/pre-minor-modes-separator + (quote + ("" + (:propertize " " + face + powerline-active2) + (:eval (propertize + " " + (quote display) + (funcall + (intern + (format + "powerline-%s-%s" + (powerline-current-separator) + (cdr powerline-default-separator-dir))) + (quote powerline-active2) + (quote powerline-active1)))) + (:propertize " " + face + powerline-active1)))) + '(sml/pre-modes-separator + (propertize + " " + (quote face) + (quote sml/modes))) + '(sml/theme + (quote atom-one-dark)) '(tool-bar-mode nil) '(tramp-use-ssh-controlmaster-options nil nil - (tramp))) + (tramp)) + '(winum-mode 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. @@ -162,17 +264,17 @@ '(default ((t (:family "Roboto Mono" - :foundry "outline" - :slant normal - :weight normal - :height 113 - :width normal)))) + :foundry "outline" + :slant normal + :weight normal + :height 113 + :width normal)))) '(company-tooltip-search ((t (:background "#f1fa8c" - :foreground "dark gray")))) + :foreground "dark gray")))) '(line-number-current-line ((t (:foreground "yellow" - :weight bold))))) + :weight bold))))) (put 'upcase-region 'disabled nil) diff --git a/settings.org b/settings.org index d0f8bb3..23c31c8 100644 --- a/settings.org +++ b/settings.org @@ -686,23 +686,24 @@ put executables in elpy-rpc-venv in path :config (mode-line-bell-mode)) #+END_SRC -** Spaceline +** Smart mode line #+BEGIN_SRC emacs-lisp - (use-package spaceline-config + (use-package smart-mode-line :config (use-package winum - :bind - (:map winum-keymap - (("M-0" . winum-select-window-0-or-10) - ("M-1" . winum-select-window-1) - ("M-2" . winum-select-window-2) - ("M-3" . winum-select-window-3) - ("M-4" . winum-select-window-4) - ("M-5" . winum-select-window-5) - ("M-6" . winum-select-window-6) - ("M-7" . winum-select-window-7) - ("M-8" . winum-select-window-8)))) - (spaceline-spacemacs-theme) - (winum-mode)) + :bind + (:map winum-keymap + (("M-0" . winum-select-window-0-or-10) + ("M-1" . winum-select-window-1) + ("M-2" . winum-select-window-2) + ("M-3" . winum-select-window-3) + ("M-4" . winum-select-window-4) + ("M-5" . winum-select-window-5) + ("M-6" . winum-select-window-6) + ("M-7" . winum-select-window-7) + ("M-8" . winum-select-window-8)))) + (use-package winum + :config (winum-mode)) + (sml/setup)) #+END_SRC ** Theme #+BEGIN_SRC emacs-lisp