mirror of
https://codeberg.org/andyscott/dotfiles.git
synced 2024-11-09 22:10:48 -05:00
Merge branch 'main' into single-monitor
This commit is contained in:
commit
f083baf0c3
2 changed files with 19 additions and 13 deletions
2
bashrc
2
bashrc
|
@ -9,7 +9,7 @@ alias ls='ls --color=auto'
|
||||||
PS1='[\u@\h \W]\$ '
|
PS1='[\u@\h \W]\$ '
|
||||||
|
|
||||||
alias nv=nvim
|
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"
|
alias kssh="/usr/bin/kitty +kitten ssh"
|
||||||
|
|
||||||
neofetch
|
neofetch
|
||||||
|
|
|
@ -40,6 +40,15 @@
|
||||||
;; No annoying Windows errors
|
;; No annoying Windows errors
|
||||||
(set-default-coding-systems 'utf-8)
|
(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
|
;; 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
|
||||||
|
@ -110,19 +119,15 @@
|
||||||
;; Theme
|
;; Theme
|
||||||
(setq custom-safe-themes t)
|
(setq custom-safe-themes t)
|
||||||
|
|
||||||
;(use-package zenburn-theme
|
;; (use-package atom-one-dark-theme
|
||||||
; :config
|
;; :config
|
||||||
; (load-theme `zenburn t))
|
;; (load-theme 'atom-one-dark t))
|
||||||
|
|
||||||
(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 t))
|
(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
|
;; Help distinguish work buffers from others like sidebars and terminal
|
||||||
(use-package solaire-mode
|
(use-package solaire-mode
|
||||||
:init
|
:init
|
||||||
|
@ -380,11 +385,12 @@
|
||||||
("\\.html?\\'" . web-mode)))
|
("\\.html?\\'" . web-mode)))
|
||||||
|
|
||||||
(use-package jsdoc
|
(use-package jsdoc
|
||||||
:straight (jsdoc :type git :host github :repo "isamert/jsdoc.el")
|
:straight (jsdoc :type git :host github :repo "isamert/jsdoc.el"))
|
||||||
:config
|
|
||||||
(use-package tree-sitter) ;; Required dependencies
|
; required for jsdoc
|
||||||
(use-package tree-sitter-langs)
|
(use-package tree-sitter
|
||||||
:hook ('js-mode-hook 'tree-sitter-mode))
|
:hook (js-mode . tree-sitter-mode))
|
||||||
|
(use-package tree-sitter-langs)
|
||||||
|
|
||||||
;; LaTeX
|
;; LaTeX
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue