add totoro config

.config/alacritty/alacritty.toml

@@ -1,24 +1,24 @@
-import = ["~/.config/alacritty/theme.toml"]
+general.import = ["~/.config/alacritty/theme.toml"]
 
 [cursor]
 style = "Block"
 unfocused_hollow = false
 
 [font]
-size = 11.0
+size = 13.0
 
 [font.bold]
-family = "JetBrainsMono Nerd Font"
+family = "ZedMono Nerd Font"
 
 [font.glyph_offset]
 x = 0
 y = 0
 
 [font.italic]
-family = "JetBrainsMono Nerd Font"
+family = "ZedMono Nerd Font"
 
 [font.normal]
-family = "JetBrainsMono Nerd Font"
+family = "ZedMono Nerd Font"
 
 [font.offset]
 x = 0

.config/alacritty/dark.toml

@@ -1,4 +1,4 @@
-import = [
+general.import = [
-  "~/.config/alacritty/catppucin-mocha.toml",
+  "~/.config/alacritty/oceanic_next.toml",
   "~/.config/alacritty/config.toml"
 ]

.config/alacritty/oceanic_next.toml

@@ -0,0 +1,28 @@
+# Colors (Oceanic Next)
+
+# Default colors
+[colors.primary]
+background = '#1b2b34'
+foreground = '#d8dee9'
+
+# Normal colors
+[colors.normal]
+black   = '#29414f'
+red     = '#ec5f67'
+green   = '#99c794'
+yellow  = '#fac863'
+blue    = '#6699cc'
+magenta = '#c594c5'
+cyan    = '#5fb3b3'
+white   = '#65737e'
+
+# Bright colors
+[colors.bright]
+black   = '#405860'
+red     = '#ec5f67'
+green   = '#99c794'
+yellow  = '#fac863'
+blue    = '#6699cc'
+magenta = '#c594c5'
+cyan    = '#5fb3b3'
+white   = '#adb5c0'

.config/nvim/lazy-lock.json

@@ -1,27 +1,27 @@
 {
-  "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
+  "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
-  "LuaSnip": { "branch": "master", "commit": "878ace11983444d865a72e1759dbcc331d1ace4c" },
+  "LuaSnip": { "branch": "master", "commit": "8d7aa7a7b7c0875e4878d1d2590924bc1c229305" },
-  "bufferline.nvim": { "branch": "main", "commit": "99337f63f0a3c3ab9519f3d1da7618ca4f91cffe" },
+  "bufferline.nvim": { "branch": "main", "commit": "5cc447cb2b463cb499c82eaeabbed4f5fa6a0a44" },
-  "catppuccin": { "branch": "main", "commit": "5215ea59df6d0a7e27da9a5cd1165e06d1b04cbe" },
+  "catppuccin": { "branch": "main", "commit": "65bf0b16f57a3db70d6a93ac68882dd9a31d0565" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
   "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
-  "conform.nvim": { "branch": "master", "commit": "f3b930db4964d60e255c8f9e37b7f2218dfc08cb" },
+  "conform.nvim": { "branch": "master", "commit": "4dd429fe3f47077f4e50cdaf03f7877ce9b213e0" },
-  "friendly-snippets": { "branch": "main", "commit": "dd2fd1281d4b22e7b4a5bfafa3e142d958e251f2" },
+  "friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" },
   "fwatch.nvim": { "branch": "main", "commit": "a691f7349dc66285cd75a1a698dd28bca45f2bf8" },
-  "gitsigns.nvim": { "branch": "main", "commit": "cdfcd9d39d23c46ae9a040de2c6a8b8bf868746e" },
+  "gitsigns.nvim": { "branch": "main", "commit": "7c27a30450130cd59c4994a6755e3c5d74d83e76" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "04e44b09ee3ff189c69ab082edac1ef7ae2e256c" },
-  "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" },
+  "lazy.nvim": { "branch": "main", "commit": "cf8ecc2c5e4332760431a33534240b0cbc6680ab" },
-  "mason.nvim": { "branch": "main", "commit": "49ff59aded1047a773670651cfa40e76e63c6377" },
+  "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
-  "mini.statusline": { "branch": "main", "commit": "b5d23c5356e837f9e6426ffeed9f5acd0629bc07" },
+  "mini.statusline": { "branch": "main", "commit": "813854243156472c9d0bc9c64ea0af159b9b37ca" },
-  "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" },
+  "nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" },
-  "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" },
+  "nvim-cmp": { "branch": "main", "commit": "f17d9b4394027ff4442b298398dfcaab97e40c4f" },
-  "nvim-lspconfig": { "branch": "master", "commit": "b972e7154bc94ab4ecdbb38c8edbccac36f83996" },
+  "nvim-lspconfig": { "branch": "master", "commit": "54617a18f4cf46f0c2f6d024fa6feb7515fe036d" },
-  "nvim-tree.lua": { "branch": "master", "commit": "517e4fbb9ef3c0986da7047f44b4b91a2400f93c" },
+  "nvim-tree.lua": { "branch": "master", "commit": "82ab19ebf79c1839d7351f2fed213d1af13a598e" },
-  "nvim-treesitter": { "branch": "master", "commit": "245da4eb2e52d14b034bbbedec9671e997ede764" },
+  "nvim-treesitter": { "branch": "master", "commit": "38c12cb9ac8e1c547a8472c87df9e9d7c8b1af0d" },
-  "nvim-web-devicons": { "branch": "master", "commit": "b77921fdc44833c994fdb389d658ccbce5490c16" },
+  "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" },
-  "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
+  "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
-  "telescope.nvim": { "branch": "master", "commit": "349660c0d35da06459ee8589af77de2086b652ce" }
+  "telescope.nvim": { "branch": "master", "commit": "85922dde3767e01d42a08e750a773effbffaea3e" }
-}
+}

