stuff
This commit is contained in:
parent
1d9f9d17c5
commit
39241004ff
@ -5,20 +5,20 @@ style = "Block"
|
|||||||
unfocused_hollow = false
|
unfocused_hollow = false
|
||||||
|
|
||||||
[font]
|
[font]
|
||||||
size = 11.0
|
size = 13.0
|
||||||
|
|
||||||
[font.bold]
|
[font.bold]
|
||||||
family = "JetBrainsMono Nerd Font"
|
family = "ZedMono Nerd Font"
|
||||||
|
|
||||||
[font.glyph_offset]
|
[font.glyph_offset]
|
||||||
x = 0
|
x = 0
|
||||||
y = 0
|
y = 0
|
||||||
|
|
||||||
[font.italic]
|
[font.italic]
|
||||||
family = "JetBrainsMono Nerd Font"
|
family = "ZedMono Nerd Font"
|
||||||
|
|
||||||
[font.normal]
|
[font.normal]
|
||||||
family = "JetBrainsMono Nerd Font"
|
family = "ZedMono Nerd Font"
|
||||||
|
|
||||||
[font.offset]
|
[font.offset]
|
||||||
x = 0
|
x = 0
|
||||||
|
@ -14,6 +14,11 @@
|
|||||||
'("melpa" . "https://melpa.org/packages/") t)
|
'("melpa" . "https://melpa.org/packages/") t)
|
||||||
#+END_SRC
|
#+END_SRC
|
||||||
* General emacs
|
* General emacs
|
||||||
|
** Bell Mode
|
||||||
|
#+BEGIN_SRC emacs-lisp
|
||||||
|
(setq ring-bell-function 'ignore)
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
** Tab bar mode
|
** Tab bar mode
|
||||||
#+BEGIN_SRC emacs-lisp
|
#+BEGIN_SRC emacs-lisp
|
||||||
(defun my-tabbar-buffer-groups () ;; customize to show all normal files in one group
|
(defun my-tabbar-buffer-groups () ;; customize to show all normal files in one group
|
||||||
@ -45,6 +50,21 @@
|
|||||||
#+BEGIN_SRC emacs-lisp
|
#+BEGIN_SRC emacs-lisp
|
||||||
(setq line-move-visual nil)
|
(setq line-move-visual nil)
|
||||||
#+END_SRC
|
#+END_SRC
|
||||||
|
** Fuzy Wuzzy
|
||||||
|
#+BEGIN_SRC emacs-lisp
|
||||||
|
(use-package ivy
|
||||||
|
:ensure t)
|
||||||
|
(use-package counsel
|
||||||
|
:ensure t)
|
||||||
|
(ivy-mode 1)
|
||||||
|
(counsel-mode 1)
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
** Electric Pair Mode
|
||||||
|
#+BEGIN_SRC emacs-lisp
|
||||||
|
(electric-pair-mode)
|
||||||
|
(electric-quote-mode)
|
||||||
|
#+END_SRC
|
||||||
** GUI stuff
|
** GUI stuff
|
||||||
#+BEGIN_SRC emacs-lisp
|
#+BEGIN_SRC emacs-lisp
|
||||||
(menu-bar-mode -1)
|
(menu-bar-mode -1)
|
||||||
@ -83,10 +103,39 @@
|
|||||||
#+END_SRC
|
#+END_SRC
|
||||||
** Font
|
** Font
|
||||||
#+BEGIN_SRC emacs-lisp
|
#+BEGIN_SRC emacs-lisp
|
||||||
(let ((font "JetBrains Mono-12:style=Regular"))
|
;; (let ((font "JetBrains Mono-13:style=Regular"))
|
||||||
(set-face-attribute 'default nil :font font)
|
;; (set-face-attribute 'default nil :font font)
|
||||||
|
;; (set-frame-font font nil t))
|
||||||
|
(let ((font "ZedMono Nerd Font-13:style=Regular"))
|
||||||
|
(set-face-attribute 'default nil :font font)
|
||||||
(set-frame-font font nil t))
|
(set-frame-font font nil t))
|
||||||
|
;; This assumes you've installed the package via MELPA.
|
||||||
|
(use-package ligature
|
||||||
|
:config
|
||||||
|
;; Enable the "www" ligature in every possible major mode
|
||||||
|
(ligature-set-ligatures 't '("www"))
|
||||||
|
;; Enable traditional ligature support in eww-mode, if the
|
||||||
|
;; `variable-pitch' face supports it
|
||||||
|
(ligature-set-ligatures 'eww-mode '("ff" "fi" "ffi"))
|
||||||
|
;; Enable all Cascadia Code ligatures in programming modes
|
||||||
|
(ligature-set-ligatures 'prog-mode '("|||>" "<|||" "<==>" "<!--" "####" "~~>" "***" "||=" "||>"
|
||||||
|
":::" "::=" "=:=" "===" "==>" "=!=" "=>>" "=<<" "=/=" "!=="
|
||||||
|
"!!." ">=>" ">>=" ">>>" ">>-" ">->" "->>" "-->" "---" "-<<"
|
||||||
|
"<~~" "<~>" "<*>" "<||" "<|>" "<$>" "<==" "<=>" "<=<" "<->"
|
||||||
|
"<--" "<-<" "<<=" "<<-" "<<<" "<+>" "</>" "###" "#_(" "..<"
|
||||||
|
"..." "+++" "/==" "///" "_|_" "www" "&&" "^=" "~~" "~@" "~="
|
||||||
|
"~>" "~-" "**" "*>" "*/" "||" "|}" "|]" "|=" "|>" "|-" "{|"
|
||||||
|
"[|" "]#" "::" ":=" ":>" ":<" "$>" "==" "=>" "!=" "!!" ">:"
|
||||||
|
">=" ">>" ">-" "-~" "-|" "->" "--" "-<" "<~" "<*" "<|" "<:"
|
||||||
|
"<$" "<=" "<>" "<-" "<<" "<+" "</" "#{" "#[" "#:" "#=" "#!"
|
||||||
|
"##" "#(" "#?" "#_" "%%" ".=" ".-" ".." ".?" "+>" "++" "?:"
|
||||||
|
"?=" "?." "??" ";;" "/*" "/=" "/>" "//" "__" "~~" "(*" "*)"
|
||||||
|
"\\\\" "://"))
|
||||||
|
;; Enables ligature checks globally in all buffers. You can also do it
|
||||||
|
;; per mode with `ligature-mode'.
|
||||||
|
(global-ligature-mode t))
|
||||||
#+END_SRC
|
#+END_SRC
|
||||||
|
|
||||||
** Catppuccin and theme notify watcher
|
** Catppuccin and theme notify watcher
|
||||||
#+BEGIN_SRC emacs-lisp
|
#+BEGIN_SRC emacs-lisp
|
||||||
(use-package catppuccin-theme
|
(use-package catppuccin-theme
|
||||||
@ -104,10 +153,11 @@
|
|||||||
(if (not (eq catppuccin-flavor current-flavor))
|
(if (not (eq catppuccin-flavor current-flavor))
|
||||||
(catppuccin-reload))))
|
(catppuccin-reload))))
|
||||||
|
|
||||||
(set-system-theme)
|
(set-system-theme) (catppuccin-reload)
|
||||||
(file-notify-add-watch *theme-file* '(change)
|
(file-notify-add-watch *theme-file* '(change)
|
||||||
#'(lambda (event) (set-system-theme)))
|
#'(lambda (event) (set-system-theme)))
|
||||||
#+END_SRC
|
#+END_SRC
|
||||||
|
|
||||||
** Doom-modeline
|
** Doom-modeline
|
||||||
#+BEGIN_SRC emacs-lisp
|
#+BEGIN_SRC emacs-lisp
|
||||||
(use-package doom-modeline
|
(use-package doom-modeline
|
||||||
@ -265,13 +315,13 @@ must run ~(all-the-icons-install-fonts)~ and ~(nerd-fonts-install-fonts)~
|
|||||||
(setq lsp-keymap-prefix "C-c l")
|
(setq lsp-keymap-prefix "C-c l")
|
||||||
:hook ((python-ts-mode . lsp) ;; pip install python-lsp-server pyls-black pyls-isort pyls-mypy
|
:hook ((python-ts-mode . lsp) ;; pip install python-lsp-server pyls-black pyls-isort pyls-mypy
|
||||||
(elixir-mode . lsp)
|
(elixir-mode . lsp)
|
||||||
(rust-mode . lsp)
|
(rust-ts-mode . lsp)
|
||||||
(go-ts-mode . lsp)
|
(go-ts-mode . lsp)
|
||||||
(java-mode . lsp)
|
(java-mode . lsp)
|
||||||
(php-mode . lsp)
|
(php-mode . lsp)
|
||||||
(c-mode . lsp)
|
(c-mode . lsp)
|
||||||
(typescript-ts-mode . lsp)
|
(typescript-ts-mode . lsp)
|
||||||
(tsx-ts-mode . lsp)
|
(tsx-ts-mode . lsp)
|
||||||
(lsp-mode . lsp-enable-which-key-integration))
|
(lsp-mode . lsp-enable-which-key-integration))
|
||||||
:config (progn
|
:config (progn
|
||||||
(lsp-register-custom-settings
|
(lsp-register-custom-settings
|
||||||
|
3
.zshrc
3
.zshrc
@ -61,3 +61,6 @@ alias vim="nvim"
|
|||||||
# Wasmer
|
# Wasmer
|
||||||
export WASMER_DIR="/Users/lizzy/.wasmer"
|
export WASMER_DIR="/Users/lizzy/.wasmer"
|
||||||
[ -s "$WASMER_DIR/wasmer.sh" ] && source "$WASMER_DIR/wasmer.sh"
|
[ -s "$WASMER_DIR/wasmer.sh" ] && source "$WASMER_DIR/wasmer.sh"
|
||||||
|
|
||||||
|
# bun completions
|
||||||
|
[ -s "/Users/lizzy/.bun/_bun" ] && source "/Users/lizzy/.bun/_bun"
|
||||||
|
@ -24,16 +24,9 @@ source /Users/lizzy/.wasmer/wasmer.sh
|
|||||||
|
|
||||||
eval "$(zoxide init --cmd z zsh)"
|
eval "$(zoxide init --cmd z zsh)"
|
||||||
|
|
||||||
if [ -f ~/.gnupg/.gpg-agent-info ] && [ -n "$(pgrep gpg-agent)" ]; then
|
. "$HOME/.cargo/env"
|
||||||
source ~/.gnupg/.gpg-agent-info
|
|
||||||
export GPG_AGENT_INFO
|
|
||||||
else
|
|
||||||
eval $(gpg-agent --daemon --write-env-file ~/.gnupg/.gpg-agent-info)
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
|
if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
|
||||||
export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
|
export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
|
||||||
fi
|
fi
|
||||||
export GPG_TTY=$(tty)
|
export GPG_TTY=$(tty)
|
||||||
|
|
||||||
. "$HOME/.cargo/env"
|
|
||||||
|
Loading…
Reference in New Issue
Block a user