diff options
Diffstat (limited to 'emacs/.emacs.d')
-rw-r--r-- | emacs/.emacs.d/custom.el | 5 | ||||
-rw-r--r-- | emacs/.emacs.d/init.el | 11 |
2 files changed, 13 insertions, 3 deletions
diff --git a/emacs/.emacs.d/custom.el b/emacs/.emacs.d/custom.el index 96897f2..2f198a0 100644 --- a/emacs/.emacs.d/custom.el +++ b/emacs/.emacs.d/custom.el @@ -8,14 +8,15 @@ ("13fa7a304bd53aa4c0beec4c25c4f811de499bce9deb326798265ed0015b3b78" "a41b81af6336bd822137d4341f7e16495a49b06c180d6a6417bf9fd1001b6d2b" "63df625509cec7b2b7deba1d48ef07ffbee99c735a95d130ad9d1fc3df8b9a34" "55c2069e99ea18e4751bd5331b245a2752a808e91e09ccec16eb25dadbe06354" "5f1bd7f67dc1598977e69c6a0aed3c926f49581fdf395a6246f9bc1df86cb030" "6731049cee8f7cbd542d7b3e1c551f3fab716a92119bd7c77f0bd1ef20849fb8" "28caf31770f88ffaac6363acfda5627019cac57ea252ceb2d41d98df6d87e240" "947190b4f17f78c39b0ab1ea95b1e6097cc9202d55c73a702395fc817f899393" "35b0b0e531731e270708ddb342dc2e576a31fb298dcbc56a206596a43afac54f" "274fa62b00d732d093fc3f120aca1b31a6bb484492f31081c1814a858e25c72e" default))) '(package-selected-packages (quote - (ibuffer-sidebar vscode-icon dired-sidebar flycheck prettier-js calfw-org calfw org-ql org-super-agenda org-pomodoro org doom-themes counsel-projectile ivy slime magit all-the-icons centaur-tabs company-quickhelp lsp-ui yasnippet typescript-mode company-lsp company-posframe company-c-headers telephone-line dracula-theme evil use-package)))) + (ibuffer-sidebar vscode-icon dired-sidebar flycheck prettier-js calfw-org calfw org-ql org-super-agenda org-pomodoro org doom-themes counsel-projectile ivy slime magit all-the-icons centaur-tabs company-quickhelp lsp-ui yasnippet typescript-mode company-lsp company-posframe company-c-headers telephone-line dracula-theme evil use-package))) + '(show-paren-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. ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. - '(default ((t (:family "Iosevka" :foundry "CYEL" :slant normal :weight light :height 128 :width normal)))) + '(default ((t (:family "Iosevka" :foundry "CYEL" :slant normal :weight light :height 113 :width normal)))) '(hl-line ((t (:background "gray8")))) '(line-number ((t (:inherit (shadow default) :background "gray16")))) '(line-number-current-line ((t (:inherit line-number :background "gray20" :foreground "dark orange" :slant italic))))) diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el index 1e8cd33..f36cc23 100644 --- a/emacs/.emacs.d/init.el +++ b/emacs/.emacs.d/init.el @@ -2,7 +2,7 @@ (defun load-if-exists (filename) (when (file-exists-p filename) (load-file filename))) -(defun bab/disable-line-numbers (&optional dummy) +(defun bab/disable-line-numbers (&optional dummy dummy2) (display-line-numbers-mode -1)) (defun bab/sidebar-toggle () @@ -96,6 +96,15 @@ :config (counsel-projectile-mode 1) :after (ivy projectile)) +;; --- GIT INTEGRATION --- +(use-package magit + :commands + (magit-status) + :bind + (("<f12>" . magit-status)) + :hook + (magit-status-mode . bab/disable-line-numbers)) + ;; --- TABS --- (use-package all-the-icons) (use-package centaur-tabs |