.config/sway/config

@@ -19,8 +19,7 @@ set $wallpapers_path $HOME/Wallpapers
 
 ### Output configuration
 #
-# Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/)
+output * bg `find $wallpapers_path/$(cat $HOME/theme) -type f | grep -v "gitkeep" | shuf -n 1` fill
-output * bg `find $wallpapers_path/$([ -z "$DARK_MODE" ] && echo "light" || echo "dark") -type f | grep -v "gitkeep" | shuf -n 1` fill
 
 # VNC External Monitor
 output HEADLESS-1 {
@@ -62,7 +61,7 @@ exec swayidle -w \
 #
     bindsym $mod+Shift+n exec swaylock-corrupter
     # Start a terminal
-    bindsym $mod+Return exec $term
+    bindsym $mod+Shift+Return exec $term
 
     # Kill focused window
     bindsym $mod+Shift+q kill
@@ -231,3 +230,4 @@ exec systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
 exec dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway
 exec "systemctl --user import-environment {,WAYLAND_}DISPLAY SWAYSOCK; systemctl --user start sway-session.target"
 exec swaymsg -t subscribe '["shutdown"]' && systemctl --user stop sway-session.target
+exec emacs-keys-everywhere

.config/waybar/style.css

@@ -30,7 +30,7 @@
 @define-color rosewater #f5e0dc;
 
 * {
-  font-family: JetBrainsMono;
+  font-family: ZedMonoNerd;
   font-size: 12px;
   color: @text; /* Foreground "black" */
 }

.config/waybar/style.dark.css

@@ -30,7 +30,7 @@
 @define-color rosewater #f5e0dc;
 
 * {
-  font-family: JetBrainsMono;
+  font-family: ZedMonoNerdFont;
   font-size: 12px;
 }
 
@@ -39,7 +39,7 @@ window > box {
 }
 
 window#waybar {
-  background: shade(alpha(@base, 0.6), .95);
+  background: shade(alpha(@base, 0.0), 0);/*.95);*/
   border-radius: 3px;
 }
 
@@ -47,7 +47,7 @@ window#waybar {
 
 #workspaces, #clock, #battery, #cpu, #memory, #disk, #temperature, #backlight, #network, #pulseaudio, #custom-media, #custom-launcher, #custom-power, #tray, #mode, #idle_inhibitor , #mpd, #mpris, #custom-aggietimed {
   background: @base;
-  border-radius: 12px;
+  border-radius: 8px;
   border: 2px solid @text;
   margin-right: 5px;
   margin-left: 5px;
@@ -59,7 +59,7 @@ window#waybar {
 #workspaces {
   background: @mantle;
   padding: 2px;
-  border-radius: 10px;
+  border-radius: 8px;
 }
 
 #workspaces button {

.emacs.d/settings.org

@@ -14,6 +14,11 @@
                '("melpa" . "https://melpa.org/packages/") t)
 #+END_SRC
 * General emacs
