Skip to content

Commit ddc5035

Browse files
committed
feat: Theme update + ASDF
1 parent c58e711 commit ddc5035

File tree

7 files changed

+48
-39
lines changed

7 files changed

+48
-39
lines changed

.config/bat/config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
--style="header-filesize,changes,numbers"
2-
--theme="gruvbox-dark"
2+
--theme="Solarized (dark)"

.config/dunst/dunstrc

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -90,23 +90,23 @@
9090
[urgency_low]
9191
# IMPORTANT: colors have to be defined in quotation marks.
9292
# Otherwise the "#" and following would be interpreted as a comment.
93-
background = "#282828CC"
94-
foreground = "#ebdbb2"
95-
frame_color = "#ebdbb2"
93+
background = "#002b36CC"
94+
foreground = "#BBBBBB"
95+
frame_color = "#859900"
9696
timeout = 10
9797
# Icon for notifications with low urgency, uncomment to enable
9898
#icon = /path/to/icon
9999
[urgency_normal]
100-
background = "#282828CC"
101-
foreground = "#ebdbb2"
102-
frame_color = "#d79921"
100+
background = "#002b36CC"
101+
foreground = "#BBBBBB"
102+
frame_color = "#b58900"
103103
timeout = 10
104104
# Icon for notifications with normal urgency, uncomment to enable
105105
#icon = /path/to/icon
106106
[urgency_critical]
107-
background = "#282828CC"
108-
foreground = "#ebdbb2"
109-
frame_color = "#cc241d"
107+
background = "#002b36CC"
108+
foreground = "#BBBBBB"
109+
frame_color = "#dc322f"
110110
timeout = 0
111111
# Icon for notifications with critical urgency, uncomment to enable
112112
#icon = /path/to/icon

.config/kitty/kitty.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1513,5 +1513,5 @@ map ctrl+] layout_action increase_num_full_size_windows
15131513

15141514

15151515
# BEGIN_KITTY_THEME
1516-
include ./dracula-theme.conf
1516+
include ./solarized-dark-higher-contrast-theme.conf
15171517
# END_KITTY_THEME

.config/waybar/style.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
margin-bottom: 1px;
1212
}
1313

14-
@import "dracula.css";
14+
@import "tomorrow-night.css";
1515

1616
window#waybar {
1717
background: @background-transparent;
@@ -58,7 +58,7 @@ window#waybar.hidden {
5858
}
5959

6060
#workspaces button.focused {
61-
background: @purple;
61+
background: @green;
6262
color: @background;
6363
}
6464

.config/waybar/tomorrow-night.css

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
@define-color background-darker rgba(29, 31, 33, 230);
2+
@define-color background-transparent rgba(29, 31, 33, 0.8);
3+
@define-color background #1d1f21;
4+
@define-color selection #363a41;
5+
@define-color foreground #c5c8c6;
6+
@define-color comment #5a5b5a;
7+
@define-color cyan #8abeb7;
8+
@define-color green #b5bd68;
9+
@define-color orange #de935f;
10+
@define-color pink #ff79c6;
11+
@define-color purple #b294bb;
12+
@define-color red #cc6666;
13+
@define-color yellow #f0c674;

.emacs.d/Emacs.org

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ Ensure environment variables (like ~PATH~) are loaded from SHELL:
8787

