a/dotfiles
1
0
Fork 0
mirror of https://codeberg.org/andyscott/dotfiles.git synced 2024-09-19 19:38:07 -04:00
Code Issues Projects Releases Packages Wiki Activity

Minor updates and formatting fixes

Browse source
This commit is contained in:
Andrew Scott 2022-04-08 11:26:11 -04:00
parent b3068657a8
commit 128c1419d6
Signed by: a
GPG key ID: 3EB62D0BBB8DB381
1 changed files with 28 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
emacs.d/init.el
View file

@ -40,11 +40,11 @@
;; No annoying Windows errors ;; No annoying Windows errors
(set-default-coding-systems 'utf-8) (set-default-coding-systems 'utf-8)
;; Improved scrolling ;; Improve scrolling
(setq mouse-wheel-scroll-amount '(1 ((shift) . 1))) ;; one line at a time (setq mouse-wheel-scroll-amount '(1 ((shift) . 1))) ; one line at a time
(setq mouse-wheel-progressive-speed nil) ;; don't accelerate scrolling (setq mouse-wheel-progressive-speed nil) ; don't accelerate scrolling
(setq mouse-wheel-follow-mouse 't) ;; scroll window under mouse (setq mouse-wheel-follow-mouse 't) ; scroll window under mouse
(setq scroll-step 1) ;; keyboard scroll one line at a time (setq scroll-step 1) ; keyboard scroll one line at a time
;; Tabs ;; Tabs
(setq-default indent-tabs-mode nil) (setq-default indent-tabs-mode nil)
@ -66,7 +66,6 @@
(dolist (mode '(org-mode-hook)) (dolist (mode '(org-mode-hook))
(add-hook mode (lambda () (display-line-numbers-mode 0)))) (add-hook mode (lambda () (display-line-numbers-mode 0))))
;; Install and load straight.el ;; Install and load straight.el
(defvar bootstrap-version) (defvar bootstrap-version)
(let ((bootstrap-file (let ((bootstrap-file
@ -81,7 +80,6 @@
(eval-print-last-sexp))) (eval-print-last-sexp)))
(load bootstrap-file nil 'nomessage)) (load bootstrap-file nil 'nomessage))
;;;;;;;;;;;;;; Not needed when using straight.el ;;;;;;;;;;;;;; ;;;;;;;;;;;;;; Not needed when using straight.el ;;;;;;;;;;;;;;
;; Initialize package sources ;; Initialize package sources
;(require 'package) ;(require 'package)
@ -119,15 +117,14 @@
(use-package everforest-hard-dark-theme (use-package everforest-hard-dark-theme
:straight (everforest-hard-dark-theme :type git :repo "https://git.sr.ht/~theorytoe/everforest-hard-dark-theme") :straight (everforest-hard-dark-theme :type git :repo "https://git.sr.ht/~theorytoe/everforest-hard-dark-theme")
:config :config
(load-theme 'everforest-hard-dark)) (load-theme 'everforest-hard-dark t))
;; (use-package base16-theme ;; (use-package base16-theme
;; :config ;; :config
;; (load-theme 'gruvbox-dark-soft t)) ;; (load-theme 'gruvbox-dark-soft t))
;; Help distinguish between work from others like sidebars and terminal ;; Help distinguish work buffers from others like sidebars and terminal
(use-package solaire-mode (use-package solaire-mode
:diminish
:init :init
(solaire-global-mode t)) (solaire-global-mode t))
@ -164,7 +161,6 @@
;; Automatically clean whitespace ;; Automatically clean whitespace
(use-package ws-butler (use-package ws-butler
:diminish
:hook ((text-mode . ws-butler-mode) :hook ((text-mode . ws-butler-mode)
(prog-mode . ws-butler-mode))) (prog-mode . ws-butler-mode)))
@ -201,7 +197,6 @@
:bind (("C-s" . swiper))) :bind (("C-s" . swiper)))
(use-package treemacs (use-package treemacs
:defer t
:bind :bind
(:map global-map (:map global-map
("M-0" . treemacs-select-window) ("M-0" . treemacs-select-window)
@ -212,7 +207,6 @@
("C-x t M-t" . treemacs-find-tag))) ("C-x t M-t" . treemacs-find-tag)))
(use-package lsp-treemacs (use-package lsp-treemacs
:defer t
:config :config
(lsp-treemacs-sync-mode 1)) (lsp-treemacs-sync-mode 1))
@ -314,8 +308,8 @@
;; C/C++ ;; C/C++
(setq-default c-default-style "k&r") ;(setq-default c-default-style "k&r")
(setq-default c-basic-offset 2) ;(setq-default c-basic-offset 2)
;(use-package ccls ;(use-package ccls
; :hook ((c-mode c++-mode objc-mode cuda-mode) . ; :hook ((c-mode c++-mode objc-mode cuda-mode) .
@ -360,7 +354,7 @@
:init :init
(setq httpd-port 8123) (setq httpd-port 8123)
:hook :hook
(('js2-mode-hook 'skewer-mode) (('js-mode-hook 'skewer-mode)
('css-mode-hook 'skewer-css-mode) ('css-mode-hook 'skewer-css-mode)
('html-mode-hook 'skewer-html-mode))) ('html-mode-hook 'skewer-html-mode)))
@ -401,6 +395,7 @@
(lsp)))) ; or lsp-deferred (lsp)))) ; or lsp-deferred
(use-package numpydoc (use-package numpydoc
:after python
:bind (:map python-mode-map :bind (:map python-mode-map
("C-c C-n" . numpydoc-generate)) ("C-c C-n" . numpydoc-generate))
:config :config