+** Bell Mode
+#+BEGIN_SRC emacs-lisp
+  (setq ring-bell-function 'ignore)
+#+END_SRC
+
 ** Tab bar mode
 #+BEGIN_SRC emacs-lisp
   (defun my-tabbar-buffer-groups () ;; customize to show all normal files in one group
@@ -45,6 +50,21 @@
 #+BEGIN_SRC emacs-lisp
   (setq line-move-visual nil)
 #+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
 #+BEGIN_SRC emacs-lisp
   (menu-bar-mode -1)
@@ -63,21 +83,6 @@
     (do-frame-config)
     (add-hook 'after-make-frame-functions 'disable-scroll-bars))
 #+END_SRC
-*** submlimity
-#+BEGIN_SRC emacs-lisp
-  (use-package sublimity
-    :ensure t
-    :straight '(sublimity
-                :type git
-                :host github
-                :repo "zk-phi/sublimity"))
-
-  (require 'sublimity-scroll)
-  ;;(require 'sublimity-map) ;; experimental
-  (require 'sublimity-attractive)
-
-  (sublimity-mode 1)
-#+END_SRC
 ** System path (macos)
 #+BEGIN_SRC emacs-lisp
   (use-package exec-path-from-shell
@@ -98,10 +103,39 @@
 #+END_SRC
 ** Font
 #+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))
+  ;; 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
+
 ** Catppuccin and theme notify watcher
 #+BEGIN_SRC emacs-lisp
   (use-package catppuccin-theme
@@ -119,10 +153,11 @@
       (if (not (eq catppuccin-flavor current-flavor))
         (catppuccin-reload))))
 
-  (set-system-theme)
+  (set-system-theme) (catppuccin-reload)
   (file-notify-add-watch *theme-file* '(change)
   			 #'(lambda (event) (set-system-theme)))
 #+END_SRC
+
 ** Doom-modeline
 #+BEGIN_SRC emacs-lisp
   (use-package doom-modeline
@@ -280,13 +315,13 @@ must run ~(all-the-icons-install-fonts)~ and ~(nerd-fonts-install-fonts)~
     (setq lsp-keymap-prefix "C-c l")
     :hook ((python-ts-mode . lsp) ;; pip install python-lsp-server pyls-black pyls-isort pyls-mypy
            (elixir-mode . lsp)
-           (rust-mode . lsp)
+           (rust-ts-mode . lsp)
-  	       (go-ts-mode . lsp)
+ 	       (go-ts-mode . lsp)
            (java-mode . lsp)
            (php-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))
     :config (progn
   	    (lsp-register-custom-settings

.zshrc

@@ -61,3 +61,6 @@ alias vim="nvim"
 # Wasmer
 export WASMER_DIR="/Users/lizzy/.wasmer"
 [ -s "$WASMER_DIR/wasmer.sh" ] && source "$WASMER_DIR/wasmer.sh"
+
+# bun completions
+[ -s "/Users/lizzy/.bun/_bun" ] && source "/Users/lizzy/.bun/_bun"

scripts/machine-specific-zsh/armin.zsh

@@ -24,14 +24,7 @@ source /Users/lizzy/.wasmer/wasmer.sh
 
 eval "$(zoxide init --cmd z zsh)"
 
-# Add the following to your shell init to set up gpg-agent automatically for every shell
+. "$HOME/.cargo/env"
-# Add the following to your shell init to set up gpg-agent automatically for every shell
-if [ -f ~/.gnupg/.gpg-agent-info ] && [ -n "$(pgrep gpg-agent)" ]; then
-    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
   export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"

scripts/machine-specific-zsh/asuka.zsh

@@ -1,4 +1,3 @@
-
 eval "$(zoxide init --cmd z zsh)"
 
 if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
@@ -7,3 +6,9 @@ fi
 export GPG_TTY=$(tty)
 
 . /opt/asdf-vm/asdf.sh
+
+export PYENV_ROOT="$HOME/.pyenv"
+[[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"
+eval "$(pyenv init -)"
+
+export PATH=$PATH:/home/lizzy/.pyenv/shims

scripts/machine-specific-zsh/totoro.zsh

@@ -0,0 +1,8 @@
+unset SSH_AGENT_PID
+if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
+  export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
+fi
+export GPG_TTY=$(tty)
+gpg-connect-agent updatestartuptty /bye >/dev/null
+
+eval "$(zoxide init zsh)"