8888
* Aesthetics
8989
** Theme
90-
I manage my Emacs theme with ~doom-themes~. Although I'm currently in love with Gruvbox, I like to swap things around from time to time, and ~doom-themes~ bundles up a lot of great themes for me to try.
90+
I manage my Emacs theme with ~doom-themes~. I like to swap things around from time to time, and ~doom-themes~ bundles up a lot of great themes for me to try.
9191
#+BEGIN_SRC emacs-lisp :results output silent :results output silent
9292
(use-package solaire-mode
9393
;; Darkens "support" buffers (those not opening a file) to help distinguish them
@@ -99,12 +99,15 @@ I manage my Emacs theme with ~doom-themes~. Although I'm currently in love with
9999
(setq doom-themes-enable-bold t
100100
doom-themes-enable-italic t
101101
doom-nord-brighter-comments t
102-
doom-gruvbox-brighter-comments t
103102
doom-dracula-colorful-headers t
104103
doom-dracula-brighter-comments t
105104
doom-dracula-comment-bg nil
105+
doom-solarized-dark-high-contrast-brighter-modeline nil
106+
doom-solarized-dark-high-contrast-brighter-comments t
107+
doom-solarized-dark-brighter-text t
108+
doom-gruvbox-brighter-comments t
106109
doom-gruvbox-dark-variant "hard")
107-
(load-theme 'doom-dracula t)
110+
(load-theme 'doom-solarized-dark)
108111

109112
;; Enable flashing mode-line on errors
110113
(doom-themes-visual-bell-config)
@@ -770,8 +773,9 @@ The org mode itself.
770773
** Bibliography and references
771774
#+BEGIN_SRC emacs-lisp :results output silent
772775
(setq bibtex-completion-bibliography (list (concat org-directory "bibliography/references.bib"))
773-
bibtex-completion-library-path (concat org-directory "bibliography/pdfs/")
776+
bibtex-completion-library-path (concat org-directory "bibliography/pdfs")
774777
bibtex-completion-notes-path (concat org-directory "notes")
778+
bibtex-completion-pdf-field "File"
775779
org-bibtex-file (list (concat org-directory "bibliography/references.bib"))
776780
bibtex-completion-notes-template-multiple-files ":PROPERTIES:\n:ID: ${id}\n:Custom_ID: ${=key=}\n:AUTHOR: ${author-or-editor}\n:ROAM_REFS: ${citekey}\n:BTYPE: \n:YEAR: ${year}\n:END:\n#+TITLE: ${title}\n#+AUTHOR: ${author}\n#+FILETAGS: ${keywords}\n#+DATE: %U\n#+STARTUP: inlineimages\n#+STARTUP: latexpreview\n")
777781

@@ -782,9 +786,7 @@ The org mode itself.
782786
(inproceedings . "${=has-pdf=:1}${=has-note=:1} ${=type=:4} ${year:4} ${author:36} ${title:*} ${booktitle:40}")
783787
(t . "${=has-pdf=:1}${=has-note=:1} ${=type=:4} ${year:4} ${author:36} ${title:*}")))
784788

785-
(setq bibtex-completion-pdf-open-function
786-
(lambda (fpath)
787-
(start-process "open" "*open*" "open" fpath)))
789+
(setq bibtex-completion-pdf-open-function 'find-file)
788790

789791
(use-package org-ref
790792
:after org-roam)
@@ -808,9 +810,6 @@ The org mode itself.
808810
:config
809811
(setq ivy-re-builders-alist '((ivy-bibtex . ivy--regex-ignore-order)
810812
(t . ivy--regex-plus))
811-
bibtex-completion-bibliography (concat org-directory "bibliography/references.bib")
812-
bibtex-completion-pdf-field "File"
813-
bibtex-completion-notes-path (concat org-directory "notes")
814813
bibtex-completion-additional-search-fields '(keywords))
815814
:bind
816815
(("C-c n B" . ivy-bibtex)))
@@ -841,6 +840,8 @@ The org mode itself.
841840
(:map org-mode-map :package org ("C-c n b" . #'org-cite-insert)))
842841

843842
(org-roam-bibtex-mode)
843+
844+
(use-package pdf-tools)
844845
#+END_SRC
845846

846847
** Deft
@@ -998,6 +999,7 @@ Language server protocol for auto-completion with company-mode.
998999
(rust-ts-mode . lsp)
9991000
(typescript-mode . lsp)
10001001
(typescript-ts-mode . lsp)
1002+
(tsx-ts-mode . lsp)
10011003
(go-mode . lsp)
10021004
(go-ts-mode . lsp)
10031005
(lsp-mode . lsp-enable-which-key-integration))
@@ -1080,16 +1082,8 @@ Language server protocol for auto-completion with company-mode.
10801082

10811083
** Typescript
10821084
#+BEGIN_SRC emacs-lisp :results output silent
1083-
(use-package web-mode)
1084-
(add-to-list 'auto-mode-alist '("\\.jsx\\'" . web-mode))
1085-
(add-to-list 'auto-mode-alist '("\\.tsx\\'" . web-mode))
1086-
10871085
(setq typescript-ts-mode-indent-offset 4)
10881086

1089-
(use-package tide
1090-
:ensure t
1091-
:after (typescript-mode company flycheck)
1092-
:hook ((typescript-mode . tide-setup)
1093-
(typescript-mode . tide-hl-identifier-mode)
1094-
(before-save . tide-format-before-save)))
1087+
(use-package tsx-mode
1088+
:straight (:host github :repo "orzechowskid/tsx-mode.el" :branch "emacs29"))
10951089
#+END_SRC

.zshrc

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,11 @@ if [ -d "$HOME/.local/bin" ] ; then
2323
PATH="$HOME/.local/bin:$PATH"
2424
fi
2525

26-
# Firefox Wayland
26+
# Wayland
2727
if [[ "$XDG_SESSION_TYPE" == "wayland" ]] ; then
2828
export MOZ_ENABLE_WAYLAND=1
29+
export QT_QPA_PLATFORM=wayland
30+
export ANKI_WAYLAND=1
2931
fi
3032

3133
export EDITOR="emacsclient -c -a \"emacs\""
@@ -40,11 +42,8 @@ export PATH="$HOME/.rustup:$PATH"
4042
export PATH="/usr/local/go/bin:$PATH"
4143
export GOPATH="$HOME/.go"
4244

43-
# PyENV settings
44-
export PYENV_ROOT="$HOME/.pyenv"
45-
export PATH="$PYENV_ROOT/bin:$PATH"
46-
eval "$(pyenv init --path)"
47-
eval "$(pyenv virtualenv-init -)"
45+
# ASDF
46+
source /opt/asdf-vm/asdf.sh
4847

4948
# Functions
5049
function startBwSession() {
@@ -58,5 +57,8 @@ alias gh-login="bw get item 'GitHub' | jq -r '.fields[1].value' | gh auth login
5857
alias config="git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME"
5958
alias s="kitty +kitten ssh"
6059

60+
# direnv
61+
source "${XDG_CONFIG_HOME:-$HOME/.config}/asdf-direnv/zshrc"
62+
6163
# Startup starship prompt
6264
eval "$(starship init zsh)"

0 commit comments

Comments
 (0)