Committing before pulling.

.config/DankMaterialShell/settings.json

@@ -2,6 +2,7 @@
   "currentThemeName": "custom",
   "currentThemeCategory": "registry",
   "customThemeFile": "/home/dt/.config/DankMaterialShell/themes/onedark/theme.json",
+<<<<<<< HEAD
   "registryThemeVariants": {},
   "matugenScheme": "scheme-tonal-spot",
   "matugenContrast": 0,
@@ -15,10 +16,13 @@
   "widgetColorMode": "default",
   "controlCenterTileColorMode": "primary",
   "buttonColorMode": "primary",
+=======
+  "widgetBackgroundColor": "sc",
+>>>>>>> b69401d40ffc4572b43c84aa3403316530a91db9
   "cornerRadius": 6,
-  "niriLayoutGapsOverride": -1,
   "niriLayoutRadiusOverride": 6,
   "niriLayoutBorderSize": 2,
+<<<<<<< HEAD
   "hyprlandLayoutGapsOverride": -1,
   "hyprlandLayoutGapsOutOverride": -1,
   "hyprlandLayoutRadiusOverride": -1,
@@ -225,10 +229,15 @@
   "appsDockIconSizePercentage": 100,
   "keyboardLayoutNameCompactMode": false,
   "keyboardLayoutNameShowIcon": false,
+=======
+  "clockFormat": "24h",
+  "useFahrenheit": true,
+  "barElevationEnabled": false,
+  "controlCenterShowMicPercent": true,
+>>>>>>> b69401d40ffc4572b43c84aa3403316530a91db9
   "runningAppsCurrentWorkspace": false,
-  "runningAppsGroupByApp": false,
-  "runningAppsCurrentMonitor": false,
   "appIdSubstitutions": [],
+<<<<<<< HEAD
   "centeringMode": "index",
   "clockDateFormat": "",
   "lockDateFormat": "",
@@ -245,21 +254,22 @@
   "greeterSyncPending": false,
   "greeterSyncBaseline": {},
   "mediaSize": 1,
+=======
+>>>>>>> b69401d40ffc4572b43c84aa3403316530a91db9
   "appLauncherViewMode": "grid",
   "spotlightModalViewMode": "grid",
-  "browserPickerViewMode": "grid",
-  "browserUsageHistory": {},
-  "appPickerViewMode": "grid",
-  "filePickerUsageHistory": {},
-  "sortAppsAlphabetically": false,
   "appLauncherGridColumns": 6,
+<<<<<<< HEAD
   "spotlightCloseNiriOverview": true,
   "rememberLastQuery": false,
   "rememberLastMode": true,
   "spotlightSectionViewModes": {},
+=======
+>>>>>>> b69401d40ffc4572b43c84aa3403316530a91db9
   "appDrawerSectionViewModes": {
     "apps": "tile"
   },
+<<<<<<< HEAD
   "niriOverviewOverlayEnabled": true,
   "niriOverviewLauncherStyle": "full",
   "dankLauncherV2Size": "compact",
@@ -304,6 +314,8 @@
   "iconThemeLight": "System Default",
   "iconThemePerMode": false,
   "lastAppliedIconTheme": "",
+=======
+>>>>>>> b69401d40ffc4572b43c84aa3403316530a91db9
   "cursorSettings": {
     "theme": "System Default",
     "size": 24,
@@ -320,17 +332,12 @@
       "cursorHideTimeout": 0
     }
   },
-  "launcherLogoMode": "apps",
   "launcherLogoCustomPath": "/home/dt/.config/qtile/icons/cachyos.svg",
-  "launcherLogoColorOverride": "",
-  "launcherLogoColorInvertOnMode": false,
-  "launcherLogoBrightness": 0.5,
-  "launcherLogoContrast": 1,
-  "launcherLogoSizeOffset": 0,
   "fontFamily": "Ubuntu",
   "monoFontFamily": "JetBrains Mono SemiBold",
   "fontWeight": 700,
   "fontScale": 1.1,
+<<<<<<< HEAD
   "textRenderType": 0,
   "textRenderQuality": 0,
   "notepadUseMonospace": true,
