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

Compare commits

base: a:2e603d0c079b9ef804edd457ba016f4fe4aa6999
Branches Tags
a:main
a:xorg-archive
..
compare: a:f78a7e450c6612f94d09580feb2c5e3bde471eb0
Branches Tags
a:main
a:xorg-archive

3 commits
2e603d0c07 ... f78a7e450c

Author SHA1 Message Date
Andrew Scott
f78a7e450c
Remove extraneous file 2022-11-08 17:20:36 -05:00
Andrew Scott
0bb78153ed
Bring config in-line w/ laptop config 2022-11-08 17:19:35 -05:00
Andrew Scott
627df8c32b
Added rule for origin.exe 2022-11-08 17:17:31 -05:00
3 changed files with 85 additions and 217 deletions
Show stats Expand all files Collapse all files

150
\
View file

@ -1,150 +0,0 @@
! -----------------------------------------------------------------------------
! Colors: gruvbox-dark, forest night, zenburn
! Source: https://github.com/morhetz/gruvbox-generalized
! https://github.com/jef/forest-night-xresources
! https://github.com/jnurmine/Zenburn
! -----------------------------------------------------------------------------
Xft.autohint: 0
Xft.lcdfilter: lcddefault
Xft.hintstyle: hintfull
Xft.hinting: 1
Xft.antialias: 1
Xft.rgba: rgb
!---------!
! Gruvbox !
! --------!
! hard contrast: *background: #1d2021
! medium contrast: *background: #282828
! soft contrast: *background: #32302f
! *background: #1d2021
! *foreground: #ebdbb2
! ! Black + DarkGrey
! *color0: #282828
! *color8: #928374
! ! DarkRed + Red
! *color1: #cc241d
! *color9: #fb4934
! ! DarkGreen + Green
! *color2: #98971a
! *color10: #b8bb26
! ! DarkYellow + Yellow
! *color3: #d79921
! *color11: #fabd2f
! ! DarkBlue + Blue
! *color4: #458588
! *color12: #83a598
! ! DarkMagenta + Magenta
! *color5: #b16286
! *color13: #d3869b
! ! DarkCyan + Cyan
! *color6: #689d6a
! *color14: #8ec07c
! ! LightGrey + White
! *color7: #a89984
! *color15: #ebdbb2
!------------!
! Everforest !
!------------!
! special
*.foreground: #d8caac
*.background: #323d43
*.cursorColor: #7fbbb3
! black
*.color0: #4a555b
*.color8: #525c62
! red
*.color1: #e26c6e
*.color9: #e68183
! green
*.color2: #9bb86f
*.color10: #a7c080
! yellow
*.color3: #d5b26b
*.color11: #dbbc7f
! blue
*.color4: #6eb2a9
*.color12: #7fbbb3
! magenta
*.color5: #cf87a9
*.color13: #d699b6
! cyan
*.color6: #72b783
*.color14: #83c092
! white
*.color7: #d0bf9b
*.color15: #d8caac
!---------!
! Zenburn !
!---------!
! *foreground: #dcdccc
! ! Black + DarkGrey
! *color0: #282828
! *color8: #709080
! ! DarkRed + Red
! *color1: #705050
! *color9: #dca3a3
! ! DarkGreen + Green
! *color2: #60b48a
! *color10: #c3bf9f
! ! DarkYellow + Yellow
! *color3: #f0deae
! *color11: #dfcf9f
! ! DarkBlue + Blue
! *color4: #506070
! *color12: #94bff3
! ! DarkMagenta + Magenta
! *color5: #dc8cc3
! *color13: #ec93d3
! ! DarkCyan + Cyan
! *color6: #8cd0d3
! *color14: #93e0e3
! ! LightGrey + White
! *color7: #dcdccc
! *color15: #ffffff
!!! urxvt
URxvt.perl-ext-common: default,matcher
URxvt*buffered: true
URxvt*saveLines: 5000
URxvt*cursorBlink: true
URxvt*borderless: 1
URxvt*internalBorder: 20
URxvt*scrollBar: false
URxvt.url-launcher: /usr/bin/xdg-open
URxvt.matcher.button: 1
URxvt.clipboard.autocopy: true
! do not scroll with output
URxvt*scrollTtyOutput: false
! scroll in relation to buffer (with mouse scroll or Shift+Page Up)
URxvt*scrollWithBuffer: true
! scroll back to the bottom on keypress
URxvt*scrollTtyKeypress: true
! disable scrollback buffer in secondary screen (allows scrolling pager when using 'less' etc)
URxvt.secondaryScreen: 1
URxvt.secondaryScroll: 0
! Disable printing the terminal contents when pressing PrintScreen.
URxvt.print-pipe: "cat > /dev/null"
!! copy/paste
! disable default ctrl-shift binding
URxvt.iso14755: false
URxvt.iso14755_52: false
! disable default copy/paste bindings
URxvt.keysym.Control-Meta-c: builtin-string:
URxvt.keysym.Control-Meta-v: builtin-string:
! new copy/paste bindings
URxvt.keysym.Shift-Control-V: eval:paste_clipboard
URxvt.keysym.Shift-Control-C: eval:selection_to_clipboard
!! font
!URxvt.letterSpace: -1
URxvt.font: xft:Hack:regular:size=12, \
xft:Font Awesome 6 Brands:Regular:size=10, \
xft:Font Awesome 6 Free:Solid:size=10, \
xft:Font Awesome 6 Free:Regular:size=10

