fix gpg

.config/alacritty/alacritty.toml

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

.config/alacritty/dark.toml

@@ -1,4 +1,23 @@
-general.import = [
+[colors.bright]
-  "~/.config/alacritty/oceanic_next.toml",
+black = "0x747c84"
-  "~/.config/alacritty/config.toml"
+blue = "0xae95c7"
-]
+cyan = "0x95aec7"
+green = "0x95c7ae"
+magenta = "0xc795ae"
+red = "0xc7ae95"
+white = "0xf3f4f5"
+yellow = "0xaec795"
+
+[colors.normal]
+black = "0x1c2023"
+blue = "0xae95c7"
+cyan = "0x95aec7"
+green = "0x95c7ae"
+magenta = "0xc795ae"
+red = "0xc7ae95"
+white = "0xc7ccd1"
+yellow = "0xaec795"
+
+[colors.primary]
+background = "0x141322"
+foreground = "0xf09db9"

.config/alacritty/dark.yml

@@ -0,0 +1,27 @@
+colors:
+  # Default colors
+  primary:
+    background: '0x1c2023'
+    foreground: '0xe07c9f'
+
+  # Normal colors
+  normal:
+    black:   '0x1c2023'
+    red:     '0xc7ae95'
+    green:   '0x95c7ae'
+    yellow:  '0xaec795'
+    blue:    '0xae95c7'
+    magenta: '0xc795ae'
+    cyan:    '0x95aec7'
+    white:   '0xc7ccd1'
+
+  # Bright colors
+  bright:
+    black:   '0x747c84'
+    red:     '0xc7ae95'
+    green:   '0x95c7ae'
+    yellow:  '0xaec795'
+    blue:    '0xae95c7'
+    magenta: '0xc795ae'
+    cyan:    '0x95aec7'
+    white:   '0xf3f4f5'

.config/alacritty/oceanic_next.toml

@@ -1,28 +0,0 @@
-# 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/dunst/dunstrc

@@ -1,17 +1,17 @@
 [global]
-frame_color = "#89b4fa"
+frame_color = "#f09db9"
 separator_color= frame
 
 [urgency_low]
-background = "#1e1e2e"
+background = "#141322"
-foreground = "#cdd6f4"
+foreground = "#f09db9"
 
 [urgency_normal]
-background = "#1e1e2e"
+background = "#141322"
-foreground = "#cdd6f4"
+foreground = "#f09db9"
 
 [urgency_critical]
-background = "#1e1e2e"
+background = "#141322"
-foreground = "#cdd6f4"
+foreground = "#f09db9"
-frame_color = "#fab387"
+frame_color = "#c7ae95"
 

.config/gtk-3.0/settings.ini

@@ -3,7 +3,7 @@ gtk-application-prefer-dark-theme=1
 gtk-cursor-theme-name=Oxygen 19 Pink Blossom
 gtk-key-theme-name=Emacs
 
-gtk-theme-name=Adwaita
+gtk-theme-name=Marwaita-s-Dark-Pink
 gtk-icon-theme-name=Adwaita
 gtk-font-name=Cantarell 11
 gtk-cursor-theme-size=0
@@ -16,3 +16,4 @@ gtk-enable-input-feedback-sounds=1
 gtk-xft-antialias=1
 gtk-xft-hinting=1
 gtk-xft-hintstyle=hintfull
+gtk-xft-rgba=rgb

.config/nvim/lazy-lock.json

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

.config/nvim/lua/plugins/init.lua

@@ -159,6 +159,14 @@ local plugins = {
     "rktjmp/fwatch.nvim",
     lazy = true,
   },
+
+  -- transparent
+  {
+    "xiyaowong/transparent.nvim",
+    config = function()
+      vim.cmd("TransparentEnable")
+    end
+  },
 }
 
 require("lazy").setup(plugins, require "plugins.configs.lazy")

.config/sway/config