@@ -554,6 +561,10 @@
   "displayShowDisconnected": false,
   "displaySnapToEdge": true,
   "connectedFrameBarStyleBackups": {},
+=======
+  "matugenTemplateNeovim": true,
+  "osdPowerProfileEnabled": true,
+>>>>>>> b69401d40ffc4572b43c84aa3403316530a91db9
   "barConfigs": [
     {
       "id": "default",
@@ -666,13 +677,10 @@
       "shadowOpacity": 60,
       "shadowColorMode": "text",
       "shadowCustomColor": "#000000",
-      "widgetPadding": 8
+      "widgetPadding": 8,
+      "attachToScreenEdge": false
     }
   ],
-  "desktopClockEnabled": false,
-  "desktopClockStyle": "analog",
-  "desktopClockTransparency": 0.8,
-  "desktopClockColorMode": "primary",
   "desktopClockCustomColor": {
     "r": 1,
     "g": 1,
@@ -686,20 +694,6 @@
     "hslLightness": 1,
     "valid": true
   },
-  "desktopClockShowDate": true,
-  "desktopClockShowAnalogNumbers": false,
-  "desktopClockShowAnalogSeconds": true,
-  "desktopClockX": -1,
-  "desktopClockY": -1,
-  "desktopClockWidth": 280,
-  "desktopClockHeight": 180,
-  "desktopClockDisplayPreferences": [
-    "all"
-  ],
-  "systemMonitorEnabled": false,
-  "systemMonitorShowHeader": true,
-  "systemMonitorTransparency": 0.8,
-  "systemMonitorColorMode": "primary",
   "systemMonitorCustomColor": {
     "r": 1,
     "g": 1,
@@ -713,38 +707,12 @@
     "hslLightness": 1,
     "valid": true
   },
-  "systemMonitorShowCpu": true,
-  "systemMonitorShowCpuGraph": true,
-  "systemMonitorShowCpuTemp": true,
-  "systemMonitorShowGpuTemp": false,
-  "systemMonitorGpuPciId": "",
-  "systemMonitorShowMemory": true,
-  "systemMonitorShowMemoryGraph": true,
-  "systemMonitorShowNetwork": true,
-  "systemMonitorShowNetworkGraph": true,
-  "systemMonitorShowDisk": true,
-  "systemMonitorShowTopProcesses": false,
-  "systemMonitorTopProcessCount": 3,
-  "systemMonitorTopProcessSortBy": "cpu",
-  "systemMonitorGraphInterval": 60,
-  "systemMonitorLayoutMode": "auto",
-  "systemMonitorX": -1,
-  "systemMonitorY": -1,
-  "systemMonitorWidth": 320,
-  "systemMonitorHeight": 480,
-  "systemMonitorDisplayPreferences": [
-    "all"
-  ],
-  "systemMonitorVariants": [],
-  "desktopWidgetPositions": {},
-  "desktopWidgetGridSettings": {},
-  "desktopWidgetInstances": [],
-  "desktopWidgetGroups": [],
   "builtInPluginSettings": {
     "dms_settings_search": {
       "trigger": "?"
     }
   },
+<<<<<<< HEAD
   "clipboardClickToPaste": false,
   "clipboardEnterToPaste": false,
   "clipboardRememberTypeFilter": false,
@@ -776,4 +744,7 @@
   "barInsetPaddingSyncAll": false,
   "frameBarInsetPadding": -1,
   "configVersion": 13
+=======
+  "configVersion": 17
+>>>>>>> b69401d40ffc4572b43c84aa3403316530a91db9
 }

.config/emacs/config.el

