From e4e8d8613173b2f41d120153ae886348da2d3273 Mon Sep 17 00:00:00 2001
From: Liam Malone <maloneliam@proton.me>
Date: Wed, 21 May 2025 18:57:46 +0200
Subject: [PATCH] refinement, cleanup, fixes

---
 configs/emacs/config.el          | 558 -------------------------------
 configs/emacs/config.org         |  11 -
 configs/emacs/init.el            |   7 +-
 configs/hypr/hyprland.conf       |  29 +-
 configs/kitty/current-theme.conf |  46 ---
 configs/kitty/kitty.conf         |   7 -
 configs/kitty/kitty.conf.bak     |   7 -
 configs/waybar/modules.jsonc     |   9 +-
 configs/waybar/style.css         |   2 +-
 configs/wofi/style.css           |  51 ++-
 flake.nix                        |   9 +
 hosts/darp8/configuration.nix    |  38 ++-
 hosts/darp8/file.nix             |  13 +-
 hosts/darp8/home.nix             |  13 +-
 hosts/darp8/pkgs.nix             |   1 +
 hosts/darp8/services.nix         |   1 -
 scripts/progress-notify.sh       |  18 +-
 17 files changed, 125 insertions(+), 695 deletions(-)
 delete mode 100644 configs/emacs/config.el
 delete mode 100644 configs/kitty/current-theme.conf
 delete mode 100644 configs/kitty/kitty.conf
 delete mode 100644 configs/kitty/kitty.conf.bak

