Compare commits

...

3 Commits

View File

@ -43,6 +43,7 @@ This function should only modify configuration layer settings."
(auto-completion :variables (auto-completion :variables
auto-completion-return-key-behavior 'complete auto-completion-return-key-behavior 'complete
auto-completion-tab-key-behavior 'cycle) auto-completion-tab-key-behavior 'cycle)
syntax-checking
emacs-lisp emacs-lisp
git git
markdown markdown
@ -53,7 +54,6 @@ This function should only modify configuration layer settings."
shell-default-position 'bottom shell-default-position 'bottom
shell-default-shell 'eshell shell-default-shell 'eshell
shell-enable-smart-eshell t) shell-enable-smart-eshell t)
syntax-checking
(version-control :variables (version-control :variables
version-control-diff-tool 'diff-hl version-control-diff-tool 'diff-hl
version-control-diff-side 'left version-control-diff-side 'left
@ -64,8 +64,8 @@ This function should only modify configuration layer settings."
(c-c++ :variables (c-c++ :variables
c-c++-default-mode-for-headers 'c++-mode c-c++-default-mode-for-headers 'c++-mode
c-c++-backend 'lsp-ccls) c-c++-backend 'lsp-ccls)
(java :variables ;;(java :variables
java-backend 'lsp) ;;java-backend 'lsp)
shell-scripts shell-scripts
spacemacs-layouts spacemacs-layouts
dap dap
@ -83,6 +83,13 @@ This function should only modify configuration layer settings."
pdf pdf
(plantuml :variables (plantuml :variables
org-plantuml-jar-path "~/Documents/Uni/DDSI/Code/PlantUML/plantuml.jar") org-plantuml-jar-path "~/Documents/Uni/DDSI/Code/PlantUML/plantuml.jar")
major-modes
javascript
html
(go :variables
go-backend 'lsp
go-tab-width 4
go-format-before-save t)
) )
;; List of additional packages that will be installed without being ;; List of additional packages that will be installed without being
@ -115,6 +122,8 @@ This function should only modify configuration layer settings."
flycheck-rtags flycheck-rtags
ivy-rtags ivy-rtags
helm-bibtex helm-bibtex
helm-core
helm
) )
;; Defines the behaviour of Spacemacs when installing packages. ;; Defines the behaviour of Spacemacs when installing packages.
@ -251,7 +260,7 @@ It should only modify the values of Spacemacs settings."
;; Default font, or prioritized list of fonts. `powerline-scale' allows to ;; Default font, or prioritized list of fonts. `powerline-scale' allows to
;; quickly tweak the mode-line size to make separators look not too crappy. ;; quickly tweak the mode-line size to make separators look not too crappy.
dotspacemacs-default-font '("Iosevka" dotspacemacs-default-font '("Iosevka"
:size 14 :size 16
:weight normal :weight normal
:width normal) :width normal)
@ -339,7 +348,7 @@ It should only modify the values of Spacemacs settings."
;; If non-nil a progress bar is displayed when spacemacs is loading. This ;; If non-nil a progress bar is displayed when spacemacs is loading. This
;; may increase the boot time on some systems and emacs builds, set it to ;; may increase the boot time on some systems and emacs builds, set it to
;; nil to boost the loading time. (default t) ;; nil to boost the loading time. (default t)
dotspacemacs-loading-progress-bar t dotspacemacs-loading-progress-bar nil
;; If non-nil the frame is fullscreen when Emacs starts up. (default nil) ;; If non-nil the frame is fullscreen when Emacs starts up. (default nil)
;; (Emacs 24.4+ only) ;; (Emacs 24.4+ only)
@ -510,7 +519,7 @@ before packages are loaded."
; Function Keybindings ; Function Keybindings
(global-set-key [f3] 'other-window) (global-set-key [f3] 'other-window)
(global-set-key [f4] 'ivy-switch-buffer) (global-set-key [f4] 'ivy-switch-buffer)
(global-set-key [f5] 'delete-other-windows) (global-set-key [f5] 'delete-window)
(global-set-key [f6] 'counsel-recentf) (global-set-key [f6] 'counsel-recentf)
(windmove-default-keybindings) (windmove-default-keybindings)
; Add dired in recentf ; Add dired in recentf
@ -527,7 +536,8 @@ before packages are loaded."
(message "No Compilation Errors!"))))) (message "No Compilation Errors!")))))
(setq magit-repository-directories (setq magit-repository-directories
'(("/home/coolneng/Documents/Uni/" . 6) '(("/home/coolneng/Documents/Uni/" . 6)
("/home/coolneng/.dotfiles/" . 0))) ("/home/coolneng/.dotfiles/" . 0)
("/home/coolneng/Projects" . 3)))
; lsp-ui variables ; lsp-ui variables
(setq lsp-ui-doc-enable nil (setq lsp-ui-doc-enable nil
lsp-ui-sideline-show-hover t) lsp-ui-sideline-show-hover t)
@ -540,19 +550,13 @@ before packages are loaded."
(add-to-list 'auto-mode-alist '("\\.tpp\\'" . c++-mode)) (add-to-list 'auto-mode-alist '("\\.tpp\\'" . c++-mode))
(add-to-list 'auto-mode-alist '("\\.aiml\\'" . web-mode)) (add-to-list 'auto-mode-alist '("\\.aiml\\'" . web-mode))
(add-to-list 'auto-mode-alist '("\\.latex\\'" . latex-mode)) (add-to-list 'auto-mode-alist '("\\.latex\\'" . latex-mode))
; Add TODO files to the org-agenda (add-to-list 'auto-mode-alist '("\\.le\\'" . c-mode))
(with-eval-after-load 'org-agenda
(require 'org-projectile)
(mapcar '(lambda (file)
(when (file-exists-p file)
(push file org-agenda-files)))
(org-projectile-todo-files)))
; Disable company-mode in org ; Disable company-mode in org
(spacemacs|disable-company org-mode) (spacemacs|disable-company org-mode)
; Add bibliography file to org-ref ; Add bibliography file to org-ref
(setq org-ref-default-bibliography '("~/Documents/Uni/DDSI/Code/IGDB/Assets/Citations.bib")) (setq org-ref-default-bibliography '("~/Documents/Uni/DDSI/Code/IGDB/Assets/Citations.bib"))
; Auto cleanup recentf ; Auto cleanup recentf
(setq recentf-auto-cleanup '120) (setq recentf-auto-cleanup 120)
; Save backup files to ~/.cache ; Save backup files to ~/.cache
(setq backup-directory-alist `(("." . "~/.cache"))) (setq backup-directory-alist `(("." . "~/.cache")))
; Redirect stdout to results in org for python ; Redirect stdout to results in org for python
@ -560,6 +564,11 @@ before packages are loaded."
'((:exports . "both") '((:exports . "both")
(:preamble . "from __future__ import print_function") (:preamble . "from __future__ import print_function")
(:results . "output"))) (:results . "output")))
; Add TODO states in org
(setq org-todo-keywords '((sequence "TODO" "NEXT" "INACTIVE" "|" "DONE")))
(setq org-todo-keyword-faces
'(("INACTIVE" . "violet")
("NEXT" . "turquoise")))
) )
;; Do not write anything past this comment. This is where Emacs will ;; Do not write anything past this comment. This is where Emacs will
@ -602,10 +611,12 @@ This function is called at the very end of Spacemacs initialization."
'(jdee-db-requested-breakpoint-face-colors (cons "#f0f0f0" "#50a14f")) '(jdee-db-requested-breakpoint-face-colors (cons "#f0f0f0" "#50a14f"))
'(jdee-db-spec-breakpoint-face-colors (cons "#f0f0f0" "#9ca0a4")) '(jdee-db-spec-breakpoint-face-colors (cons "#f0f0f0" "#9ca0a4"))
'(objed-cursor-color "#e45649") '(objed-cursor-color "#e45649")
'(org-agenda-files (quote ("~/Documents/Uni/DDSI/Code/P1/Design.org"))) '(org-agenda-files
(quote
("~/Notes/Uni.org" "~/Documents/Uni/DDSI/Code/IGDB/Design.org" "~/Projects/Titank/Organization.org" "~/Notes/Projects.org" "~/Notes/Education.org")))
'(package-selected-packages '(package-selected-packages
(quote (quote
(ivy-bibtex helm-bibtex helm yapfify yaml-mode xterm-color which-key wgrep web-mode use-package tagedit smex smeargle smartparens slim-mode shell-pop scss-mode sass-mode pyvenv pytest pyenv-mode py-isort pug-mode pip-requirements persp-mode pcre2el pandoc-mode ox-pandoc ht orgit org-plus-contrib multi-term markdown-toc markdown-mode magit-gitflow magit-popup magit macrostep live-py-mode ivy-hydra insert-shebang hydra lv hy-mode dash-functional helm-make haml-mode gitignore-mode gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link git-gutter-fringe+ git-gutter-fringe fringe-helper git-gutter+ git-gutter gh-md fuzzy flycheck-pos-tip pos-tip flycheck flx fish-mode eyebrowse exec-path-from-shell transient git-commit with-editor evil-escape goto-chg eshell-z eshell-prompt-extras esh-help emmet-mode elisp-slime-nav doom-modeline shrink-path disaster diminish diff-hl cython-mode counsel-projectile projectile pkg-info epl counsel swiper ivy company-web web-completion-data company-statistics company-shell company-emacs-eclim eclim company-c-headers company-auctex company-anaconda company cmake-mode clang-format bind-map bind-key auto-yasnippet yasnippet auto-compile packed async anaconda-mode pythonic f s all-the-icons memoize ace-window avy ac-ispell auto-complete popup doom-themes dash))) (yapfify yaml-mode xterm-color which-key wgrep web-mode use-package tagedit smex smeargle smartparens slim-mode shell-pop scss-mode sass-mode pyvenv pytest pyenv-mode py-isort pug-mode pip-requirements persp-mode pcre2el pandoc-mode ox-pandoc ht orgit org-plus-contrib multi-term markdown-toc markdown-mode magit-gitflow magit-popup magit macrostep live-py-mode ivy-hydra insert-shebang hydra lv hy-mode dash-functional helm-make haml-mode gitignore-mode gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link git-gutter-fringe+ git-gutter-fringe fringe-helper git-gutter+ git-gutter gh-md fuzzy flycheck-pos-tip pos-tip flycheck flx fish-mode eyebrowse exec-path-from-shell transient git-commit with-editor evil-escape goto-chg eshell-z eshell-prompt-extras esh-help emmet-mode elisp-slime-nav doom-modeline shrink-path disaster diminish diff-hl cython-mode counsel-projectile projectile pkg-info epl counsel swiper ivy company-web web-completion-data company-statistics company-shell company-emacs-eclim eclim company-c-headers company-auctex company-anaconda company cmake-mode clang-format bind-map bind-key auto-yasnippet yasnippet auto-compile packed async anaconda-mode pythonic f s all-the-icons memoize ace-window avy ac-ispell auto-complete popup doom-themes dash)))
'(pdf-view-midnight-colors (quote ("#655370" . "#fbf8ef"))) '(pdf-view-midnight-colors (quote ("#655370" . "#fbf8ef")))
'(safe-local-variable-values '(safe-local-variable-values
(quote (quote