@@ -1,6 +1,6 @@
+;; -*- lexical-binding: t; -*-
 (add-to-list 'load-path "~/.config/emacs/scripts/")
 
-(require 'elpaca-setup)  ;; The Elpaca Package Manager
 (require 'app-launchers) ;; Use emacs as a run launcher like dmenu (experimental)
 (require 'buffer-move)   ;; Buffer-move for better window management
 (require 'eshell-prompt) ;; A fancy prompt for eshell
@@ -15,7 +15,8 @@
 (setq backup-directory-alist '((".*" . "~/.config/emacs/backups/")))
 
 (use-package claude-code
-  :ensure (claude-code :host github :repo "stevemolitor/claude-code.el")
+  :ensure t
+  :vc (:url "https://github.com/stevemolitor/claude-code.el" :rev :newest)
   :bind ("C-c c" . claude-code-transient)
   :config
   ;; Optional: Start the Emacs server if not already running
@@ -188,7 +189,6 @@
                           ("SonicUniverse" . "https://somafm.com/sonicuniverse130.pls")
                           ("ThistleRadio Celtic" . "https://somafm.com/thistle130.pls"))))
 
-;; Expands to: (elpaca evil (use-package evil :demand t))
 (use-package evil
     :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.
@@ -416,8 +416,13 @@
     "h m" '(describe-mode :wk "Describe mode")
     "h r" '(:ignore t :wk "Reload")
     "h r r" '((lambda () (interactive)
-                (load-file "~/.config/emacs/init.el")
+                (package-refresh-contents)
-                (ignore (elpaca-process-queues)))
+                (package-upgrade-all)
+                (package-vc-upgrade-all)
+                (load-file "~/.config/emacs/init.el"))
+              :wk "Upgrade packages and reload")
+    "h r R" '((lambda () (interactive)
+                (load-file "~/.config/emacs/init.el"))
               :wk "Reload emacs config")
     "h t" '(load-theme :wk "Load theme")
     "h v" '(describe-variable :wk "Describe variable")
