a/dotfiles
1
0
Fork 0
mirror of https://codeberg.org/andyscott/dotfiles.git synced 2024-12-22 09:53:10 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'main' into single-monitor

Browse source
This commit is contained in:
Andrew Scott 2022-04-08 11:26:39 -04:00
commit 1b39b5e17b
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

61
emacs.d/init.el
View file

@ -2,12 +2,12 @@
(setq package-enable-at-startup nil)
;; No thanks
(setq inhibit-startup-message t) ; Disable startup message
(scroll-bar-mode -1) ; Disable visible scrollbar
(tool-bar-mode -1) ; Disable the toolbar
(tooltip-mode -1) ; Disable tooltips
(set-fringe-mode 10) ; Give some breathing room
(menu-bar-mode -1) ; Disable the menu bar
(setq inhibit-startup-message t) ; Disable startup message
(scroll-bar-mode -1) ; Disable visible scrollbar
(tool-bar-mode -1) ; Disable the toolbar
(tooltip-mode -1) ; Disable tooltips
(set-fringe-mode 10) ; Give some breathing room
(menu-bar-mode -1) ; Disable the menu bar
(setq-default custom-file null-device) ; Write customizations not in this file to the null device (AKA stop littering in my init.el)
;; Visible bell
@ -40,11 +40,11 @@
;; No annoying Windows errors
(set-default-coding-systems 'utf-8)
;; Improved scrolling
(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-follow-mouse 't) ;; scroll window under mouse
(setq scroll-step 1) ;; keyboard scroll one line at a time
;; Improve scrolling
(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-follow-mouse 't) ; scroll window under mouse
(setq scroll-step 1) ; keyboard scroll one line at a time
;; Tabs
(setq-default indent-tabs-mode nil)
@ -66,7 +66,6 @@
(dolist (mode '(org-mode-hook))
(add-hook mode (lambda () (display-line-numbers-mode 0))))
;; Install and load straight.el
(defvar bootstrap-version)
(let ((bootstrap-file
@ -81,7 +80,6 @@
(eval-print-last-sexp)))
(load bootstrap-file nil 'nomessage))
;;;;;;;;;;;;;; Not needed when using straight.el ;;;;;;;;;;;;;;
;; Initialize package sources
;(require 'package)
@ -119,15 +117,14 @@
(use-package everforest-hard-dark-theme
:straight (everforest-hard-dark-theme :type git :repo "https://git.sr.ht/~theorytoe/everforest-hard-dark-theme")
:config
(load-theme 'everforest-hard-dark))
(load-theme 'everforest-hard-dark t))
;; (use-package base16-theme
;; :config
;; (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
:diminish
:init
(solaire-global-mode t))
@ -164,7 +161,6 @@
;; Automatically clean whitespace
(use-package ws-butler
:diminish
:hook ((text-mode . ws-butler-mode)
(prog-mode . ws-butler-mode)))
@ -201,7 +197,6 @@
:bind (("C-s" . swiper)))
(use-package treemacs
:defer t
:bind
(:map global-map
("M-0" . treemacs-select-window)
@ -212,7 +207,6 @@
("C-x t M-t" . treemacs-find-tag)))
(use-package lsp-treemacs
:defer t
:config
(lsp-treemacs-sync-mode 1))
@ -242,18 +236,18 @@
(setq lsp-keymap-prefix "C-c l")
:commands (lsp lsp-deferred)
:hook
((c-mode . lsp)
(c++-mode . lsp)
(java-mode . lsp)
(js-mode . lsp)
(latex-mode . lsp)
(python-mode . lsp)
(rust-mode . lsp)
(tex-mode . lsp)
((c-mode . lsp)
(c++-mode . lsp)
(java-mode . lsp)
(js-mode . lsp)
(latex-mode . lsp)
(python-mode . lsp)
(rust-mode . lsp)
(tex-mode . lsp)
(typescript-mode . lsp)
(web-mode . lsp)
(zig-mode . lsp)
(lsp-mode . lsp-enable-which-key-integration))
(web-mode . lsp)
(zig-mode . lsp)
(lsp-mode . lsp-enable-which-key-integration))
:config
(setq lsp-prefer-flymake nil)) ;prefer lsp-ui (flycheck) to flymake
; :bind
@ -314,8 +308,8 @@
;; C/C++
(setq-default c-default-style "k&r")
(setq-default c-basic-offset 2)
;(setq-default c-default-style "k&r")
;(setq-default c-basic-offset 2)
;(use-package ccls
; :hook ((c-mode c++-mode objc-mode cuda-mode) .
@ -360,7 +354,7 @@
:init
(setq httpd-port 8123)
:hook
(('js2-mode-hook 'skewer-mode)
(('js-mode-hook 'skewer-mode)
('css-mode-hook 'skewer-css-mode)
('html-mode-hook 'skewer-html-mode)))
@ -401,6 +395,7 @@
(lsp)))) ; or lsp-deferred
(use-package numpydoc
:after python
:bind (:map python-mode-map
("C-c C-n" . numpydoc-generate))
:config