Merge branch 'main' into single-monitor

This commit is contained in:
Andrew Scott 2022-04-21 21:10:36 -04:00
commit f083baf0c3
Signed by: a
GPG key ID: 3EB62D0BBB8DB381
2 changed files with 19 additions and 13 deletions

2
bashrc
View file

@ -9,7 +9,7 @@ alias ls='ls --color=auto'
PS1='[\u@\h \W]\$ '
alias nv=nvim
alias rr="/usr/bin/kitty --class Ranger --name Ranger /usr/bin/ranger & disown"
alias r="urxvt -name Ranger -e ranger & disown"
alias kssh="/usr/bin/kitty +kitten ssh"
neofetch

View file

@ -40,6 +40,15 @@
;; No annoying Windows errors
(set-default-coding-systems 'utf-8)
;; Disable suspend-frame shortcut
(define-key global-map "\C-z" nil)
;; More reasonable keybinds for resizing windows
(global-set-key (kbd "S-C-<left>") 'shrink-window-horizontally)
(global-set-key (kbd "S-C-<right>") 'enlarge-window-horizontally)
(global-set-key (kbd "S-C-<down>") 'shrink-window)
(global-set-key (kbd "S-C-<up>") 'enlarge-window)
;; 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
@ -110,19 +119,15 @@
;; Theme
(setq custom-safe-themes t)
;(use-package zenburn-theme
; :config
; (load-theme `zenburn t))
;; (use-package atom-one-dark-theme
;; :config
;; (load-theme 'atom-one-dark t))
(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 t))
;; (use-package base16-theme
;; :config
;; (load-theme 'gruvbox-dark-soft t))
;; Help distinguish work buffers from others like sidebars and terminal
(use-package solaire-mode
:init
@ -380,11 +385,12 @@
("\\.html?\\'" . web-mode)))
(use-package jsdoc
:straight (jsdoc :type git :host github :repo "isamert/jsdoc.el")
:config
(use-package tree-sitter) ;; Required dependencies
:straight (jsdoc :type git :host github :repo "isamert/jsdoc.el"))
; required for jsdoc
(use-package tree-sitter
:hook (js-mode . tree-sitter-mode))
(use-package tree-sitter-langs)
:hook ('js-mode-hook 'tree-sitter-mode))
;; LaTeX