1
config/bspwm/bspwmrc
View file

@ -17,6 +17,7 @@ bspc rule -a Blueman-manager state=floating
bspc rule -a Bitwarden state=floating
bspc rule -a Leafpad state=floating
bspc rule -a KeePassXC state=floating
bspc rule -a origin.exe state=floating
bspc rule -a firefox desktop='^1' follow=on
bspc rule -a Chromium desktop='^2' follow=on

149
emacs.d/init.el
View file

@ -1,4 +1,4 @@
; Disable package.el early so it won't start loading packages before init is loaded
;; Disable package.el early so it won't start loading packages before init is loaded
(setq package-enable-at-startup nil)
;; No thanks
@ -6,9 +6,10 @@
(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
(set-fringe-mode 10) ; Add come extra space to the left/right sides
(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 confirm-kill-processes nil) ; Stop asking about running processes on exit
;; Visible bell
(setq visible-bell t)
@ -67,11 +68,11 @@
conf-mode-hook))
(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)
(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))
(add-hook mode (lambda () (display-line-numbers-mode 0))))
@ -117,18 +118,17 @@
:custom (straight-use-package-by-default t))
;; Theme
(setq custom-safe-themes t)
;; (use-package atom-one-dark-theme
;; :config
;; (load-theme 'atom-one-dark t))
;; (use-package everforest
;; :straight (everforest-hard-dark-theme :type git :repo "https://git.sr.ht/~theorytoe/everforest-theme")
;; :config
;; (load-theme 'everforest-hard-dark t))
;; :straight (:type git :repo "https://git.sr.ht/~theorytoe/everforest-theme"))
(add-to-list 'custom-theme-load-path "~/.cache/emacs/straight/build/everforest")
;; (use-package gruvbox-theme
;; :config
;; (load-theme 'gruvbox-dark-soft t))
(add-to-list 'custom-theme-load-path "~/.cache/emacs/custom/everforest-theme")
(load-theme 'everforest-hard-dark t)
;; Help distinguish work buffers from others like sidebars and terminal
@ -291,7 +291,8 @@
(eval-when-compile
(require 'cl-lib))
(require 'dap-python)
(require 'dap-node)
;(require 'dap-node)
(require 'dap-lldb)
:bind
(:map dap-mode-map
("<f5>" . dap-debug)
@ -316,7 +317,9 @@
("C-n" . company-select-next)
("C-p" . company-select-previous)))
;;; Languages
;;; Languages/Tools
;; Highlighting/Formatting
(use-package apheleia
:init
@ -332,8 +335,9 @@
;; C/C++
;(setq-default c-default-style "k&r")
;(setq-default c-basic-offset 2)
(setq dap-lldb-debug-program '("/usr/bin/lldb-vscode"))
(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) .
@ -345,9 +349,9 @@
;; Golang
(use-package go-mode
:config
(add-hook 'before-save-hook #'lsp-organize-imports))
;; (use-package go-mode
;; :config
;; (add-hook 'before-save-hook #'lsp-organize-imports))
;; Java
@ -355,35 +359,35 @@
;; JavaScript/TypeScript, HTML, CSS
(setq css-indent-level 2)
(setq css-indent-offset 2)
(setq js-indent-level 2)
;; (setq css-indent-level 2)
;; (setq css-indent-offset 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
:config
(add-to-list 'interpreter-mode-alist '("#!/usr/bin/env node" . js2-mode))
;(setq js2-strict-missing-semi-warning t)
(setq js2-mode-show-strict-warnings t)
:hook (js-mode . js2-minor-mode))
;; (use-package js2-mode
;; :config
;; (add-to-list 'interpreter-mode-alist '("#!/usr/bin/env node" . js2-mode))
;; ;(setq js2-strict-missing-semi-warning t)
;; (setq js2-mode-show-strict-warnings t)
;; :hook (js-mode . js2-minor-mode))
(use-package typescript-mode
:config
(setq typescript-indent-level 2)
:mode ("\\.ts\\'" . typescript-mode)
("\\.tsx\\'" . typescript-mode))
;; (use-package typescript-mode
;; :config
;; (setq typescript-indent-level 2)
;; :mode ("\\.ts\\'" . typescript-mode)
;; ("\\.tsx\\'" . typescript-mode))
(use-package restclient
:init
(use-package company-restclient)
:mode ("\\.http\\'" . restclient-mode))
;; (use-package restclient
;; :init
;; (use-package company-restclient)
;; :mode ("\\.http\\'" . restclient-mode))
(use-package rainbow-mode
:hook
((js-mode . rainbow-mode)
(typescript-mode . rainbow-mode)
(web-mode . rainbow-mode)))
;; (use-package rainbow-mode
;; :hook
;; ((js-mode . rainbow-mode)
;; (typescript-mode . rainbow-mode)
;; (web-mode . rainbow-mode)))
;; (use-package skewer-mode
;; :init
@ -400,35 +404,36 @@
;; (use-package simple-httpd)
(use-package web-mode
:config
(setq web-mode-code-indent-offset 2)
(setq web-mode-markup-indent-offset 2)
(setq web-mode-attribute-indent-offset 2)
:mode
(("\\.phtml\\'" . web-mode)
("\\.tpl\\.php\\'" . web-mode)
("\\.jsp\\'" . web-mode)
("\\.as[cp]x\\'" . web-mode)
("\\.erb\\'" . web-mode)
("\\.mustache\\'" . web-mode)
("\\.djhtml\\'" . web-mode)
("\\.jst.ejs\\'" . web-mode)
("\\.html?\\'" . web-mode)))
;; (use-package web-mode
;; :config
;; (setq web-mode-code-indent-offset 2)
;; (setq web-mode-markup-indent-offset 2)
;; (setq web-mode-attribute-indent-offset 2)
;; :mode
;; (("\\.phtml\\'" . web-mode)
;; ("\\.tpl\\.php\\'" . web-mode)
;; ("\\.jsp\\'" . web-mode)
;; ("\\.as[cp]x\\'" . web-mode)
;; ("\\.erb\\'" . web-mode)
;; ("\\.mustache\\'" . web-mode)
;; ("\\.djhtml\\'" . web-mode)
;; ("\\.jst.ejs\\'" . web-mode)
;; ("\\.html?\\'" . web-mode)))
(use-package jsdoc
:straight (jsdoc :type git :host github :repo "isamert/jsdoc.el")
:bind ("C-c C-n" . jsdoc))
;; (use-package jsdoc
;; :straight (jsdoc :type git :host github :repo "isamert/jsdoc.el")
;; :bind ("C-c C-n" . jsdoc))
;; LaTeX
(use-package lsp-latex)
;; (use-package lsp-latex)
;; (setq lsp-tex-server 'digestif)
(setq lsp-tex-server 'digestif)
;; Protocol Buffers
(use-package protobuf-mode)
;; (use-package protobuf-mode)
;; Python
@ -446,6 +451,17 @@
:config
(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
;(use-package rust-mode)
@ -463,7 +479,9 @@
;; Syntax checking
(use-package flycheck
:hook (lsp-mode . flycheck-mode))
:hook (lsp-mode . flycheck-mode)
:config
(setq flycheck-python-flake8-executable "flake8"))
;; Templating
(use-package yasnippet
@ -477,4 +495,3 @@
(use-package yasnippet-snippets)
;;; End init.el