mirror of
https://codeberg.org/andyscott/dotfiles.git
synced 2024-12-22 09:53:10 -05:00
Compare commits
65 commits
5509627012
...
3548a10425
Author | SHA1 | Date | |
---|---|---|---|
3548a10425 | |||
a0149c2327 | |||
78b21f4b15 | |||
62e1e93fa3 | |||
7e1cbe0c3b | |||
e80eb54b5c | |||
bf45f8c05e | |||
554f1234ee | |||
34e9cfd656 | |||
67565ed4d4 | |||
13e2569b56 | |||
219db6cd26 | |||
deb88f67af | |||
2b8f584840 | |||
d603f310a4 | |||
38405fd69f | |||
35b3de2cfd | |||
c8e4fad1cb | |||
b4c7d2559c | |||
b172088596 | |||
310378f959 | |||
1046a33ffc | |||
ac771ff87b | |||
e3be3f6b30 | |||
6ac7399173 | |||
52cf9964ac | |||
c865f6d9da | |||
2a8d53fd1b | |||
ad3ecf08d7 | |||
9f0e44e070 | |||
928e83c479 | |||
45791c3b09 | |||
a2af80bf09 | |||
4eb7c5172a | |||
c4ab321b23 | |||
b882c96747 | |||
78d052c4a7 | |||
f5bc96c1d5 | |||
25342f6311 | |||
8ff6a6a860 | |||
9b0257ee5d | |||
c0b16d84d0 | |||
7d7e8908f2 | |||
3759901f0e | |||
08af8636a6 | |||
a4b4aef3a4 | |||
59de208949 | |||
02bb619d83 | |||
02727b2dc0 | |||
5f8e412669 | |||
5daa458081 | |||
51976ad1d7 | |||
b354222b8a | |||
39177eba28 | |||
d3f7059081 | |||
bd95b14070 | |||
93b8406834 | |||
38a7985761 | |||
06ee0e95c2 | |||
96bc55b90d | |||
21a27a9bda | |||
171d3edd66 | |||
c4caa65fcf | |||
2539f6ac96 | |||
1b902820f4 |
5 changed files with 84 additions and 66 deletions
|
@ -1,4 +1,3 @@
|
||||||
|
|
||||||
install.sh
|
install.sh
|
||||||
Xresources
|
Xresources
|
||||||
bin/mirror-outputs
|
bin/mirror-outputs
|
||||||
|
@ -15,6 +14,7 @@ config/polybar/*
|
||||||
!config/polybar/custom_modules.ini
|
!config/polybar/custom_modules.ini
|
||||||
!config/ranger
|
!config/ranger
|
||||||
!config/rofi
|
!config/rofi
|
||||||
|
!config/xsettingsd
|
||||||
emacs.d/*
|
emacs.d/*
|
||||||
!emacs.d/init.el
|
!emacs.d/init.el
|
||||||
!emacs.d/snippets
|
!emacs.d/snippets
|
||||||
|
|
|
@ -146,7 +146,6 @@ URxvt.keysym.Shift-Control-C: eval:selection_to_clipboard
|
||||||
!! font
|
!! font
|
||||||
!URxvt.letterSpace: -1
|
!URxvt.letterSpace: -1
|
||||||
URxvt.font: xft:Hack:regular:size=12, \
|
URxvt.font: xft:Hack:regular:size=12, \
|
||||||
xft:Font Awesome 5 Brands:Regular:size=10, \
|
xft:Font Awesome 6 Brands:Regular:size=10, \
|
||||||
xft:Font Awesome 5 Free:Solid:size=10, \
|
xft:Font Awesome 6 Free:Solid:size=10, \
|
||||||
xft:Font Awesome 5 Free:Regular:size=10
|
xft:Font Awesome 6 Free:Regular:size=10
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
|
|
||||||
[global/wm]
|
[global/wm]
|
||||||
include-file = ~/.config/polybar/colors.ini
|
include-file = ~/.config/polybar/colors.ini
|
||||||
include-file = ~/.config/polybar/modules.ini
|
include-file = ~/.config/polybar/modules.ini
|
||||||
|
@ -100,7 +99,7 @@ click-right =
|
||||||
;font-1 = Font Awesome 6 Free:style=Solid:size=12;3
|
;font-1 = Font Awesome 6 Free:style=Solid:size=12;3
|
||||||
;font-2 = Font Awesome 6 Free:style=Regular:size=12;3
|
;font-2 = Font Awesome 6 Free:style=Regular:size=12;3
|
||||||
;font-3 = Font Awesome 6 Brands:style=Regular:size=12;3
|
;font-3 = Font Awesome 6 Brands:style=Regular:size=12;3
|
||||||
;
|
|
||||||
;modules-left = workspaces sep title
|
;modules-left = workspaces sep title
|
||||||
;modules-center = spotify
|
;modules-center = spotify
|
||||||
;modules-right = cpu sep memory sep filesystem
|
;modules-right = cpu sep memory sep filesystem
|
||||||
|
@ -131,4 +130,4 @@ click-right =
|
||||||
;
|
;
|
||||||
;[settings]
|
;[settings]
|
||||||
;screenchange-reload = false
|
;screenchange-reload = false
|
||||||
;
|
|
||||||
|
|
6
config/xsettingsd/xsettingsd.conf
Normal file
6
config/xsettingsd/xsettingsd.conf
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
Net/IconThemeName "Papirus-Dark"
|
||||||
|
Net/ThemeName "Materia-dark"
|
||||||
|
Xft/Hinting 1
|
||||||
|
Xft/HintStyle "hintfull"
|
||||||
|
Xft/Antialias 1
|
||||||
|
Xft/RGBA "rgb"
|
130
emacs.d/init.el
130
emacs.d/init.el
|
@ -6,9 +6,10 @@
|
||||||
(scroll-bar-mode -1) ; Disable visible scrollbar
|
(scroll-bar-mode -1) ; Disable visible scrollbar
|
||||||
(tool-bar-mode -1) ; Disable the toolbar
|
(tool-bar-mode -1) ; Disable the toolbar
|
||||||
(tooltip-mode -1) ; Disable tooltips
|
(tooltip-mode -1) ; Disable tooltips
|
||||||
(set-fringe-mode 10) ; Give some breathing room
|
(set-fringe-mode 10) ; Add come extra space to the left/right sides
|
||||||
(menu-bar-mode -1) ; Disable the menu bar
|
(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)
|
(setq-default custom-file null-device) ; Write customizations not in this file to the null device (AKA stop littering in my init.el)
|
||||||
|
(setq confirm-kill-processes nil) ; Stop asking about running processes on exit
|
||||||
|
|
||||||
;; Visible bell
|
;; Visible bell
|
||||||
(setq visible-bell t)
|
(setq visible-bell t)
|
||||||
|
@ -67,11 +68,11 @@
|
||||||
conf-mode-hook))
|
conf-mode-hook))
|
||||||
(add-hook mode (lambda () (display-line-numbers-mode 1))))
|
(add-hook mode (lambda () (display-line-numbers-mode 1))))
|
||||||
|
|
||||||
;; Show vertical line at column 80 to keep code clean in prog-mode
|
;; Show vertical line at column 80 in prog-mode
|
||||||
(setq-default fill-column 80)
|
(setq-default fill-column 80)
|
||||||
(add-hook 'prog-mode-hook #'display-fill-column-indicator-mode)
|
(add-hook 'prog-mode-hook #'display-fill-column-indicator-mode)
|
||||||
|
|
||||||
; Override some modes which derive from the above
|
; No line numbers in org-mode
|
||||||
(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))))
|
||||||
|
|
||||||
|
@ -121,9 +122,7 @@
|
||||||
(setq custom-safe-themes t)
|
(setq custom-safe-themes t)
|
||||||
|
|
||||||
;; (use-package everforest
|
;; (use-package everforest
|
||||||
;; :straight (:type git :repo "https://git.sr.ht/~theorytoe/everforest-theme")
|
;; :straight (:type git :repo "https://git.sr.ht/~theorytoe/everforest-theme"))
|
||||||
;; :config
|
|
||||||
;; (load-theme 'everforest-hard-dark t))
|
|
||||||
|
|
||||||
;; (use-package gruvbox-theme
|
;; (use-package gruvbox-theme
|
||||||
;; :config
|
;; :config
|
||||||
|
@ -292,7 +291,8 @@
|
||||||
(eval-when-compile
|
(eval-when-compile
|
||||||
(require 'cl-lib))
|
(require 'cl-lib))
|
||||||
(require 'dap-python)
|
(require 'dap-python)
|
||||||
(require 'dap-node)
|
;(require 'dap-node)
|
||||||
|
(require 'dap-lldb)
|
||||||
:bind
|
:bind
|
||||||
(:map dap-mode-map
|
(:map dap-mode-map
|
||||||
("<f5>" . dap-debug)
|
("<f5>" . dap-debug)
|
||||||
|
@ -335,8 +335,9 @@
|
||||||
|
|
||||||
;; C/C++
|
;; C/C++
|
||||||
|
|
||||||
;(setq-default c-default-style "k&r")
|
(setq dap-lldb-debug-program '("/usr/bin/lldb-vscode"))
|
||||||
;(setq-default c-basic-offset 2)
|
(setq-default c-default-style "k&r")
|
||||||
|
(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) .
|
||||||
|
@ -348,9 +349,9 @@
|
||||||
|
|
||||||
;; Golang
|
;; Golang
|
||||||
|
|
||||||
(use-package go-mode
|
;; (use-package go-mode
|
||||||
:config
|
;; :config
|
||||||
(add-hook 'before-save-hook #'lsp-organize-imports))
|
;; (add-hook 'before-save-hook #'lsp-organize-imports))
|
||||||
|
|
||||||
;; Java
|
;; Java
|
||||||
|
|
||||||
|
@ -358,35 +359,35 @@
|
||||||
|
|
||||||
;; JavaScript/TypeScript, HTML, CSS
|
;; JavaScript/TypeScript, HTML, CSS
|
||||||
|
|
||||||
(setq css-indent-level 2)
|
;; (setq css-indent-level 2)
|
||||||
(setq css-indent-offset 2)
|
;; (setq css-indent-offset 2)
|
||||||
(setq js-indent-level 2)
|
;; (setq js-indent-level 2)
|
||||||
|
|
||||||
(add-to-list 'auto-mode-alist '("\\.mjs\\'" . js-mode))
|
;; (add-to-list 'auto-mode-alist '("\\.mjs\\'" . js-mode))
|
||||||
|
|
||||||
(use-package js2-mode
|
;; (use-package js2-mode
|
||||||
:config
|
;; :config
|
||||||
(add-to-list 'interpreter-mode-alist '("#!/usr/bin/env node" . js2-mode))
|
;; (add-to-list 'interpreter-mode-alist '("#!/usr/bin/env node" . js2-mode))
|
||||||
;(setq js2-strict-missing-semi-warning t)
|
;; ;(setq js2-strict-missing-semi-warning t)
|
||||||
(setq js2-mode-show-strict-warnings t)
|
;; (setq js2-mode-show-strict-warnings t)
|
||||||
:hook (js-mode . js2-minor-mode))
|
;; :hook (js-mode . js2-minor-mode))
|
||||||
|
|
||||||
(use-package typescript-mode
|
;; (use-package typescript-mode
|
||||||
:config
|
;; :config
|
||||||
(setq typescript-indent-level 2)
|
;; (setq typescript-indent-level 2)
|
||||||
:mode ("\\.ts\\'" . typescript-mode)
|
;; :mode ("\\.ts\\'" . typescript-mode)
|
||||||
("\\.tsx\\'" . typescript-mode))
|
;; ("\\.tsx\\'" . typescript-mode))
|
||||||
|
|
||||||
(use-package restclient
|
;; (use-package restclient
|
||||||
:init
|
;; :init
|
||||||
(use-package company-restclient)
|
;; (use-package company-restclient)
|
||||||
:mode ("\\.http\\'" . restclient-mode))
|
;; :mode ("\\.http\\'" . restclient-mode))
|
||||||
|
|
||||||
(use-package rainbow-mode
|
;; (use-package rainbow-mode
|
||||||
:hook
|
;; :hook
|
||||||
((js-mode . rainbow-mode)
|
;; ((js-mode . rainbow-mode)
|
||||||
(typescript-mode . rainbow-mode)
|
;; (typescript-mode . rainbow-mode)
|
||||||
(web-mode . rainbow-mode)))
|
;; (web-mode . rainbow-mode)))
|
||||||
|
|
||||||
;; (use-package skewer-mode
|
;; (use-package skewer-mode
|
||||||
;; :init
|
;; :init
|
||||||
|
@ -403,36 +404,36 @@
|
||||||
|
|
||||||
;; (use-package simple-httpd)
|
;; (use-package simple-httpd)
|
||||||
|
|
||||||
(use-package web-mode
|
;; (use-package web-mode
|
||||||
:config
|
;; :config
|
||||||
(setq web-mode-code-indent-offset 2)
|
;; (setq web-mode-code-indent-offset 2)
|
||||||
(setq web-mode-markup-indent-offset 2)
|
;; (setq web-mode-markup-indent-offset 2)
|
||||||
(setq web-mode-attribute-indent-offset 2)
|
;; (setq web-mode-attribute-indent-offset 2)
|
||||||
:mode
|
;; :mode
|
||||||
(("\\.phtml\\'" . web-mode)
|
;; (("\\.phtml\\'" . web-mode)
|
||||||
("\\.tpl\\.php\\'" . web-mode)
|
;; ("\\.tpl\\.php\\'" . web-mode)
|
||||||
("\\.jsp\\'" . web-mode)
|
;; ("\\.jsp\\'" . web-mode)
|
||||||
("\\.as[cp]x\\'" . web-mode)
|
;; ("\\.as[cp]x\\'" . web-mode)
|
||||||
("\\.erb\\'" . web-mode)
|
;; ("\\.erb\\'" . web-mode)
|
||||||
("\\.mustache\\'" . web-mode)
|
;; ("\\.mustache\\'" . web-mode)
|
||||||
("\\.djhtml\\'" . web-mode)
|
;; ("\\.djhtml\\'" . web-mode)
|
||||||
("\\.jst.ejs\\'" . web-mode)
|
;; ("\\.jst.ejs\\'" . web-mode)
|
||||||
("\\.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")
|
||||||
:bind ("C-c C-n" . jsdoc))
|
;; :bind ("C-c C-n" . jsdoc))
|
||||||
|
|
||||||
;; LaTeX
|
;; LaTeX
|
||||||
|
|
||||||
(use-package lsp-latex)
|
;; (use-package lsp-latex)
|
||||||
|
|
||||||
(setq lsp-tex-server 'digestif)
|
;; (setq lsp-tex-server 'digestif)
|
||||||
|
|
||||||
|
|
||||||
;; Protocol Buffers
|
;; Protocol Buffers
|
||||||
|
|
||||||
(use-package protobuf-mode)
|
;; (use-package protobuf-mode)
|
||||||
|
|
||||||
;; Python
|
;; Python
|
||||||
|
|
||||||
|
@ -450,6 +451,17 @@
|
||||||
:config
|
:config
|
||||||
(setq numpydoc-insert-examples-block nil))
|
(setq numpydoc-insert-examples-block nil))
|
||||||
|
|
||||||
|
(use-package conda
|
||||||
|
:init
|
||||||
|
(setq conda-anaconda-home (expand-file-name "/opt/miniconda3"))
|
||||||
|
(setq conda-env-home-directory (expand-file-name "~/.conda/envs"))
|
||||||
|
(conda-env-initialize-interactive-shells)
|
||||||
|
;(conda-env-autoactivate-mode)
|
||||||
|
:hook
|
||||||
|
('find-file-hook . (lambda ()
|
||||||
|
(when (bound-and-true-p conda-project-env-path)
|
||||||
|
(conda-env-activate-for-buffer)))))
|
||||||
|
|
||||||
;; Rust
|
;; Rust
|
||||||
|
|
||||||
;(use-package rust-mode)
|
;(use-package rust-mode)
|
||||||
|
@ -467,7 +479,9 @@
|
||||||
|
|
||||||
;; Syntax checking
|
;; Syntax checking
|
||||||
(use-package flycheck
|
(use-package flycheck
|
||||||
:hook (lsp-mode . flycheck-mode))
|
:hook (lsp-mode . flycheck-mode)
|
||||||
|
:config
|
||||||
|
(setq flycheck-python-flake8-executable "flake8"))
|
||||||
|
|
||||||
;; Templating
|
;; Templating
|
||||||
(use-package yasnippet
|
(use-package yasnippet
|
||||||
|
|
Loading…
Reference in a new issue