merge main

.gitignore.main

@@ -1,3 +1,4 @@
+
 install.sh
 Xresources
 bin/mirror-outputs
@@ -14,7 +15,6 @@ config/polybar/*
 !config/polybar/custom_modules.ini
 !config/ranger
 !config/rofi
-!config/xsettingsd
 emacs.d/*
 !emacs.d/init.el
 !emacs.d/snippets

Xresources

@@ -146,6 +146,7 @@ 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 5 Brands:Regular:size=10, \
-            xft:Font Awesome 6 Free:Solid:size=10, \
+            xft:Font Awesome 5 Free:Solid:size=10, \
-            xft:Font Awesome 6 Free:Regular:size=10
+            xft:Font Awesome 5 Free:Regular:size=10
+

config/polybar/config.ini

@@ -1,3 +1,4 @@
+
 [global/wm]
 include-file = ~/.config/polybar/colors.ini
 include-file = ~/.config/polybar/modules.ini
@@ -99,7 +100,7 @@ click-right =
 ;font-1 = Font Awesome 6 Free:style=Solid: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
-
+;
 ;modules-left = workspaces sep title                               
 ;modules-center = spotify                                                  
 ;modules-right = cpu sep memory sep filesystem
@@ -130,4 +131,4 @@ click-right =
 ;
 ;[settings]
 ;screenchange-reload = false
-
+;

config/xsettingsd/xsettingsd.conf

@@ -1,6 +0,0 @@
-Net/IconThemeName "Papirus-Dark"
-Net/ThemeName "Materia-dark"
-Xft/Hinting 1
-Xft/HintStyle "hintfull"
-Xft/Antialias 1
-Xft/RGBA "rgb"

emacs.d/init.el

@@ -6,10 +6,9 @@
 (scroll-bar-mode -1)                   ; Disable visible scrollbar
 (tool-bar-mode -1)                     ; Disable the toolbar
 (tooltip-mode -1)                      ; Disable tooltips
-(set-fringe-mode 10)                   ; Add come extra space to the left/right sides
+(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)
-(setq confirm-kill-processes nil)      ; Stop asking about running processes on exit
 
 ;; Visible bell
 (setq visible-bell t)
@@ -68,11 +67,11 @@
                 conf-mode-hook))
   (add-hook mode (lambda () (display-line-numbers-mode 1))))
 
-;; Show vertical line at column 80 in prog-mode
+;; Show vertical line at column 80 to keep code clean in prog-mode
 (setq-default fill-column 80)
 (add-hook 'prog-mode-hook #'display-fill-column-indicator-mode)
 
-; No line numbers in org-mode
+; Override some modes which derive from the above
 (dolist (mode '(org-mode-hook))
   (add-hook mode (lambda () (display-line-numbers-mode 0))))
 
@@ -122,7 +121,9 @@
 (setq custom-safe-themes t)
 
 ;; (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
 ;;   :config
@@ -291,8 +292,7 @@
   (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)
@@ -335,9 +335,8 @@
 
 ;; C/C++
 
-(setq dap-lldb-debug-program '("/usr/bin/lldb-vscode"))
+;(setq-default c-default-style "k&r")
-(setq-default c-default-style "k&r")
+;(setq-default c-basic-offset 2)
-(setq-default c-basic-offset 2)
 
 ;(use-package ccls
 ;  :hook ((c-mode c++-mode objc-mode cuda-mode) .
@@ -349,9 +348,9 @@
 
 ;; 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
 
@@ -359,35 +358,35 @@
 
 ;; 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
 ;;  :init
@@ -404,36 +403,36 @@
 
 ;; (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
 
-;; (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
 
@@ -451,17 +450,6 @@
   :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)
@@ -479,9 +467,7 @@
 
 ;; 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