oreodave/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

~spaces -> tabs

Browse Source 
Formatting included
This commit is contained in:
dx
2020-05-04 05:18:41 +01:00
parent 72725dd00d
commit 881daaa8a8
3 changed files with 67 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
Doom/.doom.d/modules/private/oreoline/config.el
View File

@@ -3,7 +3,7 @@
(use-package! telephone-line (use-package! telephone-line
:hook (after-init . telephone-line-mode) :hook (after-init . telephone-line-mode)
:init :init
; Faces ; Faces
(defface my-accent-dark '((t (:foreground "Black" :background "Cadet Blue"))) "") (defface my-accent-dark '((t (:foreground "Black" :background "Cadet Blue"))) "")
(defface my-evil-dark '((t (:foreground "White" :background "Black"))) "") (defface my-evil-dark '((t (:foreground "White" :background "Black"))) "")
(defface my-accent-light '((t (:foreground "black" :background "Light Slate Grey"))) "") (defface my-accent-light '((t (:foreground "black" :background "Light Slate Grey"))) "")
@@ -11,50 +11,49 @@
;; Set telephone line faces ;; Set telephone line faces
(setq telephone-line-faces (setq telephone-line-faces
'((evil . (my-evil-dark . my-evil-dark)) '((evil . (my-evil-dark . my-evil-dark))
(modal . telephone-line-modal-face) (modal . telephone-line-modal-face)
(ryo . telephone-line-ryo-modal-face) (ryo . telephone-line-ryo-modal-face)
(accent . (my-accent-dark . telephone-line-accent-inactive)) (accent . (my-accent-dark . telephone-line-accent-inactive))
(nil mode-line . mode-line-inactive))) (nil mode-line . mode-line-inactive)))
(when (featurep! +light) (when (featurep! +light)
(setq telephone-line-faces (setq telephone-line-faces
'((evil . (my-evil-light . my-evil-light)) '((evil . (my-evil-light . my-evil-light))
(modal . telephone-line-modal-face) (modal . telephone-line-modal-face)
(ryo . telephone-line-ryo-modal-face) (ryo . telephone-line-ryo-modal-face)
(accent . (my-accent-light . telephone-line-accent-inactive)) (accent . (my-accent-light . telephone-line-accent-inactive))
(nil mode-line . mode-line-inactive)))) (nil mode-line . mode-line-inactive))))
; Seperators ; Seperators
(setq telephone-line-primary-left-separator 'telephone-line-abs-left (setq telephone-line-primary-left-separator 'telephone-line-abs-left
telephone-line-secondary-left-separator 'telephone-line-identity-hollow-left telephone-line-secondary-left-separator 'telephone-line-identity-hollow-left
telephone-line-primary-right-separator 'telephone-line-abs-right telephone-line-primary-right-separator 'telephone-line-abs-right
telephone-line-secondary-right-separator 'telephone-line-identity-hollow-right) telephone-line-secondary-right-separator 'telephone-line-identity-hollow-right)
; LSP segment ; LSP segment
(telephone-line-defsegment +oreoline-lsp-segment () (telephone-line-defsegment +oreoline-lsp-segment ()
(after! lsp-mode `((:propertize (if (lsp-workspaces)
(if (lsp-workspaces) (propertize "")
(propertize "") (propertize "")))))
(propertize ""))))
; LHS ; LHS
(setq telephone-line-lhs (setq telephone-line-lhs
'((evil . (telephone-line-evil-tag-segment '((evil . (telephone-line-evil-tag-segment
telephone-line-buffer-modified-segment)) telephone-line-buffer-modified-segment))
(accent . (telephone-line-vc-segment (accent . (telephone-line-vc-segment
telephone-line-filesize-segment telephone-line-filesize-segment
telephone-line-buffer-name-segment telephone-line-buffer-name-segment
telephone-line-erc-modified-channels-segment telephone-line-erc-modified-channels-segment
telephone-line-process-segment)) telephone-line-process-segment))
(nil . ()))) (nil . ())))
; RHS ; RHS
(setq telephone-line-rhs (setq telephone-line-rhs
'((nil . (telephone-line-misc-info-segment)) '((nil . (telephone-line-misc-info-segment))
(accent . (telephone-line-major-mode-segment (accent . (telephone-line-major-mode-segment
+oreoline-lsp-segment +oreoline-lsp-segment
telephone-line-flycheck-segment)) telephone-line-flycheck-segment))
(evil . (telephone-line-airline-position-segment)))) (evil . (telephone-line-airline-position-segment))))
:config :config
(size-indication-mode +1)) (size-indication-mode +1))

57
Doom/.doom.d/org/config.org
View File

@@ -55,10 +55,10 @@ Easier to do than just running all those functions manually
#+END_SRC #+END_SRC
*** Keybind *** Keybind
#+BEGIN_SRC elisp #+BEGIN_SRC elisp
(map! (map!
:after dap-mode :after dap-mode
:leader :leader
:desc "Start debugging setup" "cD" #'dx:debug) :desc "Start debugging setup" "cD" #'dx:debug)
#+END_SRC #+END_SRC
** Dashboard ** Dashboard
My very own dashboard config using doom dashboard, with these features: 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. Add CMakeLists.txt to projectile-project-roots.
#+BEGIN_SRC elisp #+BEGIN_SRC elisp
(after! projectile (after! projectile
(cl-pushnew "CMakeLists.txt" projectile-project-root-files :test 'string=) (cl-pushnew "CMakeLists.txt" projectile-project-root-files :test 'string=)
(setq projectile-tags-command (setq projectile-tags-command
"ctags -e -R --exclude=dist --exclude=.ccls --exclude=.ccls-cache")) "ctags -e -R --exclude=dist --exclude=.ccls --exclude=.ccls-cache"))
#+END_SRC #+END_SRC
* Language Config * Language Config
Configuration for various languages which I feel can be useful Configuration for various languages which I feel can be useful
@@ -306,7 +306,7 @@ each of the unit tests ran."
:localleader :localleader
:desc "Format buffer" "=" #'omnisharp-code-format-entire-file :desc "Format buffer" "=" #'omnisharp-code-format-entire-file
(:prefix "t" (: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 #+END_SRC
** Python ** Python
- I do python development for Python3, so I need to set the flycheck python checker, as well as the interpreter, to be Python3 - 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 "Start python minor" "c" #'run-python
:desc "Format buffer" "=" #'py-yapf-buffer :desc "Format buffer" "=" #'py-yapf-buffer
(:prefix "s" (:prefix "s"
:desc "Send region REPL" "r" #'python-shell-send-region :desc "Send region REPL" "r" #'python-shell-send-region
:desc "Send buffer" "b" #'python-shell-send-buffer :desc "Send buffer" "b" #'python-shell-send-buffer
:desc "Send function" "f" #'python-shell-send-defun))) :desc "Send function" "f" #'python-shell-send-defun)))
#+END_SRC #+END_SRC
** TypeScript ** TypeScript
- Typescript (in my opinion) should be indented by 2 - Typescript (in my opinion) should be indented by 2
@@ -362,6 +362,7 @@ Setup the agenda-files and the org-directory.
(after! org (after! org
(setq org-directory "~/Text" (setq org-directory "~/Text"
org-agenda-files '("~/Text/") org-agenda-files '("~/Text/")
org-src-window-setup 'split-window-right
org-log-repeat 'note)) org-log-repeat 'note))
#+END_SRC #+END_SRC
*** Org keymap *** Org keymap
@@ -395,7 +396,7 @@ General keymap
:desc "Change theme" "t" #'dx:themes/set-new-theme ; From my own collection :desc "Change theme" "t" #'dx:themes/set-new-theme ; From my own collection
:desc "Generate template" "g" #'+gentemplate/generate-template ; From my own collection :desc "Generate template" "g" #'+gentemplate/generate-template ; From my own collection
(:after pdf-view (: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 :desc "Reload emacs" "r" #'dx:reload) ; Reload is necessary
#+END_SRC #+END_SRC
** Counsel ** Counsel
@@ -407,8 +408,8 @@ General keymap
:after counsel ; Counsel or ivy :after counsel ; Counsel or ivy
:desc "M-x" "<SPC>" #'counsel-M-x ; Redefine as M-x because of my muscle memory with spacemacs :desc "M-x" "<SPC>" #'counsel-M-x ; Redefine as M-x because of my muscle memory with spacemacs
(:prefix ("s" . "search") (:prefix ("s" . "search")
:desc "RipGrep!" "r" #'counsel-rg ; Ripgrep is faster than Ag in most cases and makes me feel cool :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 "Search Tags" "t" #'counsel-etags-find-tag)); is quicker to do than <SPC>/b, for something that is done so often
#+END_SRC #+END_SRC
** Window ** Window
- Keybinds to do with windows - Keybinds to do with windows
@@ -451,12 +452,12 @@ General keymap
:desc "Undo tree" "u" #'undo-tree-visualize :desc "Undo tree" "u" #'undo-tree-visualize
:desc "Narrow to function" "n" #'dx:narrow/toggle-narrow :desc "Narrow to function" "n" #'dx:narrow/toggle-narrow
(:after format-all (:after format-all
:desc "Format code" "=" #'format-all-buffer) :desc "Format code" "=" #'format-all-buffer)
(:after lsp (:after lsp
:desc "Format code lsp" "f" #'+default/lsp-format-region-or-buffer :desc "Format code lsp" "f" #'+default/lsp-format-region-or-buffer
:desc "Execute action" "a" #'lsp-execute-code-action) :desc "Execute action" "a" #'lsp-execute-code-action)
(:after dap-mode (:after dap-mode
:desc "Debug hydra" "h" #'dap-hydra)) :desc "Debug hydra" "h" #'dap-hydra))
#+END_SRC #+END_SRC
** Projectile ** Projectile
- Projectile config, for leader and for project prefix - Projectile config, for leader and for project prefix
@@ -466,8 +467,8 @@ General keymap
:after projectile :after projectile
:desc "Switch to p-buffer" ">" #'projectile-switch-to-buffer ; Opposing <SPC>< which counsel's all buffers :desc "Switch to p-buffer" ">" #'projectile-switch-to-buffer ; Opposing <SPC>< which counsel's all buffers
(:prefix ("p" . "project") (:prefix ("p" . "project")
:desc "Regen tags" "g" #'projectile-regenerate-tags :desc "Regen tags" "g" #'projectile-regenerate-tags
:desc "Open project files" "f" #'projectile-find-file)) :desc "Open project files" "f" #'projectile-find-file))
#+END_SRC #+END_SRC
** Fonts ** Fonts
- Fonts keybinds (prefix "z") for messing with fonts temp on a buffer - Fonts keybinds (prefix "z") for messing with fonts temp on a buffer
@@ -503,17 +504,17 @@ General keymap
:leader :leader
:desc "Shell command" "!" #'async-shell-command ; Better than M-! :desc "Shell command" "!" #'async-shell-command ; Better than M-!
(:prefix ("b" . "buffers") ; Buffers (: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") (: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") (:prefix ("o" . "open")
(:when (featurep! private rss newsticker) (:when (featurep! private rss newsticker)
:desc "Open newsticker" "n" #'+rss/open-newsticker :desc "Open newsticker" "n" #'+rss/open-newsticker
:desc "Close newsticker" "N" #'+rss/close-newsticker) :desc "Close newsticker" "N" #'+rss/close-newsticker)
(:after org (:after org
:desc "Calendar" "c" #'=calendar)) :desc "Calendar" "c" #'=calendar))
(:prefix ("n" . "notes") (: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 #+END_SRC
*** Non-leader *** Non-leader
#+BEGIN_SRC elisp #+BEGIN_SRC elisp

8
install.sh
View File

@@ -4,8 +4,8 @@ folders=`find . -maxdepth 1 -type 'd' -not -name '.git' -not -name '.'`;
# Symlink profiles # Symlink profiles
for pkg in $folders; do for pkg in $folders; do
echo "Stowing " $pkg; echo "Stowing " $pkg;
stow $pkg stow $pkg
done done
# Generate folders # Generate folders
@@ -18,7 +18,7 @@ mkdir ~/School;
# get templates # get templates
declare -a templates=("CTemplate" "CPPTemplate" "PythonTemplate" declare -a templates=("CTemplate" "CPPTemplate" "PythonTemplate"
"NodeTemplate" "ArduinoTemplate"); "NodeTemplate" "ArduinoTemplate");
for template in ${templates[@]}; do 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 done