@@ -19,7 +19,8 @@ set $wallpapers_path $HOME/Wallpapers
 
 ### Output configuration
 #
-output * bg `find $wallpapers_path/$(cat $HOME/theme) -type f | grep -v "gitkeep" | shuf -n 1` fill
+# Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/)
+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 {
@@ -61,7 +62,7 @@ exec swayidle -w \
 #
     bindsym $mod+Shift+n exec swaylock-corrupter
     # Start a terminal
-    bindsym $mod+Shift+Return exec $term
+    bindsym $mod+Return exec $term
 
     # Kill focused window
     bindsym $mod+Shift+q kill
@@ -230,4 +231,3 @@ 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: ZedMonoNerd;
+  font-family: JetBrainsMono;
   font-size: 12px;
   color: @text; /* Foreground "black" */
 }

.config/waybar/style.dark.css

@@ -30,7 +30,7 @@
 @define-color rosewater #f5e0dc;
 
 * {
-  font-family: ZedMonoNerdFont;
+  font-family: JetBrainsMono;
   font-size: 12px;
 }
 
@@ -39,7 +39,7 @@ window > box {
 }
 
 window#waybar {
-  background: shade(alpha(@base, 0.0), 0);/*.95);*/
+  background: shade(alpha(@base, 0.6), .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: 8px;
+  border-radius: 12px;
   border: 2px solid @text;
   margin-right: 5px;
   margin-left: 5px;
@@ -59,7 +59,7 @@ window#waybar {
 #workspaces {
   background: @mantle;
   padding: 2px;
-  border-radius: 8px;
+  border-radius: 10px;
 }
 
 #workspaces button {

.emacs.d/init.el

@@ -30,7 +30,8 @@
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
- )
+ '(custom-safe-themes
+   '("bdbb37a5b43210930749d2bebe2ce092dd4abe0597249b883eef00a9814e0013" default)))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.

.emacs.d/settings.org

@@ -14,11 +14,6 @@
                '("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
@@ -50,21 +45,6 @@
 #+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)
@@ -83,6 +63,7 @@
     (do-frame-config)
     (add-hook 'after-make-frame-functions 'disable-scroll-bars))
 #+END_SRC
