diff options
| -rw-r--r-- | Doom/.doom.d/modules/private/oreoline/config.el | 69 | ||||
| -rw-r--r-- | Doom/.doom.d/org/config.org | 57 | ||||
| -rw-r--r-- | install.sh | 8 |
3 files changed, 67 insertions, 67 deletions
diff --git a/Doom/.doom.d/modules/private/oreoline/config.el b/Doom/.doom.d/modules/private/oreoline/config.el index 7616ca4..c6c3da3 100644 --- a/Doom/.doom.d/modules/private/oreoline/config.el +++ b/Doom/.doom.d/modules/private/oreoline/config.el @@ -3,7 +3,7 @@ (use-package! telephone-line :hook (after-init . telephone-line-mode) :init - ; Faces + ; Faces (defface my-accent-dark '((t (:foreground "Black" :background "Cadet Blue"))) "") (defface my-evil-dark '((t (:foreground "White" :background "Black"))) "") (defface my-accent-light '((t (:foreground "black" :background "Light Slate Grey"))) "") @@ -11,50 +11,49 @@ ;; Set telephone line faces (setq telephone-line-faces - '((evil . (my-evil-dark . my-evil-dark)) - (modal . telephone-line-modal-face) - (ryo . telephone-line-ryo-modal-face) - (accent . (my-accent-dark . telephone-line-accent-inactive)) - (nil mode-line . mode-line-inactive))) + '((evil . (my-evil-dark . my-evil-dark)) + (modal . telephone-line-modal-face) + (ryo . telephone-line-ryo-modal-face) + (accent . (my-accent-dark . telephone-line-accent-inactive)) + (nil mode-line . mode-line-inactive))) (when (featurep! +light) (setq telephone-line-faces - '((evil . (my-evil-light . my-evil-light)) - (modal . telephone-line-modal-face) - (ryo . telephone-line-ryo-modal-face) - (accent . (my-accent-light . telephone-line-accent-inactive)) - (nil mode-line . mode-line-inactive)))) + '((evil . (my-evil-light . my-evil-light)) + (modal . telephone-line-modal-face) + (ryo . telephone-line-ryo-modal-face) + (accent . (my-accent-light . telephone-line-accent-inactive)) + (nil mode-line . mode-line-inactive)))) - ; Seperators + ; Seperators (setq telephone-line-primary-left-separator 'telephone-line-abs-left - telephone-line-secondary-left-separator 'telephone-line-identity-hollow-left - telephone-line-primary-right-separator 'telephone-line-abs-right - telephone-line-secondary-right-separator 'telephone-line-identity-hollow-right) + telephone-line-secondary-left-separator 'telephone-line-identity-hollow-left + telephone-line-primary-right-separator 'telephone-line-abs-right + telephone-line-secondary-right-separator 'telephone-line-identity-hollow-right) - ; LSP segment + ; LSP segment (telephone-line-defsegment +oreoline-lsp-segment () - (after! lsp-mode - (if (lsp-workspaces) - (propertize "") - (propertize "")))) + `((:propertize (if (lsp-workspaces) + (propertize "") + (propertize ""))))) - ; LHS + ; LHS (setq telephone-line-lhs - '((evil . (telephone-line-evil-tag-segment - telephone-line-buffer-modified-segment)) - (accent . (telephone-line-vc-segment - telephone-line-filesize-segment - telephone-line-buffer-name-segment - telephone-line-erc-modified-channels-segment - telephone-line-process-segment)) - (nil . ()))) + '((evil . (telephone-line-evil-tag-segment + telephone-line-buffer-modified-segment)) + (accent . (telephone-line-vc-segment + telephone-line-filesize-segment + telephone-line-buffer-name-segment + telephone-line-erc-modified-channels-segment + telephone-line-process-segment)) + (nil . ()))) - ; RHS + ; RHS (setq telephone-line-rhs - '((nil . (telephone-line-misc-info-segment)) - (accent . (telephone-line-major-mode-segment - +oreoline-lsp-segment - telephone-line-flycheck-segment)) - (evil . (telephone-line-airline-position-segment)))) + '((nil . (telephone-line-misc-info-segment)) + (accent . (telephone-line-major-mode-segment + +oreoline-lsp-segment + telephone-line-flycheck-segment)) + (evil . (telephone-line-airline-position-segment)))) :config (size-indication-mode +1)) diff --git a/Doom/.doom.d/org/config.org b/Doom/.doom.d/org/config.org index f6e2e14..36a0644 100644 --- a/Doom/.doom.d/org/config.org +++ b/Doom/.doom.d/org/config.org @@ -55,10 +55,10 @@ Easier to do than just running all those functions manually #+END_SRC *** Keybind #+BEGIN_SRC elisp - (map! - :after dap-mode - :leader - :desc "Start debugging setup" "cD" #'dx:debug) +(map! + :after dap-mode + :leader + :desc "Start debugging setup" "cD" #'dx:debug) #+END_SRC ** Dashboard My very own dashboard config using doom dashboard, with these features: @@ -141,9 +141,9 @@ Keybinds to org-mode for flyspell package Add CMakeLists.txt to projectile-project-roots. #+BEGIN_SRC elisp (after! projectile - (cl-pushnew "CMakeLists.txt" projectile-project-root-files :test 'string=) - (setq projectile-tags-command - "ctags -e -R --exclude=dist --exclude=.ccls --exclude=.ccls-cache")) + (cl-pushnew "CMakeLists.txt" projectile-project-root-files :test 'string=) + (setq projectile-tags-command + "ctags -e -R --exclude=dist --exclude=.ccls --exclude=.ccls-cache")) #+END_SRC * Language Config Configuration for various languages which I feel can be useful @@ -306,7 +306,7 @@ each of the unit tests ran." :localleader :desc "Format buffer" "=" #'omnisharp-code-format-entire-file (:prefix "t" - :desc "Select Test in Project" "t" #'dx:csharp/get-unit-test-in-project))) + :desc "Select Test in Project" "t" #'dx:csharp/get-unit-test-in-project))) #+END_SRC ** Python - I do python development for Python3, so I need to set the flycheck python checker, as well as the interpreter, to be Python3 @@ -325,9 +325,9 @@ each of the unit tests ran." :desc "Start python minor" "c" #'run-python :desc "Format buffer" "=" #'py-yapf-buffer (:prefix "s" - :desc "Send region REPL" "r" #'python-shell-send-region - :desc "Send buffer" "b" #'python-shell-send-buffer - :desc "Send function" "f" #'python-shell-send-defun))) + :desc "Send region REPL" "r" #'python-shell-send-region + :desc "Send buffer" "b" #'python-shell-send-buffer + :desc "Send function" "f" #'python-shell-send-defun))) #+END_SRC ** TypeScript - Typescript (in my opinion) should be indented by 2 @@ -362,6 +362,7 @@ Setup the agenda-files and the org-directory. (after! org (setq org-directory "~/Text" org-agenda-files '("~/Text/") + org-src-window-setup 'split-window-right org-log-repeat 'note)) #+END_SRC *** Org keymap @@ -395,7 +396,7 @@ General keymap :desc "Change theme" "t" #'dx:themes/set-new-theme ; From my own collection :desc "Generate template" "g" #'+gentemplate/generate-template ; From my own collection (:after pdf-view - :desc "Goto page on pdf" "p" #'pdf-view-goto-page) + :desc "Goto page on pdf" "p" #'pdf-view-goto-page) :desc "Reload emacs" "r" #'dx:reload) ; Reload is necessary #+END_SRC ** Counsel @@ -407,8 +408,8 @@ General keymap :after counsel ; Counsel or ivy :desc "M-x" "<SPC>" #'counsel-M-x ; Redefine as M-x because of my muscle memory with spacemacs (:prefix ("s" . "search") - :desc "RipGrep!" "r" #'counsel-rg ; Ripgrep is faster than Ag in most cases and makes me feel cool - :desc "Search Tags" "t" #'counsel-etags-find-tag)); is quicker to do than <SPC>/b, for something that is done so often + :desc "RipGrep!" "r" #'counsel-rg ; Ripgrep is faster than Ag in most cases and makes me feel cool + :desc "Search Tags" "t" #'counsel-etags-find-tag)); is quicker to do than <SPC>/b, for something that is done so often #+END_SRC ** Window - Keybinds to do with windows @@ -451,12 +452,12 @@ General keymap :desc "Undo tree" "u" #'undo-tree-visualize :desc "Narrow to function" "n" #'dx:narrow/toggle-narrow (:after format-all - :desc "Format code" "=" #'format-all-buffer) + :desc "Format code" "=" #'format-all-buffer) (:after lsp - :desc "Format code lsp" "f" #'+default/lsp-format-region-or-buffer - :desc "Execute action" "a" #'lsp-execute-code-action) + :desc "Format code lsp" "f" #'+default/lsp-format-region-or-buffer + :desc "Execute action" "a" #'lsp-execute-code-action) (:after dap-mode - :desc "Debug hydra" "h" #'dap-hydra)) + :desc "Debug hydra" "h" #'dap-hydra)) #+END_SRC ** Projectile - Projectile config, for leader and for project prefix @@ -466,8 +467,8 @@ General keymap :after projectile :desc "Switch to p-buffer" ">" #'projectile-switch-to-buffer ; Opposing <SPC>< which counsel's all buffers (:prefix ("p" . "project") - :desc "Regen tags" "g" #'projectile-regenerate-tags - :desc "Open project files" "f" #'projectile-find-file)) + :desc "Regen tags" "g" #'projectile-regenerate-tags + :desc "Open project files" "f" #'projectile-find-file)) #+END_SRC ** Fonts - Fonts keybinds (prefix "z") for messing with fonts temp on a buffer @@ -503,17 +504,17 @@ General keymap :leader :desc "Shell command" "!" #'async-shell-command ; Better than M-! (:prefix ("b" . "buffers") ; Buffers - :desc "Close buffer" "d" #'doom/kill-this-buffer-in-all-windows) + :desc "Close buffer" "d" #'doom/kill-this-buffer-in-all-windows) (:prefix ("f" . "files") - :desc "Open dotfiles" "p" #'(lambda () (interactive) (doom-project-find-file "~/Dotfiles"))) + :desc "Find in dotfiles" "p" #'(lambda () (interactive) (doom-project-find-file "~/Dotfiles"))) (:prefix ("o" . "open") - (:when (featurep! private rss newsticker) - :desc "Open newsticker" "n" #'+rss/open-newsticker - :desc "Close newsticker" "N" #'+rss/close-newsticker) - (:after org - :desc "Calendar" "c" #'=calendar)) + (:when (featurep! private rss newsticker) + :desc "Open newsticker" "n" #'+rss/open-newsticker + :desc "Close newsticker" "N" #'+rss/close-newsticker) + (:after org + :desc "Calendar" "c" #'=calendar)) (:prefix ("n" . "notes") - :desc "Open notes in dired" "-" #'(lambda () (interactive) (dired org-directory)))) + :desc "Open notes in dired" "-" #'(lambda () (interactive) (dired org-directory)))) #+END_SRC *** Non-leader #+BEGIN_SRC elisp @@ -4,8 +4,8 @@ folders=`find . -maxdepth 1 -type 'd' -not -name '.git' -not -name '.'`; # Symlink profiles for pkg in $folders; do - echo "Stowing " $pkg; - stow $pkg + echo "Stowing " $pkg; + stow $pkg done # Generate folders @@ -18,7 +18,7 @@ mkdir ~/School; # get templates declare -a templates=("CTemplate" "CPPTemplate" "PythonTemplate" - "NodeTemplate" "ArduinoTemplate"); + "NodeTemplate" "ArduinoTemplate"); for template in ${templates[@]}; do - git clone https://github.com/odavep/$template ~/Code/Templates/$template; + git clone https://github.com/odavep/$template ~/Code/Templates/$template; done |