Compare commits

..

65 commits

Author SHA1 Message Date
3548a10425
Bump font awesome version 2022-10-23 18:14:38 -04:00
a0149c2327
Move polybar to bottom 2022-10-23 18:13:05 -04:00
78b21f4b15
Update everforest colors 2022-10-23 18:13:04 -04:00
62e1e93fa3
Bring settings in line with other branches 2022-10-23 18:13:04 -04:00
7e1cbe0c3b
Update install script 2022-10-23 18:13:04 -04:00
e80eb54b5c
Update install.sh 2022-10-23 18:13:02 -04:00
bf45f8c05e
Merged zenburn and gruvbox colors to same Xresources 2022-10-23 18:12:45 -04:00
554f1234ee
Separate Xresources files for now 2022-10-23 18:12:45 -04:00
34e9cfd656
Updated install.sh 2022-10-23 18:12:43 -04:00
67565ed4d4
Update install.sh 2022-10-23 18:12:29 -04:00
13e2569b56
Merged zenburn and gruvbox colors to same Xresources 2022-10-23 18:12:28 -04:00
219db6cd26
Separate Xresources files for now 2022-10-23 18:12:28 -04:00
deb88f67af
Updated install.sh 2022-10-23 18:12:28 -04:00
2b8f584840
Initial commit 2022-10-23 18:12:28 -04:00
d603f310a4
Resolve conflicts from git rebase main 2022-10-23 18:12:28 -04:00
38405fd69f
Resolve conflicts from git rebase main 2022-10-23 18:12:28 -04:00
35b3de2cfd
Update install.sh 2022-10-23 18:12:26 -04:00
c8e4fad1cb
Merged zenburn and gruvbox colors to same Xresources 2022-10-23 18:12:09 -04:00
b4c7d2559c
Separate Xresources files for now 2022-10-23 18:12:09 -04:00
b172088596
Updated install.sh 2022-10-23 18:12:07 -04:00
310378f959
Update install.sh 2022-10-23 18:11:43 -04:00
1046a33ffc
Merged zenburn and gruvbox colors to same Xresources 2022-10-23 18:11:19 -04:00
ac771ff87b
Separate Xresources files for now 2022-10-23 18:09:54 -04:00
e3be3f6b30
Updated install.sh 2022-10-23 18:09:51 -04:00
6ac7399173
Rebase 2022-10-23 18:08:11 -04:00
52cf9964ac
Resolve conflicts from git rebase main 2022-10-23 18:07:17 -04:00
c865f6d9da
Update everforest colors 2022-10-23 18:02:41 -04:00
2a8d53fd1b
Bring settings in line with other branches 2022-10-23 18:02:41 -04:00
ad3ecf08d7
Add config 2022-10-23 18:02:41 -04:00
9f0e44e070
Update install script 2022-10-23 18:02:41 -04:00
928e83c479
Remove deprecated setting 2022-10-23 18:02:41 -04:00
45791c3b09
Update install.sh 2022-10-23 18:02:40 -04:00
a2af80bf09
Merged zenburn and gruvbox colors to same Xresources 2022-10-23 18:02:40 -04:00
4eb7c5172a
Separate Xresources files for now 2022-10-23 18:02:40 -04:00
c4ab321b23
Updated install.sh 2022-10-23 18:02:40 -04:00
b882c96747
Update install.sh 2022-10-23 18:02:40 -04:00
78d052c4a7
Merged zenburn and gruvbox colors to same Xresources 2022-10-23 18:02:38 -04:00
f5bc96c1d5
Separate Xresources files for now 2022-10-23 18:01:49 -04:00
25342f6311
Updated install.sh 2022-10-23 18:01:47 -04:00
8ff6a6a860
Initial commit 2022-10-23 17:59:11 -04:00
9b0257ee5d
Resolve conflicts from git rebase main 2022-10-23 17:30:53 -04:00
c0b16d84d0
Update install.sh 2022-10-23 17:21:19 -04:00
7d7e8908f2
Merged zenburn and gruvbox colors to same Xresources 2022-10-23 17:21:19 -04:00
3759901f0e
Separate Xresources files for now 2022-10-23 17:21:19 -04:00
08af8636a6
Updated install.sh 2022-10-23 17:21:19 -04:00
a4b4aef3a4
Updated for Font Awesome 6 2022-10-23 17:21:19 -04:00
59de208949
Added .profile (again) 2022-10-23 17:21:19 -04:00
02bb619d83
Remove dpi setting from .Xresources 2022-10-23 17:21:19 -04:00
02727b2dc0
Show icons in rofi app menu 2022-10-23 17:21:19 -04:00
5f8e412669
Added teams-for-linux 2022-10-23 17:21:19 -04:00
5daa458081
Update install.sh 2022-10-23 17:21:18 -04:00
51976ad1d7
Merged zenburn and gruvbox colors to same Xresources 2022-10-23 17:21:18 -04:00
b354222b8a
Separate Xresources files for now 2022-10-23 17:21:18 -04:00
39177eba28
Updated install.sh 2022-10-23 17:21:18 -04:00
d3f7059081
Added and changed to zenburn theme globally 2022-10-23 17:21:18 -04:00
bd95b14070
Added rule for KeePassXC 2022-10-23 17:21:18 -04:00
93b8406834
Removed ranger 2022-10-23 17:21:18 -04:00
38a7985761
Default to 1080p 2022-10-23 17:21:18 -04:00
06ee0e95c2
Rebase 2022-10-23 17:21:16 -04:00
96bc55b90d
Rebase conflicts resolve 2022-10-23 17:19:34 -04:00
21a27a9bda
Resolve conflicts from git rebase maiN 2022-10-23 17:19:33 -04:00
171d3edd66
Added xsettingsd 2022-10-23 16:50:02 -04:00
c4caa65fcf
Update .gitignore.main 2022-10-23 16:49:10 -04:00
2539f6ac96
Import changes from laptop-hidpi branch 2022-10-23 16:45:02 -04:00
1b902820f4
sink-nicknames option replaced with node-nicknames 2022-10-11 21:23:03 -04:00
5 changed files with 84 additions and 66 deletions

View file

@ -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

View file

@ -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

View file

@ -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
;

View 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"

View file

@ -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