+#+END_SRC
 ** System path (macos)
 #+BEGIN_SRC emacs-lisp
   (use-package exec-path-from-shell
@@ -103,68 +84,37 @@
 #+END_SRC
 ** Font
 #+BEGIN_SRC emacs-lisp
-  ;; (let ((font "JetBrains Mono-13:style=Regular"))
+  (let ((font "JetBrains Mono-10:style=Regular"))
-  ;;   (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.
+#+END_SRC
-  (use-package ligature
+
+** Doom-modeline && Doom-themes
+#+BEGIN_SRC emacs-lisp
+  (use-package doom-themes
+    :ensure t
     :config
-    ;; Enable the "www" ligature in every possible major mode
+    ;; Global settings (defaults)
-    (ligature-set-ligatures 't '("www"))
+    (setq doom-themes-enable-bold t    ; if nil, bold is universally disabled
-    ;; Enable traditional ligature support in eww-mode, if the
+          doom-themes-enable-italic t) ; if nil, italics is universally disabled
-    ;; `variable-pitch' face supports it
+    (load-theme 'doom-laserwave t)
-    (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
+    ;; Enable flashing mode-line on errors
-#+BEGIN_SRC emacs-lisp
+    (doom-themes-visual-bell-config)
-  (use-package catppuccin-theme
+    ;; Enable custom neotree theme (all-the-icons must be installed!)
-    :ensure t)
+    (doom-themes-neotree-config)
-  (require 'filenotify)
+    ;; or for treemacs users
+    (setq doom-themes-treemacs-theme "doom-atom") ; use "doom-colors" for less minimal icon theme
+    (doom-themes-treemacs-config)
+    ;; Corrects (and improves) org-mode's native fontification.
+    (doom-themes-org-config))
 
-  (setq *theme-file* "~/theme")
-  (defun set-system-theme ()
-    (let ((theme
-  	 (with-temp-buffer
-             (insert-file-contents *theme-file*)
-             (buffer-string)))
-  	(current-flavor catppuccin-flavor))
-      (setq catppuccin-flavor (if (string-prefix-p "dark" theme) 'mocha 'latte))
-      (if (not (eq catppuccin-flavor current-flavor))
-        (catppuccin-reload))))
-
-  (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
     :ensure t
     :config
     (doom-modeline-mode 1))
 #+END_SRC
+
 ** Icons
 must run ~(all-the-icons-install-fonts)~ and ~(nerd-fonts-install-fonts)~
 #+BEGIN_SRC emacs-lisp
@@ -283,18 +233,6 @@ must run ~(all-the-icons-install-fonts)~ and ~(nerd-fonts-install-fonts)~
   (use-package auto-complete :ensure t)
   (ac-config-default)
 #+END_SRC
-*** Copilot
-#+BEGIN_SRC emacs-lisp
-  (use-package copilot
-    :straight (:host github :repo "copilot-emacs/copilot.el" :files ("dist" "*.el"))
-    :ensure t
-    :config
-    (setq copilot-indent-offset-warning-disable t))
-  (define-key copilot-completion-map (kbd "C-c c") 'copilot-accept-completion)
-  (define-key copilot-completion-map (kbd "C-c c") 'copilot-accept-completion)
-  (add-hook 'prog-mode-hook 'copilot-mode)
-#+END_SRC
-
 ** Company mode
 #+BEGIN_SRC emacs-lisp
   (use-package company
@@ -315,13 +253,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-ts-mode . lsp)
+           (rust-mode . lsp)
- 	       (go-ts-mode . lsp)
+  	 (go-ts-mode . lsp)
            (java-mode . lsp)
            (php-mode . lsp)
-           (c-mode . lsp)
+           (c-ts-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

.xinitrc

@@ -1,27 +1,17 @@
-#!/bin/sh
+exec ~/.screenlayout/screenlayout.sh &
+exec ~/scripts/statusbar.sh &
 
-export _JAVA_AWT_WM_NONREPARENTING=1
+[[ -f ~/.Xresources ]] && xrdb -merge ~/.Xresources
-export SBCL_HOME=/usr/lib/sbcl
-export _QWT_TOOLKT=MToolkit
-
-exec ~/.screenlayout/run.sh &
-
-exec wmname compiz &
-
-exec emacs-keys-everywhere &
-exec picom -b --vsync --backend glx &
-#exec xmodmap ~/.xmodmap &
-exec xinput set-prop 10 "Coordinate Transformation Matrix" 1.2 0 0 0 1.2 0 0 0 1.8 &
 
 exec xsetroot -cursor_name left_ptr &
 exec xset s off & 
 exec xset b off &
 exec xset -dpms &
 
-exec feh --bg-fill --randomize ~/Wallpapers &
+exec picom -b &
 
-exec sleep 1s && dunst &
+exec dunst &
 
-exec systemd start --user display.target &
+exec feh --bg-center --randomize ~/Wallpapers &
 
-/usr/local/bin/stumpwm
+while type dwm >/dev/null; do dwm 2>/tmp/dwm.log && continue || break ; done

.zshrc

@@ -61,6 +61,3 @@ 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,7 +24,14 @@ source /Users/lizzy/.wasmer/wasmer.sh
 
 eval "$(zoxide init --cmd z zsh)"
 
-. "$HOME/.cargo/env"
+# Add the following to your shell init to set up gpg-agent automatically for every shell
+# 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,3 +1,4 @@
+
 eval "$(zoxide init --cmd z zsh)"
 
 if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
@@ -6,9 +7,3 @@ 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/sakomoto.zsh

@@ -0,0 +1,16 @@
+export PATH=$PATH:/home/lizzy/.cargo/bin
+
+eval "$(zoxide init --cmd z zsh)"
+
+export GPG_TTY="$(tty)"
+export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
+gpgconf --launch gpg-agent
+gpg-connect-agent updatestartuptty /bye > /dev/null
+
+. /opt/asdf-vm/asdf.sh
+
+alias cd="z"
+
+export PYENV_ROOT="$HOME/.pyenv"
+[[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"
+eval "$(pyenv init -)"

scripts/machine-specific-zsh/totoro.zsh

@@ -1,8 +0,0 @@
-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)"

scripts/statusbar.sh

@@ -0,0 +1,104 @@
+#!/bin/sh
+
+usbmon() {
+	usb1=$(lsblk -la | awk '/sdc1/ { print $1 }')
+	usb1mounted=$(lsblk -la | awk '/sdc1/ { print $7 }')
+
+	if [ "$usb1" ]; then
+		if [ -z "$usb1mounted" ]; then
+			echo " |"
+		else
+			echo " $usb1 |"
+		fi
+	fi
+}
+
+battery() {
+  percentage=$(acpi -b | awk '{ print $4; }' | tr -d "%" | tr -d ",")
+  state=$(acpi -b | awk '{ print $3; }' | tr -d ",")
+  if [ $state = "Discharging" ]; then
+    if [ $percentage -gt 75 ]; then
+      state=""
+    elif [ $percentage -gt 50 ]; then
+      state=""
+    elif [ $percentage -gt 25 ]; then
+      state=""
+    else
+      state=""
+    fi
+  elif [ $state = "Full" ]; then
+    state=""
+  elif [ $state = "Charging" ]; then
+    state=""
+  fi
+  echo "$state $percentage %"
+}
+
+fsmon() {
+	ROOTPART=$(df -h | awk '/\/$/ { print $3}') 
+	HOMEPART=$(df -h | awk '/\/home/ { print $3}') 
+	SWAPPART=$(cat /proc/swaps | awk '/\// { print $4 }')
+
+	echo "   $ROOTPART    $HOMEPART    $SWAPPART"
+}
+
+ram() {
+	mem=$(free -h | awk '/Mem:/ { print $3 }' | cut -f1 -d 'i')
+	echo  "$mem"
+}
+
+cpu() {
+	read -r cpu a b c previdle rest < /proc/stat
+	prevtotal=$((a+b+c+previdle))
+	sleep 0.5
+	read -r cpu a b c idle rest < /proc/stat
+	total=$((a+b+c+idle))
+	cpu=$((100*( (total-prevtotal) - (idle-previdle) ) / (total-prevtotal) ))
+	echo  "$cpu"%
+}
+
+network() {
+	conntype=$(ip route | awk '/default/ { print substr($5,1,1) }')
+
+	if [ -z "$conntype" ]; then
+		echo " down"
+	elif [ "$conntype" = "e" ]; then
+		echo " up"
+	elif [ "$conntype" = "w" ]; then
+		echo " up"
+	fi
+}
+
+volume_pa() {
+	muted=$(pactl list sinks | awk '/Mute:/ { print $2 }')
+	vol=$(pactl list sinks | grep Volume: | awk 'FNR == 1 { print $5 }' | cut -f1 -d '%')
+
+	if [ "$muted" = "yes" ]; then
+		echo " muted"
+	else
+		if [ "$vol" -ge 65 ]; then
+			echo " $vol%"
+		elif [ "$vol" -ge 40 ]; then
+			echo " $vol%"
+		elif [ "$vol" -ge 0 ]; then
+			echo " $vol%"	
+		fi
+	fi
+
+}
+
+clock() {
+	dte=$(date +"%D")
+	time=$(date +"%H:%M")
+
+	echo " $dte  $time"
+}
+
+main() {
+	while true; do
+    dwm -s " $(usbmon) $(ram) | $(cpu) | $(battery) | $(network) | $(volume_pa) | $(clock)"
+		sleep 1
+	done
+}
+
+main