diff --git a/configs/emacs/config.el b/configs/emacs/config.el
deleted file mode 100644
index 28c9bc0..0000000
--- a/configs/emacs/config.el
+++ /dev/null
@@ -1,558 +0,0 @@
-(defvar elpaca-installer-version 0.6)
-(defvar elpaca-directory (expand-file-name "elpaca/" user-emacs-directory))
-(defvar elpaca-builds-directory (expand-file-name "builds/" elpaca-directory))
-(defvar elpaca-repos-directory (expand-file-name "repos/" elpaca-directory))
-(defvar elpaca-order '(elpaca :repo "https://github.com/progfolio/elpaca.git"
-			:ref nil
-			:files (:defaults (:exclude "extensions"))
-			:build (:not elpaca--activate-package)))
-(let* ((repo  (expand-file-name "elpaca/" elpaca-repos-directory))
- (build (expand-file-name "elpaca/" elpaca-builds-directory))
- (order (cdr elpaca-order))
- (default-directory repo))
-  (add-to-list 'load-path (if (file-exists-p build) build repo))
-  (unless (file-exists-p repo)
-    (make-directory repo t)
-    (when (< emacs-major-version 28) (require 'subr-x))
-    (condition-case-unless-debug err
-  (if-let ((buffer (pop-to-buffer-same-window "*elpaca-bootstrap*"))
-	   ((zerop (call-process "git" nil buffer t "clone"
-				 (plist-get order :repo) repo)))
-	   ((zerop (call-process "git" nil buffer t "checkout"
-				 (or (plist-get order :ref) "--"))))
-	   (emacs (concat invocation-directory invocation-name))
-	   ((zerop (call-process emacs nil buffer nil "-Q" "-L" "." "--batch"
-				 "--eval" "(byte-recompile-directory \".\" 0 'force)")))
-	   ((require 'elpaca))
-	   ((elpaca-generate-autoloads "elpaca" repo)))
-      (kill-buffer buffer)
-    (error "%s" (with-current-buffer buffer (buffer-string))))
-((error) (warn "%s" err) (delete-directory repo 'recursive))))
-  (unless (require 'elpaca-autoloads nil t)
-    (require 'elpaca)
-    (elpaca-generate-autoloads "elpaca" repo)
-    (load "./elpaca-autoloads")))
-(add-hook 'after-init-hook #'elpaca-process-queues)
-(elpaca `(,@elpaca-order))
-
-;; Install use-package support
-(elpaca elpaca-use-package
-  ;; Enable :elpaca use-package keyword.
-  (elpaca-use-package-mode)
-  ;; Assume :elpaca t unless otherwise specified.
-  (setq elpaca-use-package-by-default t))
-
-;; Block until current queue processed.
-(elpaca-wait)
-
-;;When installing a package which modifies a form used at the top-level
-;;(e.g. a package which adds a use-package key word),
-;;use `elpaca-wait' to block until that package has been installed/configured.
-;;For example:
-;;(use-package general :demand t)
-;;(elpaca-wait)
-
-;;Turns off elpaca-use-package-mode current declartion
-;;Note this will cause the declaration to be interpreted immediately (not deferred).
-;;Useful for configuring built-in emacs features.
-;;(use-package emacs :elpaca nil :config (setq ring-bell-function #'ignore))
-
-;; Don't install anything. Defer execution of BODY
-;;(elpaca nil (message "deferred"))
-
-;; Expands to: (elpaca evil (use-package evil :demand t))
-(use-package evil
-    :bind (:map evil-normal-state-map
-                ("<C-u>" . evil-scroll-page-up))
-    :init      ;; tweak evil's configuration before loading it
-    (setq evil-want-integration t) ;; This is optional since it's already set to t by default.
-    (setq evil-respect-visual-line-mode t)
-    (setq evil-want-keybinding nil)
-    (setq evil-vsplit-window-right t)
-    (setq evil-split-window-below t)
-    (evil-mode))
-  (use-package evil-collection
-    :after evil
-    :config
-    (setq evil-collection-mode-list '(dashboard dired ibuffer))
-    (evil-collection-init))
-
-(use-package general
-    :config
-    (general-evil-setup)
-    ;; set 'SPC' as global leader key
-    (general-create-definer lm/leader-keys
-      :states '(normal insert visual emacs)
-      :keymaps 'override
-      :prefix "SPC" ;; set leader
-      :global-prefix "M-SPC") ;; access leader in insert mode
-
-    (lm/leader-keys
-        "b" '(:ignore t :wk "buffer")
-        "b b" '(switch-to-buffer :wk "Switch buffer")
-        "b i" '(ibuffer :wk "Ibuffer")
-        "b k" '(kill-this-buffer :wk "Kill this buffer")
-        "b n" '(next-buffer :wk "Next buffer")
-        "b p" '(previous-buffer :wk "Previous buffer")
-        "b r" '(revert-buffer :wk "Reload buffer"))
-
-    (lm/leader-keys
-        "e" '(:ignore t :wk "Eshell/Evaluate")
-        "e b" '(eval-buffer :wk "Evaluate elisp in buffer")
-        "e d" '(eval-defun :wk "Evaluate defun containing or after point")
-        "e e" '(eval-expression :wk "Evaluate an elisp expression")
-        "e l" '(eval-last-sexp :wk "Evaluate elisp expression before point")
-        "e r" '(eval-region :wk "Evaluate elisp in region")
-        "e h" '(counsel-esh-history :wk "Eshell history")
-        "e s" '(eshell :wk "Eshell"))
-
-    (lm/leader-keys
-        "SPC" '(counsel-M-x :wk "Counsel M-x")
-        "." '(find-file :wk "Find file")
-        "f c" '((lambda () (interactive) (find-file "~/.config/emacs/config.org")) :wk "Edit emacs config")
-        "f r" '(counsel-recentf :wk "Find recent files")
-        "TAB TAB" '(comment-line :wk "Comment lines"))
-
-    (lm/leader-keys
-        "h" '(:ignore t :wk "Help")
-        "h f" '(describe-function :wk "Describe function")
-        "h v" '(describe-variable :wk "Describe variable")
-        "h r r" '(reload-init-file :wk "Reload emacs config"))
-        ;; "h r r" '((lambda () (interactive) (load-file user-init-file)) :wk "Reload emacs config"))
-
-    (lm/leader-keys
-        "i" '(:ignore t :wk "Insert")
-        "i p" '(org-download-screenshot :wk "Insert screenshot (org)"))
-
-    (lm/leader-keys
-        "t" '(:ignore t :wk "Toggle")
-        "t l" '(display-line-numbers-mode :wk "Toggle line numbers")
-        "t v" '(vterm-toggle :wk "Toggle Vterm")
-        "t i" '(org-toggle-inline-images :wk "Toggle inline images")
-        "t t" '(visual-line-mode :wk "Toggle truncated lines"))
-
-    (lm/leader-keys
-        "s" '(:ignore t :wk "Shell")
-        "s c" '(shell-command :wk "Run a shell command")
-        "s d" '(sh-cd-here :wk "Move current shell to current dir")
-        "s m" '(sh-mode :wk "Shell mode"))
-
-    (lm/leader-keys
-        "c" '(:ignore t :wk "Capitalize")
-        "c w" '(capitalize-word :wk "Capitalize word")
-        "c r" '(capitalize-region :wk "Capitalize region")
-        "c c" '(upcase-char :wk "Upcase char")
-        "c u" '(upcase-region :wk "Upcase region"))
-
-    (lm/leader-keys
-        "l" '(:ignore t :wk "Downcase")
-        "l w" '(downcase-word :wk "Downcase word")
-        "l u" '(downcase-region :wk "Downcase region"))
-
-    ;; Evil window bindings
-    (lm/leader-keys
-        "w" '(:ignore t :wk "Window")
-        "w w" '(evil-window-next :wk "Next window")
-        "w h" '(evil-window-left :wk "Move cursor to window left")
-        "w j" '(evil-window-down :wk "Move cursor to window below")
-        "w k" '(evil-window-up :wk "Move cursor to window above")
-        "w l" '(evil-window-right :wk "Move cursor to window right")
-        "w s" '(evil-window-split :wk "Split window horizontally")
-        "w v" '(evil-window-vsplit :wk "Split window vertically")
-        "w H" '(evil-window-move-far-left :wk "Move split to left")
-        "w J" '(evil-window-move-very-bottom :wk "Move split to bottom")
-        "w K" '(evil-window-move-very-top :wk "Move split to top")
-        "w L" '(evil-window-move-far-right :wk "Move split to right")
-        "w c" '(evil-window-delete :wk "Close window")
-        "w o" '(delete-other-windows :wk "Delete other windows")
-        "w =" '(balance-windows :wk "Balance windows")
-        "q k" '(kill-buffer-and-window :wk "Kill buf and window")
-        "q q" '(save-buffers-kill-terminal :wk "Save bufs, kill term"))
-
-    ;; (evil-global-set-key 'visual "K" (kbd ":m '<-2 RET gv '< gk")) 
-    (evil-global-set-key 'visual "K" 'drag-stuff-up) 
-    ;; (evil-global-set-key 'visual "J" (kbd ":m '>+1 RET gv '> gj")) 
-    (evil-global-set-key 'visual "J" 'drag-stuff-down)
-
-    (lm/leader-keys
-       "p" '(:ignore t :wk "Project")
-       "p o" '(dashboard-open :wk "Return to dashboard")
-       "p f" '(project-find-file :wk "Find project file"))
-
-)
-
-(use-package all-the-icons
-    :ensure t
-    :diminish
-    :if (display-graphic-p))
-(use-package all-the-icons-dired
-    :hook (dired-mode . (lambda () (all-the-icons-dired-mode t))))
-
-(setq backup-directory-alist
-      `((".*" . "~/emacs/auto-saves")))
-(setq auto-save-file-name-transforms
-      `((".*" "~/emacs/auto-saves" t)))
-
-(use-package company
-  :defer 2
-  :diminish
-  :custom
-  (company-begin-commands '(self-insert-command))
-  (company-idle-delay .1)
-  (company-minimum-prefix-length 2)
-  (company-show-numbers t)
-  (company-tooltip-align-annotations 't)
-  (global-company-mode t))
-
-(use-package company-box
-  :after company
-  :diminish
-  :hook (company-mode . company-box-mode))
-
-(use-package dashboard
-      :ensure t
-      :diminish
-      :init
-      (setq initial-buffer-choice 'dashboard-open)
-      (setq dashboard-set-heading-icons t)
-      ;; (setq dashboard-set-navigator t)
-      (setq dashboard-set-file-icons t)
-      (setq dashboard-banner-logo-title "Welcome to Emacs!")
-      ;; (setq dashboard-startup-banner 'logo) ;; default logo
-      (setq dashboard-startup-banner "~/pictures/smol-penguin.png")
-      (setq dashboard-center-content t)
-      (setq dashboard-items '((recents . 5)
-                              (agenda . 5)
-                              (bookmarks . 3)
-                              ;; (registers . 3)
-                              (projects . 3)))
-;; (dashboard-modify-heading-icons '((recents . "file-text")
-                                  ;; (bookmarks . "book")))  
-      :config
-      (dashboard-setup-startup-hook))
-
-(use-package diminish)
-
-(use-package drag-stuff
-    :diminish
-    :config
-(drag-stuff-global-mode 1))
-
-(use-package flycheck
-  :ensure t
-  :defer t
-  :diminish
-  :init (global-flycheck-mode))
-
-(set-face-attribute 'default nil
-;; try switch to Source Code Pro
-    :font "FiraCodeNerdFontMono"
-    :height 110
-    :weight 'medium)
-  (set-face-attribute 'variable-pitch nil
-    :font "FiraCodeNerdFontMono"
-    :height 120
-    :weight 'medium)
-  (set-face-attribute 'fixed-pitch nil
-    :font "FiraCodeNerdFontMono"
-    :height 110
-    :weight 'medium)
-  ;; Makes commented text and keywords italics.
-  ;; This is working in emacsclient but not emacs.
-  ;; Your font must have an italic face available.
-  (set-face-attribute 'font-lock-comment-face nil
-    :slant 'italic)
-  (set-face-attribute 'font-lock-keyword-face nil
-    :slant 'italic)
-
-  ;; This sets the default font on all graphical frames created after restarting Emacs.
-  ;; Does the same thing as 'set-face-attribute default' above, but emacsclient fonts
-  ;; are not right unless I also add this method of setting the default font.
-  (add-to-list 'default-frame-alist '(font . "FiraCodeNerdFontMono-14"))
-
-  ;; Uncomment the following line if line spacing needs adjusting.
-  ;; (setq-default line-spacing 0.12)
-
-(global-set-key (kbd "C-=") 'text-scale-increase) 
-(global-set-key (kbd "C--") 'text-scale-decrease)
-(global-set-key (kbd "<C-wheel-up>") 'text-scale-increase)
-(global-set-key (kbd "<C-wheel-down>") 'text-scale-decrease)
-
-(use-package gnuplot-mode)
-;; automatically open files ending with .gp or .gnuplot in gnuplot mode
-;; (setq auto-mode-alist 
-;; (append '(("\\.\\(gp\\|gnuplot\\)$" . gnuplot-mode)) auto-mode-alist)))
-
-(use-package image-dired+)
-
-(setq-default indent-tabs-mode nil)
- (setq-default tab-width 4)
- (setq-default indent-line-function 'insert-tab)
- (setq-default c-default-style "linux"
-               c-basic-offset 4)
-;; if indent-tabs-mode is off, untabify before saving
-;;(add-hook 'write-file-hooks 
-;;         (lambda () (if (not indent-tabs-mode)
-;;                        (untabify (point-min) (point-max)))))
-
-;; 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 FiraMonoNerdFont and Fira Code ligatures in programming modes
-
-  (ligature-set-ligatures 'prog-mode
-                      '(;; == === ==== => =| =>>=>=|=>==>> ==< =/=//=// =~
-                        ;; =:= =!=
-                        ("=" (rx (+ (or ">" "<" "|" "/" "~" ":" "!" "="))))
-                        ;; ;; ;;;
-                        (";" (rx (+ ";")))
-                        ;; && &&&
-                        ("&" (rx (+ "&")))
-                        ;; !! !!! !. !: !!. != !== !~
-                        ("!" (rx (+ (or "=" "!" "\." ":" "~"))))
-                        ;; ?? ??? ?:  ?=  ?.
-                        ("?" (rx (or ":" "=" "\." (+ "?"))))
-                        ;; %% %%%
-                        ("%" (rx (+ "%")))
-                        ;; |> ||> |||> ||||> |] |} || ||| |-> ||-||
-                        ;; |->>-||-<<-| |- |== ||=||
-                        ;; |==>>==<<==<=>==//==/=!==:===>
-                        ("|" (rx (+ (or ">" "<" "|" "/" ":" "!" "}" "\]"
-                                        "-" "=" ))))
-                        ;; \\ \\\ \/
-                        ("\\" (rx (or "/" (+ "\\"))))
-                        ;; ++ +++ ++++ +>
-                        ("+" (rx (or ">" (+ "+"))))
-                        ;; :: ::: :::: :> :< := :// ::=
-                        (":" (rx (or ">" "<" "=" "//" ":=" (+ ":"))))
-                        ;; // /// //// /\ /* /> /===:===!=//===>>==>==/
-                        ("/" (rx (+ (or ">"  "<" "|" "/" "\\" "\*" ":" "!"
-                                        "="))))
-                        ;; .. ... .... .= .- .? ..= ..<
-                        ("\." (rx (or "=" "-" "\?" "\.=" "\.<" (+ "\."))))
-                        ;; -- --- ---- -~ -> ->> -| -|->-->>->--<<-|
-                        ("-" (rx (+ (or ">" "<" "|" "~" "-"))))
-                        ;; *> */ *)  ** *** ****
-                        ("*" (rx (or ">" "/" ")" (+ "*"))))
-                        ;; www wwww
-                        ("w" (rx (+ "w")))
-                        ;; <> <!-- <|> <: <~ <~> <~~ <+ <* <$ </  <+> <*>
-                        ;; <$> </> <|  <||  <||| <|||| <- <-| <-<<-|-> <->>
-                        ;; <<-> <= <=> <<==<<==>=|=>==/==//=!==:=>
-                        ;; << <<< <<<<
-                        ("<" (rx (+ (or "\+" "\*" "\$" "<" ">" ":" "~"  "!"
-                                        "-"  "/" "|" "="))))
-                        ;; >: >- >>- >--|-> >>-|-> >= >== >>== >=|=:=>>
-                        ;; >> >>> >>>>
-                        (">" (rx (+ (or ">" "<" "|" "/" ":" "=" "-"))))
-                        ;; #: #= #! #( #? #[ #{ #_ #_( ## ### #####
-                        ("#" (rx (or ":" "=" "!" "(" "\?" "\[" "{" "_(" "_"
-                                     (+ "#"))))
-                        ;; ~~ ~~~ ~=  ~-  ~@ ~> ~~>
-                        ("~" (rx (or ">" "=" "-" "@" "~>" (+ "~"))))
-                        ;; __ ___ ____ _|_ __|____|_
-                        ("_" (rx (+ (or "_" "|"))))
-                        ;; Fira code: 0xFF 0x12
-                        ("0" (rx (and "x" (+ (in "A-F" "a-f" "0-9")))))
-                        ;; Fira code:
-                        "Fl"  "Tl"  "fi"  "fj"  "fl"  "ft"
-                        ;; The few not covered by the regexps.
-                        "{|"  "[|"  "]#"  "(*"  "}#"  "$>"  "^="))
-
-  ;; Enables ligature checks globally in all buffers. You can also do it
-  ;; per mode with `ligature-mode'.
-  (global-ligature-mode t))
-
-(use-package markdown-mode
-  :ensure t
-  :mode ("README\\.md\\'" . gfm-mode)
-  :init (setq markdown-command "multimarkdown"))
-
-;; inspired by https://zzamboni.org/post/how-to-insert-screenshots-in-org-documents-on-macos/
-
-(use-package org-download
-  :after org
-  :defer nil
-  :custom
-  (org-download-method 'directory)
-  (org-download-image-dir "~/emacs/")
-  (org-download-heading-lvl 0)
-  (org-download-timestamp "org_%Y%m%d-%H%M%S_")
-  ;; (org-image-actual-width 400)
-  (org-download-screenshot-method "wl-paste -t image/png > '%s'")
-  :bind
-  ("C-M-y" . org-download-screenshot)
-  :config
-  (require 'org-download))
-
-(use-package projectile
-  :diminish
-  :config
-  (projectile-mode 1))
-
-(use-package rainbow-mode
-  :diminish
-  :hook 
-  ((org-mode prog-mode) . rainbow-mode))
-
-(defun reload-init-file ()
-  (interactive)
-  (load-file user-init-file)
-  (load-file user-init-file))
-
-(use-package eshell-syntax-highlighting
-    :after esh-mode
-    :config
-    (eshell-syntax-highlighting-global-mode +1))
-
-    (setq eshell-rc-script (concat user-emacs-directory "eshell/profile")
-      eshell-aliases-file (concat user-emacs-directory "eshell/aliases")
-      eshell-history-size 5000
-      eshell-buffer-maximum-lines 5000
-      eshell-hist-ignoredups t
-      eshell-scroll-to-bottom-on-input t
-      eshell-destroy-buffer-when-process-dies t
-      eshell-visual-commands'("bash" "fish" "htop" "ssh" "top" "zsh"))
-
-(use-package vterm
-:config
-(setq shell-file-name "/run/current-system/sw/bin/bash"
-      vterm-max-scrollback 5000))
-
-(use-package vterm-toggle
-    :after vterm
-    :config
-    (setq vterm-toggle-fullscreen-p nil)
-    (setq vterm-toggle-scope 'project)
-  (add-to-list 'display-buffer-alist
-             '((lambda (buffer-or-name _)
-                   (let ((buffer (get-buffer buffer-or-name)))
-                     (with-current-buffer buffer
-                       (or (equal major-mode 'vterm-mode)
-                           (string-prefix-p vterm-buffer-name (buffer-name buffer))))))
-                (display-buffer-reuse-window display-buffer-at-bottom)
-                ;;(display-buffer-reuse-window display-buffer-in-direction)
-                ;;display-buffer-in-direction/direction/dedicated is added in emacs27
-                ;;(direction . bottom)
-                ;;(dedicated . t) ;dedicated is supported in emacs27
-                (reusable-frames . visible)
-                (window-height . 0.3))))
-
-(use-package sudo-edit
-    :config
-      (lm/leader-keys
-          "fu" '(sudo-edit-find-file :wk "Sudo find file")
-          "fU" '(sudo-edit :wk "Sudo edit file")))
-
-;;(add-to-list 'custom-theme-load-path "~/.config/emacs/themes")
-;;(load-theme 'soft-charcoal t)
-
-(use-package doom-themes
-:ensure t
-:config
-;; Global settings (defaults)
-(setq doom-themes-enable-bold t    ; if nil, bold is universally disabled
-  doom-themes-enable-italic t) ; if nil, italics is universally disabled
-(load-theme 'doom-monokai-spectrum t)
-  ;; (load-theme 'doom-monokai-machine t)
-
-;; Enable flashing mode-line on errors
-(doom-themes-visual-bell-config)
-;; Enable custom neotree theme (all-the-icons must be installed!)
-(doom-themes-neotree-config)
-;; or for treemacs users
-(setq doom-themes-treemacs-theme "doom-colors") ; use "doom-colors" for less minimal icon theme
-(doom-themes-treemacs-config)
-;; Corrects (and improves) org-mode's native fontification.
-(doom-themes-org-config))
-
-(add-to-list 'default-frame-alist '(alpha-background . 90)) ;; for all new frames
-
-(menu-bar-mode -1)
-(tool-bar-mode -1)
-(scroll-bar-mode -1)
-
-(global-display-line-numbers-mode 0)
-(menu-bar--display-line-numbers-mode-relative)
-;; (setq display-line-numbers-mode-relative 't)
-
-(global-visual-line-mode t)
-
-(use-package counsel
-  :after ivy
-  :diminish
-  :config (counsel-mode))
-
-(use-package ivy
-  :bind
-  ;; ivy-resume resumes the last Ivy-based completion.
-  (("C-c C-r" . ivy-resume)
-   ("C-x B" . ivy-switch-buffer-other-window))
-  :diminish
-  :custom
-  (setq ivy-use-virtual-buffers t)
-  (setq ivy-count-format "(%d/%d) ")
-  (setq enable-recursive-minibuffers t)
-  :config
-  (ivy-mode))
-
-(use-package all-the-icons-ivy-rich
-  :ensure t
-  :diminish
-  :init (all-the-icons-ivy-rich-mode 1))
-
-(use-package ivy-rich
-  :after ivy
-  :diminish
-  :ensure t
-  :init (ivy-rich-mode 1) ;; this gets us descriptions in M-x.
-  :custom
-  (ivy-virtual-abbreviate 'full
-   ivy-rich-switch-buffer-align-virtual-buffer t
-   ivy-rich-path-style 'abbrev)
-  :config
-  (ivy-set-display-transformer 'ivy-switch-buffer
-                               'ivy-rich-switch-buffer-transformer))
-
-(use-package zig-mode)
-(use-package nix-mode)
-;; (use-package jai-mode)
-(use-package rust-mode)
-(use-package cargo-mode)
-(use-package lua-mode)
-(add-to-list 'load-path "~/.config/emacs/manual-packages")
-(require 'odin-mode)
-
-(use-package toc-org
-    :commands toc-org-enable
-    :init (add-hook 'org-mode-hook 'toc-org-enable))
-
-(add-hook 'org-mode-hook 'org-indent-mode)
-;;(setq (setq org-return-follows-link  t)
-(use-package org-bullets)
-(add-hook 'org-mode-hook (lambda () (org-bullets-mode 1)))
-
-(require 'org-tempo)
-
-(use-package which-key
-  :init
-      (which-key-mode 1)
-  :diminish
-  :config
-  (setq which-key-side-window-location 'bottom
-        which-key-sort-order #'which-key-key-order-alpha
-        which-key-sort-uppercase-first nil
-        which-key-add-column-padding 1
-        which-key-max-display-columns nil
-        which-key-min-display-lines 6
-        which-key-side-window-slot -10
-        which-key-side-window-max-height 0.25
-        which-key-ide-delay 0.8
-        which-key-max-description-length 25
-        which-key-allow-imprecise-window-fit nil
-        which-key-separator " -> " ))
diff --git a/configs/emacs/config.org b/configs/emacs/config.org
index 01f4c05..e7ef4f3 100644
--- a/configs/emacs/config.org
+++ b/configs/emacs/config.org
@@ -32,7 +32,6 @@
 - [[#reload-emacs][RELOAD EMACS]]
 - [[#shells-and-terminals][SHELLS AND TERMINALS]]
   - [[#eshell][Eshell]]
-  - [[#vterm][Vterm]]
 - [[#sudo-edit][SUDO EDIT]]
 - [[#theme][THEME]]
 - [[#transparency][TRANSPARENCY]]
@@ -595,16 +594,6 @@ This is just an example of how to create a simple function in Emacs.  Use this f
         eshell-visual-commands'("bash" "fish" "htop" "ssh" "top" "zsh"))
 #+end_src
 
-** Vterm
-Vterm is a terminal emulator within Emacs.  The 'shell-file-name' setting sets the shell to be used in M-x shell, M-x term, M-x ansi-term and M-x vterm.  By default, the shell is set to 'fish' but could change it to 'bash' or 'zsh' if you prefer.
-
-#+begin_src emacs-lisp
-(use-package vterm
-:config
-(setq shell-file-name "/run/current-system/sw/bin/bash"
-      vterm-max-scrollback 5000))
-#+end_src
-
 * SUDO EDIT
 Enable editing of privileged files
 
diff --git a/configs/emacs/init.el b/configs/emacs/init.el
index 0a7938d..c9384f8 100644
--- a/configs/emacs/init.el
+++ b/configs/emacs/init.el
@@ -1,6 +1,9 @@
+;;; package --- summary
+;;; Commentary: All these comments are only here cos of emacs complaining, lol
+;;; Code:
 (org-babel-load-file
  (expand-file-name
-  "config.org"
-  user-emacs-directory))
+   "config.org" user-emacs-directory))
 (put 'upcase-region 'disabled nil)
 (put 'downcase-region 'disabled nil)
+;;; init.el ends here
diff --git a/configs/hypr/hyprland.conf b/configs/hypr/hyprland.conf
index 634db9d..078637e 100644
--- a/configs/hypr/hyprland.conf
+++ b/configs/hypr/hyprland.conf
@@ -4,10 +4,10 @@ exec-once=wl-clipboard-history -t
 exec-once=wl-paste -p --watch wl-copy -p ''
 exec-once=hypridle
 exec-once=waybar
-exec-once=nm-applet
 exec-once=fcitx5 -d
-exec-once=blueman-applet
 exec-once=swww-daemon
+exec-once=swaync
+exec-once=hyprctl plugin load $HYPR_EXPO_LIB
 
 # Monitors
 
@@ -130,6 +130,22 @@ misc {
   mouse_move_enables_dpms=true
 }
 
+# Plugin Config
+
+plugin {
+  hyprexpo {
+    columns = 3
+    gap_size = 5
+    bg_col = $lightblue
+    workspace_method = center current # [center/first] [workspace] e.g. first 1 or center m+1
+
+    enable_gesture = true # laptop touchpad
+    gesture_fingers = 3  # 3 or 4
+    gesture_distance = 300 # how far is the "max"
+    gesture_positive = false # true = swipe down, false = swipe up.
+  }
+}
+
 # Window Rules
 
 windowrule=idleinhibit fullscreen, class:firefox
@@ -142,8 +158,8 @@ windowrule=idleinhibit focus, class:^(emacs)$
 windowrule=idleinhibit focus, class:^(Emacs)$
 windowrule=idleinhibit focus, class:^(discord)$
 windowrule=idleinhibit focus, class:^(spotify)$
-windowrule=idleinhibit focus, class:^(Discord)$
-windowrule=opacity 0.9 0.9, class:^(Discord|discord)$
+windowrule=idleinhibit focus, class:^(Discord|discord)$
+windowrule=opacity 0.98 0.9, class:^(Discord|discord)$
 windowrule=float, class:polkit-kde-authentication-agent-1
 windowrule=float, class:^(praat)$
 windowrule=float, class:^(network)$
@@ -187,10 +203,11 @@ bind=, Print, exec, $screenshotarea
 bind=SHIFT, Print, exec, grimblast --cursor copy output
 bind=$mainMod SHIFT, P, pseudo,
 bind=$mainMod, C, killactive,
-bind=$mainMod control, Q, exec, $lock
-bind=$mainMod, F4, exit,
 bind=$mainMod, V, togglefloating, 
 bind=$mainMod SHIFT, S, togglesplit,
+bind = SUPER, grave, hyprexpo:expo, toggle
+bind=$mainMod control, Q, exec, $lock
+bind=$mainMod, F4, exit,
 
 # Binds :: Navigation
 
diff --git a/configs/kitty/current-theme.conf b/configs/kitty/current-theme.conf
deleted file mode 100644
index 9f33178..0000000
--- a/configs/kitty/current-theme.conf
+++ /dev/null
@@ -1,46 +0,0 @@
-# vim:ft=kitty
-
-## name: Campbell
-## author: Microsoft
-## blurb: The default theme of Microsoft's terminals, including Windows Terminal and cmd.
-
-# The basic colors
-foreground                      #cccccc
-background                      #0c0c0c
-selection_background            #ffffff
-
-# Cursor colors
-cursor                          #ffffff
-
-# The basic 16 colors
-# black
-color0 #0c0c0c
-color8 #767676
-
-# red
-color1 #c50f1f
-color9 #e74856
-
-# green
-color2  #13a10e
-color10 #16c60c
-
-# yellow
-color3  #f19c00
-color11 #f9f1a5
-
-# blue
-color4  #0037da
-color12 #3b78ff
-
-# magenta
-color5  #881798
-color13 #b4009e
-
-# cyan
-color6  #3a96dd
-color14 #61d6d6
-
-# white
-color7  #cccccc
-color15 #f2f2f2
diff --git a/configs/kitty/kitty.conf b/configs/kitty/kitty.conf
deleted file mode 100644
index f013af9..0000000
--- a/configs/kitty/kitty.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-background_opacity 0.8
-font_size 14.0
-
-# BEGIN_KITTY_THEME
-# Campbell
-include current-theme.conf
-# END_KITTY_THEME
diff --git a/configs/kitty/kitty.conf.bak b/configs/kitty/kitty.conf.bak
deleted file mode 100644
index 468b031..0000000
--- a/configs/kitty/kitty.conf.bak
+++ /dev/null
@@ -1,7 +0,0 @@
-background_opacity 0.8
-font_size 14.0
-
-# BEGIN_KITTY_THEME
-# Rosé Pine Moon
-include current-theme.conf
-# END_KITTY_THEME
diff --git a/configs/waybar/modules.jsonc b/configs/waybar/modules.jsonc
index 05ecaf1..853a10f 100644
--- a/configs/waybar/modules.jsonc
+++ b/configs/waybar/modules.jsonc
@@ -8,6 +8,7 @@
       "^.*vim.*$": " Neovim",
       "^.*~$": "󱙝 Ghostty",
       "^.*Emacs": " Emacs",
+      "^Spotify.*$": "󰓇 Spotify",
       "(.*) ": " Empty"
     },
   },
@@ -58,10 +59,8 @@
   "hyprland/language": {
     "format": "{}",
     "format-en": "en",
-    "format-ru": "ru",
-    "keyboard-name": "kingston-hyperx-alloy-fps-pro-mechanical-gaming-keyboard-1",
-    // "keyboard-name":"at-translated-set-2-keyboard",
-    "on-click": "hyprctl switchxkblayout kingston-hyperx-alloy-fps-pro-mechanical-gaming-keyboard-1 next",
+    "format-jp": "jp",
+    "keyboard-name":"at-translated-set-2-keyboard"
   },
   "group/audio": {
     "orientation": "inherit",
@@ -162,7 +161,7 @@
     "format-disabled": "󰂲",
     "format-connected": "",
     "tooltip": false,
-    "on-click": "overskride"
+    "on-click": "blueman-manager"
     // "tooltip-format": "{controller_alias}\t{controller_address}\n\n{num_connections} connected",
     // "tooltip-format-connected": "{controller_alias}\t{controller_address}\n\n{num_connections} connected\n\n{device_enumerate}",
     // "tooltip-format-enumerate-connected": "{device_alias}\t{device_address}",
diff --git a/configs/waybar/style.css b/configs/waybar/style.css
index 0900b5b..13cc394 100644
--- a/configs/waybar/style.css
+++ b/configs/waybar/style.css
@@ -44,7 +44,7 @@ tooltip label {
   padding: 0px 6px;
   margin: 8px 4px;
   background: alpha(darker(@main-color), 0.3);
-  color: @main-color;
+  color: lighter(@main-color);
   border-radius: 10px;
 }
 
diff --git a/configs/wofi/style.css b/configs/wofi/style.css
index 3749ec1..98da841 100644
--- a/configs/wofi/style.css
+++ b/configs/wofi/style.css
@@ -1,59 +1,54 @@
-@define-color purple     #881798;
+@import "/home/liamm/.cache/wal/colors-waybar.css";
+
+@define-color main-color @color12;
 
-* {
-  transition: 0.2s;
-  color: #aaaaaa;
-}
 #window {
-  background-color: #1e1e2e;
-/*  background: linear-gradient(27deg, rgba(249,255,150,1) 0%, rgba(113,181,120,1) 54%, rgba(21,85,165,1) 100%);*/
-/*  background-image: url("file:///home/liamm/pictures/wp-store/dystopian-cyber-city.jpg");*/
-/* background-position: 50% 30%;*/
+  background: alpha(darker(@main-color), 0.8);
   background-size: auto 200%;
-  border: 2.0px solid;
-  border-color: @purple;
-  border-color: @darkpurple;
   border-radius: 10px;
+  border: 2px;
+  border-color: lighter(@foreground);
 }
 
+#text {
+  margin: 5px;
+  border: none;
+  color: lighter(@main-color);
+} 
+
 #input {
   border-radius: 20px;
   margin: 0 20px 20px 20px;
   padding: 10px 10px;
-  background-color: #292929;
+  background: darker(@main-color);
   font-weight: 400;
-  color: #ffffffff;
   font-size: 24px;
 }
 
 #outer-box {
+  background: alpha(@background, 0.4);
+  border-color: lighter(@background);
+  border-radius: 20px;
   padding: 20px;
-  color: #000000;
-  font-family: 'Source Code Pro';
+  font-family: 'Kelmscott Mono';
   font-weight: 400;
-  
   border: 2px;
-  border-color: #00ffb2ff;
 }
 
 #expander {
-  background-color: rgba(69, 29, 50, 0.0);
-  color: #292929;
+  background: alpha(@background, 0.6);
 }
 
 #entry {
   font-size: 20px;
   font-weight: 400;
-  color: #ffffffff;
+  background: alpha(@background, 0.6);
   margin: 10px 0px;
-  padding: 10px 10px;
+  padding: 8px 8px;
   border-radius: 20px;
 }
 
-#entry:selected{
-  background-color:rgba(255,255,255,0.3);
-}
-
-#entry:hover {
-  color: #ffaa34;
+#entry:selected {
+  background: alpha(darker(@main-color), 0.8);
+  color: darker(@foreground);
 }
diff --git a/flake.nix b/flake.nix
index 1de2f65..70b3550 100644
--- a/flake.nix
+++ b/flake.nix
@@ -35,7 +35,16 @@
       };
     in
     {
+
       nixosConfigurations = {
+        nixpkgs.overlays = [
+          (final: prev: {
+           hyprlandPlugins = prev.hyprlandPlugins // {
+           hyprexpo = inputs.hyprland-plugins.packages.${pkgs.system}.hyprexpo;
+           };
+           })
+        ];
+
         darp8 = nixpkgs.lib.nixosSystem {
           specialArgs = {inherit inputs; cfg = defaultCfg; };
           modules = [
diff --git a/hosts/darp8/configuration.nix b/hosts/darp8/configuration.nix
index c90b070..66144e8 100644
--- a/hosts/darp8/configuration.nix
+++ b/hosts/darp8/configuration.nix
@@ -1,10 +1,16 @@
 { cfg, config, lib, pkgs, inputs, ... }:
 
+let 
+  hyprplugins = {
+    hyprexpo_dir = "${pkgs.hyprlandPlugins.hyprexpo}";
+  };
+in
 {
   imports = [
-      ./hardware-configuration.nix
-      inputs.home-manager.nixosModules.default
-    ];
+    ./hardware-configuration.nix
+    inputs.home-manager.nixosModules.default
+  ];
+
 
   boot = {
     loader.systemd-boot.enable = true;
@@ -86,14 +92,25 @@
     gvfs.enable = true;
     auto-cpufreq.enable = true;
     thermald.enable = true;
+
     power-profiles-daemon.enable = false;
     pulseaudio.enable = false;
   };
 
   security.pam.services.hyprlock = {};
-  environment.etc."greetd/environments".text = ''
-    Hyprland
-  '';
+  environment = {
+    etc = {
+      "greetd/environments".text = ''
+        Hyprland
+      '';
+      "hyprland/plugins.conf" = {
+        mode = "0444";
+        text = ''
+          plugin = ${pkgs.hyprlandPlugins.hyprexpo}
+        '';
+      };
+    };
+  };
 
   hardware = {
     bluetooth.enable = true;
@@ -158,10 +175,17 @@
       remotePlay.openFirewall = true;
       dedicatedServer.openFirewall = true;
     };
+
     hyprland = {
       enable = true;
       package = inputs.hyprland.packages.${pkgs.system}.hyprland;
+      portalPackage = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland;
       xwayland.enable = true;
+      withUWSM = true;
+      plugins = [
+        pkgs.hyprlandPlugins.hyprbars
+        pkgs.hyprlandPlugins.hyprexpo
+      ];
     };
     gnupg.agent = {
       enable = true;
@@ -178,7 +202,7 @@
 
   home-manager = {
     useGlobalPkgs = true;
-    extraSpecialArgs = { inherit inputs; inherit cfg; };
+    extraSpecialArgs = { inherit inputs; inherit cfg; inherit hyprplugins; };
     users = {
       "${cfg.username}" = import ./home.nix;
     };
diff --git a/hosts/darp8/file.nix b/hosts/darp8/file.nix
index c1e8d4c..26504ab 100644
--- a/hosts/darp8/file.nix
+++ b/hosts/darp8/file.nix
@@ -36,11 +36,6 @@ in
       outOfStoreSymlink = true;
       recursive = true;
     };
-    ".config/kitty" = {
-      source = ../../configs/kitty;
-      outOfStoreSymlink = true;
-      recursive = true;
-    };
     ".config/nvim" = {
       source = ../../configs/nvim;
       outOfStoreSymlink = true;
@@ -51,11 +46,17 @@ in
       outOfStoreSymlink = true;
       recursive = true;
     };
+    ".config/swaync" = {
+      source = ../../configs/swaync;
+      outOfStoreSymlink = true;
+      recursive = true;
+    };
+
+    # I have no idea why this is an issue...
     # ".config/emacs" = {
     #   source = ../../configs/emacs;
     #   outOfStoreSymlink = true;
     #   recursive = true;
     # };
-
   };
 }
diff --git a/hosts/darp8/home.nix b/hosts/darp8/home.nix
index e8de7bb..41ab015 100644
--- a/hosts/darp8/home.nix
+++ b/hosts/darp8/home.nix
@@ -1,4 +1,13 @@
-{ cfg, config, pkgs, lib, callPackage, inputs, ... }:
+{
+  cfg,
+  hyprplugins,
+  config,
+  pkgs,
+  lib,
+  callPackage,
+  inputs,
+  ...
+}:
 
 {
   home.username = cfg.username;
@@ -24,6 +33,7 @@
     GIT_EDITOR = "nvim";
     NIX_SHELL_PRESERVE_PROMPT = 1;
     NIX_CONFIG_DIR = "${cfg.homeDirectory}/personal/nixos";
+    HYPR_EXPO_LIB = "${hyprplugins.hyprexpo_dir}/lib/libhyprexpo.so";
   };
 
   nix.settings.extra-trusted-substituters = [
@@ -65,6 +75,7 @@
       source = ../../configs/emacs;
       recursive = true;
     };
+
     "user-dirs.dirs".source = ../../configs/user-dirs.dirs;
     "user-dirs.locale".source = ../../configs/user-dirs.locale;
   };
diff --git a/hosts/darp8/pkgs.nix b/hosts/darp8/pkgs.nix
index a1223a2..8ea651c 100644
--- a/hosts/darp8/pkgs.nix
+++ b/hosts/darp8/pkgs.nix
@@ -45,6 +45,7 @@
     pywal
     qbittorrent
     signal-desktop
+    swaynotificationcenter
     swww
     texliveFull
     tree
diff --git a/hosts/darp8/services.nix b/hosts/darp8/services.nix
index 5a70e75..844bfd2 100644
--- a/hosts/darp8/services.nix
+++ b/hosts/darp8/services.nix
@@ -25,7 +25,6 @@
     mpris-proxy.enable = true;
     network-manager-applet.enable = true;
     nextcloud-client.enable = true;
-    swaync.enable = true;
     swww.enable = true;
   };
 }
diff --git a/scripts/progress-notify.sh b/scripts/progress-notify.sh
index 74150b3..ddc27d4 100755
--- a/scripts/progress-notify.sh
+++ b/scripts/progress-notify.sh
@@ -24,13 +24,13 @@ muteToggleNotify() {
             str="Unmuted"
         fi
 
-        $notify -a volume_indicator -h string:x-canonical-private-synchronous:audio "$str" -h int:value:"$volume" -t 1500 --icon $icon
+        $notify -a volume_indicator -h string:x-canonical-private-synchronous:audio "$str" -h int:value:"$volume" -t 800 --icon $icon
 }
 
 notifyMuted() {
         volume=$(pamixer --get-volume)
         muted=$(pamixer --get-mute)
-        $notify -a volume_indicator -h string:x-canonical-private-synchronous:audio "Muted" -h int:value:"$volume" -t 1500 --icon audio-volume-muted
+        $notify -a volume_indicator -h string:x-canonical-private-synchronous:audio "Muted" -h int:value:"$volume" -t 800 --icon audio-volume-muted
 }
 
 notifyAudio() {
@@ -42,11 +42,11 @@ notifyAudio() {
         if [ $volume -eq 0 ]; then
                 notifyMuted "$volume"
         elif [ $volume -le 30 ]; then
-                $notify -a volume_indicator -h string:x-canonical-private-synchronous:audio "Volume: " -h int:value:"$volume" -t 1500 --icon audio-volume-low
+                $notify -a volume_indicator -h string:x-canonical-private-synchronous:audio "Volume: " -h int:value:"$volume" -t 800 --icon audio-volume-low
         elif [ $volume -le 70 ]; then
-                $notify -a volume_indicator -h string:x-canonical-private-synchronous:audio "Volume: " -h int:value:"$volume" -t 1500 --icon audio-volume-medium
+                $notify -a volume_indicator -h string:x-canonical-private-synchronous:audio "Volume: " -h int:value:"$volume" -t 800 --icon audio-volume-medium
         else
-                $notify -a volume_indicator -h string:x-canonical-private-synchronous:audio "Volume: " -h int:value:"$volume" -t 1500 --icon audio-volume-high
+                $notify -a volume_indicator -h string:x-canonical-private-synchronous:audio "Volume: " -h int:value:"$volume" -t 800 --icon audio-volume-high
         fi
 }
 
@@ -54,13 +54,13 @@ notifyBrightness() {
     base_brightness=$(brightnessctl g)
     brightness=$(( $(( $base_brightness * 5 )) + 5 ))
         if [ $brightness -eq 0 ]; then
-                $notify -a brightness_indicator -h string:x-canonical-private-synchronous:brightness "Brightness: " -h int:value:$brightness -t 1500 --icon display-brightness-symbolic
+                $notify -a brightness_indicator -h string:x-canonical-private-synchronous:brightness "Brightness: " -h int:value:$brightness -t 800 --icon display-brightness-symbolic
         elif [ $brightness -le 30 ]; then
-                $notify -a brightness_indicator -h string:x-canonical-private-synchronous:brightness "Brightness: " -h int:value:$brightness -t 1500 --icon display-brightness-symbolic
+                $notify -a brightness_indicator -h string:x-canonical-private-synchronous:brightness "Brightness: " -h int:value:$brightness -t 800 --icon display-brightness-symbolic
         elif [ $brightness -le 70 ]; then
-          $notify -a brightness_indicator -h string:x-canonical-private-synchronous:brightness "Brightness: " -h int:value:"$brightness" -t 1500 --icon display-brightness-symbolic
+          $notify -a brightness_indicator -h string:x-canonical-private-synchronous:brightness "Brightness: " -h int:value:"$brightness" -t 800 --icon display-brightness-symbolic
         else
-                $notify -a brightness_indicator -h string:x-canonical-private-synchronous:brightness "Brightness: " -h int:value:$brightness -t 1500 --icon display-brightness-symbolic
+                $notify -a brightness_indicator -h string:x-canonical-private-synchronous:brightness "Brightness: " -h int:value:$brightness -t 800 --icon display-brightness-symbolic
         fi
 }