@@ -645,14 +650,14 @@
 
 (eval-after-load 'org-indent '(diminish 'org-indent-mode))
 
-  (custom-set-faces
+(custom-set-faces
-   '(org-level-1 ((t (:inherit outline-1 :height 1.7))))
+ '(org-level-1 ((t (:inherit outline-1 :height 1.7))))
-   '(org-level-2 ((t (:inherit outline-2 :height 1.6))))
+ '(org-level-2 ((t (:inherit outline-2 :height 1.6))))
-   '(org-level-3 ((t (:inherit outline-3 :height 1.5))))
+ '(org-level-3 ((t (:inherit outline-3 :height 1.5))))
-   '(org-level-4 ((t (:inherit outline-4 :height 1.4))))
+ '(org-level-4 ((t (:inherit outline-4 :height 1.4))))
-   '(org-level-5 ((t (:inherit outline-5 :height 1.3))))
+ '(org-level-5 ((t (:inherit outline-5 :height 1.3))))
-   '(org-level-6 ((t (:inherit outline-5 :height 1.2))))
+ '(org-level-6 ((t (:inherit outline-5 :height 1.2))))
-   '(org-level-7 ((t (:inherit outline-5 :height 1.1)))))
+ '(org-level-7 ((t (:inherit outline-5 :height 1.1)))))
 
 (require 'org-tempo)
 
@@ -812,13 +817,30 @@
 
 (add-to-list 'custom-theme-load-path "~/.config/emacs/themes/")
 
+;; (use-package doom-themes
+;;   :config
+;;   (setq doom-themes-enable-bold t    ; if nil, bold is universally disabled
+;;         doom-themes-enable-italic t) ; if nil, italics is universally disabled
+;;   ;; Sets the default theme to load!!! 
+;;   (load-theme 'doom-one t)
+;;   ;; Enable custom neotree theme (all-the-icons must be installed!)
+;;   (doom-themes-neotree-config)
+;;   ;; Corrects (and improves) org-mode's native fontification.
+;;   (doom-themes-org-config))
+
 (use-package doom-themes
+  :ensure t
+  :custom
+  ;; Global settings (defaults)
+  (doom-themes-enable-bold t)   ; if nil, bold is universally disabled
+  (doom-themes-enable-italic t) ; if nil, italics is universally disabled
+  ;; for treemacs users
   :config
-  (setq doom-themes-enable-bold t    ; if nil, bold is universally disabled
-        doom-themes-enable-italic t) ; if nil, italics is universally disabled
-  ;; Sets the default theme to load!!! 
   (load-theme 'doom-one t)
-  ;; Enable custom neotree theme (all-the-icons must be installed!)
+
+  ;; Enable flashing mode-line on errors
+  (doom-themes-visual-bell-config)
+  ;; Enable custom neotree theme (nerd-icons must be installed!)
   (doom-themes-neotree-config)
   ;; Corrects (and improves) org-mode's native fontification.
   (doom-themes-org-config))

.config/emacs/config.org

@@ -71,7 +71,6 @@ To keep this =config.org= a reasonable length, I have moved a lot of code to ind
 
 ** Sourcing the scripts
 #+begin_src emacs-lisp
-(require 'elpaca-setup)  ;; The Elpaca Package Manager
 (require 'app-launchers) ;; Use emacs as a run launcher like dmenu (experimental)
 (require 'buffer-move)   ;; Buffer-move for better window management
 (require 'eshell-prompt) ;; A fancy prompt for eshell
@@ -102,7 +101,8 @@ By default, Emacs creates automatic backups of files in their original directori
 
 #+begin_src emacs-lisp
 (use-package claude-code
-  :ensure (claude-code :host github :repo "stevemolitor/claude-code.el")
+  :ensure t
+  :vc (:url "https://github.com/stevemolitor/claude-code.el" :rev :newest)
   :bind ("C-c c" . claude-code-transient)
   :config
   ;; Optional: Start the Emacs server if not already running
@@ -332,7 +332,6 @@ An RSS newsfeed reader for Emacs.  Move through the articles with 'j/k'.  Move t
 [[https://github.com/emacs-evil/evil][Evil]] is an extensible vi/vim layer for Emacs.  Because...let's face it.  The Vim keybindings are just plain better.
 
 #+begin_src emacs-lisp
-;; Expands to: (elpaca evil (use-package evil :demand t))
 (use-package evil
     :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.
@@ -586,8 +585,13 @@ mouse wheel for zooming in/out.
     "h m" '(describe-mode :wk "Describe mode")
     "h r" '(:ignore t :wk "Reload")
     "h r r" '((lambda () (interactive)
-                (load-file "~/.config/emacs/init.el")
+                (package-refresh-contents)
-                (ignore (elpaca-process-queues)))
+                (package-upgrade-all)
+                (package-vc-upgrade-all)
+                (load-file "~/.config/emacs/init.el"))
+              :wk "Upgrade packages and reload")
+    "h r R" '((lambda () (interactive)
+                (load-file "~/.config/emacs/init.el"))
               :wk "Reload emacs config")
     "h t" '(load-theme :wk "Load theme")
     "h v" '(describe-variable :wk "Describe variable")
@@ -1156,13 +1160,30 @@ The first line below designates the directory where will place all of our custom
 #+begin_src emacs-lisp
 (add-to-list 'custom-theme-load-path "~/.config/emacs/themes/")
 
+;; (use-package doom-themes
+;;   :config
+;;   (setq doom-themes-enable-bold t    ; if nil, bold is universally disabled
+;;         doom-themes-enable-italic t) ; if nil, italics is universally disabled
+;;   ;; Sets the default theme to load!!! 
+;;   (load-theme 'doom-one t)
+;;   ;; Enable custom neotree theme (all-the-icons must be installed!)
+;;   (doom-themes-neotree-config)
+;;   ;; Corrects (and improves) org-mode's native fontification.
+;;   (doom-themes-org-config))
+
 (use-package doom-themes
+  :ensure t
+  :custom
+  ;; Global settings (defaults)
+  (doom-themes-enable-bold t)   ; if nil, bold is universally disabled
+  (doom-themes-enable-italic t) ; if nil, italics is universally disabled
+  ;; for treemacs users
   :config
-  (setq doom-themes-enable-bold t    ; if nil, bold is universally disabled
-        doom-themes-enable-italic t) ; if nil, italics is universally disabled
-  ;; Sets the default theme to load!!! 
   (load-theme 'doom-one t)
-  ;; Enable custom neotree theme (all-the-icons must be installed!)
+
+  ;; Enable flashing mode-line on errors
+  (doom-themes-visual-bell-config)
+  ;; Enable custom neotree theme (nerd-icons must be installed!)
   (doom-themes-neotree-config)
   ;; Corrects (and improves) org-mode's native fontification.
   (doom-themes-org-config))

.config/emacs/early-init.el

@@ -1 +1,4 @@
+;; -*- lexical-binding: t; -*-
+;; We call (package-initialize) ourselves in init.el, after setting
+;; up package-archives, so we disable Emacs' automatic call to it here.
 (setq package-enable-at-startup nil)

.config/emacs/init.el

@@ -1,4 +1,82 @@
-(org-babel-load-file
+;; -*- lexical-binding: t; -*-
- (expand-file-name
+;;; Package.el setup (replaces Elpaca) -------------------------------------
-  "config.org"
+(require 'package)
-  user-emacs-directory))
+
+(setq package-archives
+      '(("gnu"    . "https://elpa.gnu.org/packages/")
+        ("nongnu" . "https://elpa.nongnu.org/nongnu/")
+        ("melpa"  . "https://melpa.org/packages/"))
+      ;; Prefer MELPA over GNU/NonGNU ELPA when a package exists in both.
+      package-archive-priorities
+      '(("melpa"  . 10)
+        ("nongnu" . 5)
+        ("gnu"    . 0)))
+
+(package-initialize)
+
+;; Refresh the package index on a fresh install, when there's nothing
+;; to search yet.
+(unless package-archive-contents
+  (package-refresh-contents))
+
+;; use-package is built into Emacs 29+, but this keeps things working
+;; on older Emacsen too.
+(unless (package-installed-p 'use-package)
+  (package-install 'use-package))
+
+(require 'use-package)
+
+;; Make every `use-package' block below install its package
+;; automatically, the same way `elpaca-use-package-mode' used to.
+(setq use-package-always-ensure t)
+
+;;; Load the rest of the config -----------------------------------------
+(defun dt/load-org-config (org-file)
+  "Tangle ORG-FILE to an adjacent .el file and load it.
+Behaves like `org-babel-load-file' (only re-tangles when ORG-FILE
+is newer than the tangled .el), but additionally guarantees the
+tangled file starts with a lexical-binding cookie, regardless of
+which source block happens to tangle first inside ORG-FILE."
+  (let ((tangled (concat (file-name-sans-extension org-file) ".el")))
+    (when (or (not (file-exists-p tangled))
+              (file-newer-than-file-p org-file tangled))
+      (require 'ob-tangle)
+      (org-babel-tangle-file org-file tangled
+                              (rx string-start (or "emacs-lisp" "elisp") string-end))
+      (with-temp-buffer
+        (insert-file-contents tangled)
+        (goto-char (point-min))
+        (unless (looking-at-p ".*-\\*-.*lexical-binding: *t.*-\\*-")
+          (insert ";; -*- lexical-binding: t; -*-\n")
+          (write-region (point-min) (point-max) tangled nil 'quiet)))
+      (set-file-times tangled))
+    (load-file tangled)))
+
+(dt/load-org-config
+ (expand-file-name "config.org" user-emacs-directory))
+
+(custom-set-variables
+ ;; custom-set-variables was added by Custom.
+ ;; 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.
+ '(package-selected-packages
+   '(all-the-icons all-the-icons-ivy-rich app-launcher claude-code
+		   dashboard doom-modeline doom-themes flycheck
+		   ivy-rich ox-hugo vterm vterm-toggle))
+ '(package-vc-selected-packages
+   '((app-launcher :url "https://github.com/SebastienWae/app-launcher")))
+ '(warning-suppress-log-types
+   '((files missing-lexbind-cookie "~/.config/emacs/early-init.el"))))
+(custom-set-faces
+ ;; custom-set-faces was added by Custom.
+ ;; 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.
+ '(org-level-1 ((t (:inherit outline-1 :height 1.7))))
+ '(org-level-2 ((t (:inherit outline-2 :height 1.6))))
+ '(org-level-3 ((t (:inherit outline-3 :height 1.5))))
+ '(org-level-4 ((t (:inherit outline-4 :height 1.4))))
+ '(org-level-5 ((t (:inherit outline-5 :height 1.3))))
+ '(org-level-6 ((t (:inherit outline-5 :height 1.2))))
+ '(org-level-7 ((t (:inherit outline-5 :height 1.1)))))

.config/emacs/scripts/app-launchers.el

@@ -1,4 +1,4 @@
-;;; app-launchers.el --- Possible alternatives to dmenu/rofi
+;;; app-launchers.el --- Possible alternatives to dmenu/rofi -*- lexical-binding: t; -*-
 
 ;;; Code:
 
@@ -22,7 +22,8 @@
 ;; The 'app-launcher' is a better run launcher since it reads the desktop applications on your system and you can search them by their names as defined in their desktop file.  This means that sometimes you have to search for a generic term rather than the actual binary command of the program.
 
 (use-package app-launcher
-  :ensure '(app-launcher :host github :repo "SebastienWae/app-launcher"))
+  :ensure t
+  :vc (:url "https://github.com/SebastienWae/app-launcher" :rev :newest))
 ;; create a global keyboard shortcut with the following code
 ;; emacsclient -cF "((visibility . nil))" -e "(emacs-run-launcher)"
 
@@ -218,4 +219,3 @@ ACTION-FN is a function that takes the selected string as an argument."
 
 (provide 'app-launchers)
 ;;; app-launchers.el ends here
-

.config/emacs/scripts/buffer-move.el

@@ -1,4 +1,4 @@
-;;; buffer-move.el --- Buffer move allows for better window controls.
+;;; buffer-move.el --- Buffer move allows for better window controls. -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2004-2014  Lucas Bonnet <lucas@rincevent.net.fr>
 

.config/emacs/scripts/elpaca-setup.el

@@ -1,73 +1,52 @@
 
 ;;; Code:
-
+(defvar elpaca-installer-version 0.12)
-(defvar elpaca-installer-version 0.11)
 (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-sources-directory (expand-file-name "sources/" elpaca-directory))
 (defvar elpaca-order '(elpaca :repo "https://github.com/progfolio/elpaca.git"
-			:ref nil
+                              :ref nil :depth 1 :inherit ignore
-			:files (:defaults (:exclude "extensions"))
+                              :files (:defaults "elpaca-test.el" (:exclude "extensions"))
-			:build (:not elpaca--activate-package)))
+                              :build (:not elpaca-activate)))
-(let* ((repo  (expand-file-name "elpaca/" elpaca-repos-directory))
+(let* ((repo  (expand-file-name "elpaca/" elpaca-sources-directory))
- (build (expand-file-name "elpaca/" elpaca-builds-directory))
+       (build (expand-file-name "elpaca/" elpaca-builds-directory))
- (order (cdr elpaca-order))
+       (order (cdr elpaca-order))
- (default-directory repo))
+       (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))
+    (when (<= emacs-major-version 28) (require 'subr-x))
     (condition-case-unless-debug err
-  (if-let ((buffer (pop-to-buffer-same-window "*elpaca-bootstrap*"))
+        (if-let* ((buffer (pop-to-buffer-same-window "*elpaca-bootstrap*"))
-	   ((zerop (call-process "git" nil buffer t "clone"
+                  ((zerop (apply #'call-process `("git" nil ,buffer t "clone"
-				 (plist-get order :repo) repo)))
+                                                  ,@(when-let* ((depth (plist-get order :depth)))
-	   ((zerop (call-process "git" nil buffer t "checkout"
+                                                      (list (format "--depth=%d" depth) "--no-single-branch"))
-				 (or (plist-get order :ref) "--"))))
+                                                  ,(plist-get order :repo) ,repo))))
-	   (emacs (concat invocation-directory invocation-name))
+                  ((zerop (call-process "git" nil buffer t "checkout"
-	   ((zerop (call-process emacs nil buffer nil "-Q" "-L" "." "--batch"
+                                        (or (plist-get order :ref) "--"))))
-				 "--eval" "(byte-recompile-directory \".\" 0 'force)")))
+                  (emacs (concat invocation-directory invocation-name))
-	   ((require 'elpaca))
+                  ((zerop (call-process emacs nil buffer nil "-Q" "-L" "." "--batch"
-	   ((elpaca-generate-autoloads "elpaca" repo)))
+                                        "--eval" "(byte-recompile-directory \".\" 0 'force)")))
-      (progn (message "%s" (buffer-string)) (kill-buffer buffer))
+                  ((require 'elpaca))
-    (error "%s" (with-current-buffer buffer (buffer-string))))
+                  ((elpaca-generate-autoloads "elpaca" repo)))
-((error) (warn "%s" err) (delete-directory repo 'recursive))))
+            (progn (message "%s" (buffer-string)) (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")))
+    (let ((load-source-file-function nil)) (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.
+;; Block until use-package support is available
 (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"))
-(elpaca (magit :branch "main" :pre-build ("make" "info")))
-(elpaca (forge :branch "main"))
-(elpaca (ghub :branch "main"))
-(elpaca (transient :branch "main"))
-(elpaca (with-editor :branch "main"))
-
 (provide 'elpaca-setup)
 
 ;;; elpaca-setup.el ends here

.config/emacs/scripts/eshell-prompt.el

@@ -1,4 +1,4 @@
-;;; eshell-prompt.el --- a fancy shell prompt for eshell
+;;; eshell-prompt.el --- a fancy shell prompt for eshell -*- lexical-binding: t; -*-
 
 ;;; Code:
 

.config/fish/config.fish

@@ -174,6 +174,9 @@ alias parsyu='paru -Syu --noconfirm'             # update standard pkgs and AUR
 alias unlock='sudo rm /var/lib/pacman/db.lck'    # remove pacman lock
 alias orphan='sudo pacman -Rns (pacman -Qtdq)'  # remove orphaned packages (DANGEROUS!)
 
+# content creation
+alias mp3='cd Videos/dtoptions/market-outlook/ && yt-dlp -x --audio-format mp3'
+
 # get fastest mirrors
 alias mirror="sudo reflector -f 30 -l 30 --number 10 --verbose --save /etc/pacman.d/mirrorlist"
 alias mirrord="sudo reflector --latest 50 --number 20 --sort delay --save /etc/pacman.d/mirrorlist"

.config/niri/dms/alttab.kdl

@@ -5,6 +5,6 @@
 
 recent-windows {
     highlight {
-        corner-radius 6
+        corner-radius 12
     }
 }

.config/niri/dms/colors.kdl

@@ -5,15 +5,15 @@ layout {
     background-color "transparent"
 
     focus-ring {
-        active-color   "#51afef"
+        active-color   "#d0bcff"
-        inactive-color "#abb2bf"
+        inactive-color "#948f99"
-        urgent-color   "#ff6c6b"
+        urgent-color   "#f2b8b5"
     }
 
     border {
-        active-color   "#51afef"
+        active-color   "#d0bcff"
-        inactive-color "#abb2bf"
+        inactive-color "#948f99"
-        urgent-color   "#ff6c6b"
+        urgent-color   "#f2b8b5"
     }
 
     shadow {
@@ -21,19 +21,19 @@ layout {
     }
 
     tab-indicator {
-        active-color   "#51afef"
+        active-color   "#d0bcff"
-        inactive-color "#abb2bf"
+        inactive-color "#948f99"
-        urgent-color   "#ff6c6b"
+        urgent-color   "#f2b8b5"
     }
 
     insert-hint {
-        color "#51afef80"
+        color "#d0bcff80"
     }
 }
 
 recent-windows {
     highlight {
-        active-color   "#7dcfff"
+        active-color   "#4f378b"
-        urgent-color   "#ff6c6b"
+        urgent-color   "#f2b8b5"
     }
 }

.config/niri/dms/layout.kdl

@@ -4,7 +4,7 @@
 // ! PLACE YOUR CUSTOM CONFIGURATION ELSEWHERE !
 
 layout {
-    gaps 12
+    gaps 4
 
     border {
         width 2
@@ -16,7 +16,7 @@ layout {
 }
 
 window-rule {
-    geometry-corner-radius 6
+    geometry-corner-radius 12
     clip-to-geometry true
     tiled-state true
     draw-border-with-background false

.config/niri/dms/windowrules.kdl

@@ -0,0 +1,8 @@
+// DMS Window Rules - Managed by DankMaterialShell
+// Do not edit manually - changes may be overwritten
+
+// @id=dms-floating-windows @name=DMS Floating Windows
+window-rule {
+    match app-id="^com.danklinux.dms$"
+    open-floating true
+}