Merge branch 'armillaire-master-patch-28683' into 'master'

fixed broken examples link in bspwm README

See merge request dwt1/dotfiles!90

.bashrc

@@ -258,10 +258,6 @@ alias regfont="setfont default8x16"
 # bare git repo alias for managing my dotfiles
 alias config="/usr/bin/git --git-dir=$HOME/dotfiles --work-tree=$HOME"
 
-# Aliasealias s used to upload a static website
-alias dashdb="rsync -avz --exclude 'venv' --exclude '__pycache__' --exclude '*.pyc' /home/dt/nc/trading/dashboard/ root@157.230.6.42:/var/www/dtoptions/"
-alias dashpdf="rsync -avz /home/dt/nc/trading/trading-plans/ root@157.230.6.42:/root/nc/trading/trading-plans/"
-
 # termbin
 alias tb="nc termbin.com 9999"
 

.config/DankMaterialShell/settings.json

@@ -4,14 +4,11 @@
   "customThemeFile": "/home/dt/.config/DankMaterialShell/themes/onedark/theme.json",
   "registryThemeVariants": {},
   "matugenScheme": "scheme-tonal-spot",
-  "matugenContrast": 0,
   "runUserMatugenTemplates": true,
   "matugenTargetMonitor": "",
   "popupTransparency": 1,
   "dockTransparency": 1,
   "widgetBackgroundColor": "sc",
-  "widgetBackgroundCustomColor": "#6750A4",
-  "widgetBackgroundCustomStrength": 0.5,
   "widgetColorMode": "default",
   "controlCenterTileColorMode": "primary",
   "buttonColorMode": "primary",
@@ -20,18 +17,11 @@
   "niriLayoutRadiusOverride": 6,
   "niriLayoutBorderSize": 2,
   "hyprlandLayoutGapsOverride": -1,
-  "hyprlandLayoutGapsOutOverride": -1,
   "hyprlandLayoutRadiusOverride": -1,
   "hyprlandLayoutBorderSize": -1,
-  "hyprlandResizeOnBorder": false,
   "mangoLayoutGapsOverride": -1,
-  "mangoLayoutGapsOutOverride": -1,
   "mangoLayoutRadiusOverride": -1,
   "mangoLayoutBorderSize": -1,
-  "mangoTrackpadNaturalScrolling": true,
-  "firstDayOfWeek": -1,
-  "showWeekNumber": false,
-  "calendarBackend": "auto",
   "use24HourClock": true,
   "showSeconds": false,
   "padHours12Hour": false,
@@ -46,28 +36,9 @@
   "modalAnimationSpeed": 1,
   "modalCustomAnimationDuration": 150,
   "enableRippleEffects": true,
-  "animationVariant": 0,
-  "motionEffect": 0,
-  "m3ElevationEnabled": true,
-  "m3ElevationIntensity": 12,
-  "m3ElevationOpacity": 30,
-  "m3ElevationColorMode": "default",
-  "m3ElevationLightDirection": "top",
-  "m3ElevationCustomColor": "#000000",
-  "modalElevationEnabled": true,
-  "popoutElevationEnabled": true,
-  "barElevationEnabled": false,
-  "blurEnabled": false,
-  "blurForegroundLayers": true,
-  "blurLayerOutlineOpacity": 0.12,
-  "blurBorderColor": "outline",
-  "blurBorderCustomColor": "#ffffff",
-  "blurBorderOpacity": 0.35,
   "wallpaperFillMode": "Fill",
   "blurredWallpaperLayer": false,
   "blurWallpaperOnOverview": false,
-  "wallpaperBackgroundColorMode": "black",
-  "wallpaperBackgroundCustomColor": "#000000",
   "showLauncherButton": true,
   "showWorkspaceSwitcher": true,
   "showFocusedWindow": true,
@@ -81,18 +52,9 @@
   "selectedGpuIndex": 0,
   "enabledGpuPciIds": [],
   "showSystemTray": true,
-  "systemTrayIconTintMode": "none",
-  "systemTrayIconTintSaturation": 50,
-  "systemTrayIconTintStrength": 135,
   "showClock": true,
   "showNotificationButton": true,
   "showBattery": true,
-  "showBatteryPercent": true,
-  "showBatteryPercentOnlyOnBattery": false,
-  "showBatteryTime": false,
-  "showBatteryTimeOnlyOnBattery": false,
-  "batteryPillStyle": false,
-  "batteryPillPercentSign": false,
   "showControlCenterButton": true,
   "showCapsLockIndicator": true,
   "controlCenterShowNetworkIcon": true,
@@ -107,8 +69,6 @@
   "controlCenterShowBatteryIcon": false,
   "controlCenterShowPrinterIcon": false,
   "controlCenterShowScreenSharingIcon": true,
-  "controlCenterShowIdleInhibitorIcon": false,
-  "controlCenterShowDoNotDisturbIcon": false,
   "showPrivacyButton": true,
   "privacyShowMicIcon": false,
   "privacyShowCameraIcon": false,
@@ -164,57 +124,29 @@
   "maxWorkspaceIcons": 3,
   "workspaceAppIconSizeOffset": 0,
   "groupWorkspaceApps": true,
-  "groupActiveWorkspaceApps": false,
   "workspaceFollowFocus": false,
   "showOccupiedWorkspacesOnly": false,
   "reverseScrolling": false,
   "dwlShowAllTags": false,
-  "workspaceActiveAppHighlightEnabled": false,
   "workspaceColorMode": "default",
-  "workspaceFocusedCustomColor": "#6750A4",
   "workspaceOccupiedColorMode": "none",
-  "workspaceOccupiedCustomColor": "#625B71",
   "workspaceUnfocusedColorMode": "default",
-  "workspaceUnfocusedCustomColor": "#49454E",
   "workspaceUrgentColorMode": "default",
-  "workspaceUrgentCustomColor": "#B3261E",
   "workspaceFocusedBorderEnabled": false,
   "workspaceFocusedBorderColor": "primary",
-  "workspaceFocusedBorderCustomColor": "#6750A4",
   "workspaceFocusedBorderThickness": 2,
-  "workspaceUnfocusedMonitorSeparateAppearance": false,
-  "workspaceUnfocusedMonitorColorMode": "default",
-  "workspaceUnfocusedMonitorFocusedCustomColor": "#6750A4",
-  "workspaceUnfocusedMonitorOccupiedColorMode": "none",
-  "workspaceUnfocusedMonitorOccupiedCustomColor": "#625B71",
-  "workspaceUnfocusedMonitorUnfocusedColorMode": "default",
-  "workspaceUnfocusedMonitorUnfocusedCustomColor": "#49454E",
-  "workspaceUnfocusedMonitorUrgentColorMode": "default",
-  "workspaceUnfocusedMonitorUrgentCustomColor": "#B3261E",
-  "workspaceUnfocusedMonitorBorderEnabled": false,
-  "workspaceUnfocusedMonitorBorderColor": "primary",
-  "workspaceUnfocusedMonitorBorderCustomColor": "#6750A4",
-  "workspaceUnfocusedMonitorBorderThickness": 2,
   "workspaceNameIcons": {},
   "waveProgressEnabled": true,
   "scrollTitleEnabled": true,
-  "mediaAdaptiveWidthEnabled": true,
   "audioVisualizerEnabled": true,
   "audioScrollMode": "volume",
   "audioWheelScrollAmount": 5,
-  "audioDeviceScrollVolumeEnabled": false,
-  "mediaExcludePlayers": [],
   "clockCompactMode": false,
   "focusedWindowCompactMode": false,
-  "focusedWindowSize": 1,
-  "focusedWindowShowIcon": true,
   "runningAppsCompactMode": true,
   "barMaxVisibleApps": 0,
   "barMaxVisibleRunningApps": 0,
   "barShowOverflowBadge": true,
-  "trayAutoOverflow": true,
-  "trayPopupSingleLine": true,
-  "trayMaxVisibleItems": 0,
   "appsDockHideIndicators": false,
   "appsDockColorizeActive": false,
   "appsDockActiveColorMode": "primary",
@@ -222,7 +154,6 @@
   "appsDockEnlargePercentage": 125,
   "appsDockIconSizePercentage": 100,
   "keyboardLayoutNameCompactMode": false,
-  "keyboardLayoutNameShowIcon": false,
   "runningAppsCurrentWorkspace": false,
   "runningAppsGroupByApp": false,
   "runningAppsCurrentMonitor": false,
@@ -230,20 +161,6 @@
   "centeringMode": "index",
   "clockDateFormat": "",
   "lockDateFormat": "",
-  "greeterRememberLastSession": true,
-  "greeterRememberLastUser": true,
-  "greeterAutoLogin": false,
-  "greeterEnableFprint": false,
-  "greeterEnableU2f": false,
-  "greeterWallpaperPath": "",
-  "greeterUse24HourClock": true,
-  "greeterShowSeconds": false,
-  "greeterPadHours12Hour": false,
-  "greeterLockDateFormat": "",
-  "greeterFontFamily": "",
-  "greeterWallpaperFillMode": "",
-  "greeterSyncPending": false,
-  "greeterSyncBaseline": {},
   "mediaSize": 1,
   "appLauncherViewMode": "grid",
   "spotlightModalViewMode": "grid",
@@ -254,55 +171,21 @@
   "sortAppsAlphabetically": false,
   "appLauncherGridColumns": 6,
   "spotlightCloseNiriOverview": true,
-  "rememberLastQuery": false,
-  "rememberLastMode": true,
   "spotlightSectionViewModes": {},
   "appDrawerSectionViewModes": {
     "apps": "list"
   },
   "niriOverviewOverlayEnabled": true,
   "dankLauncherV2Size": "compact",
-  "dankLauncherV2ShowSourceBadges": true,
   "dankLauncherV2BorderEnabled": false,
   "dankLauncherV2BorderThickness": 2,
   "dankLauncherV2BorderColor": "primary",
   "dankLauncherV2ShowFooter": true,
   "dankLauncherV2UnloadOnClose": false,
-  "dankLauncherV2IncludeFilesInAll": false,
-  "dankLauncherV2IncludeFoldersInAll": false,
-  "launcherUseOverlayLayer": false,
-  "launcherStyle": "full",
-  "spotlightBarShowModeChips": false,
-  "keybindsFloatingWindow": false,
   "useAutoLocation": false,
   "weatherEnabled": true,
-  "dashTabs": [
-    {
-      "id": "overview",
-      "enabled": true
-    },
-    {
-      "id": "media",
-      "enabled": true
-    },
-    {
-      "id": "wallpaper",
-      "enabled": true
-    },
-    {
-      "id": "weather",
-      "enabled": true
-    },
-    {
-      "id": "settings",
-      "enabled": true
-    }
-  ],
   "networkPreference": "auto",
-  "iconThemeDark": "System Default",
+  "iconTheme": "System Default",
-  "iconThemeLight": "System Default",
-  "iconThemePerMode": false,
-  "lastAppliedIconTheme": "",
   "cursorSettings": {
     "theme": "System Default",
     "size": 24,
@@ -330,50 +213,28 @@
   "monoFontFamily": "JetBrains Mono SemiBold",
   "fontWeight": 700,
   "fontScale": 1.1,
-  "textRenderType": 0,
-  "textRenderQuality": 0,
   "notepadUseMonospace": true,
   "notepadFontFamily": "",
   "notepadFontSize": 14,
-  "notificationSummaryFontSize": 0,
-  "notificationBodyFontSize": 0,
   "notepadShowLineNumbers": false,
-  "notepadAutoSave": false,
-  "notepadSlideoutSide": "right",
-  "notepadDefaultMode": "slideout",
   "notepadTransparencyOverride": -1,
   "notepadLastCustomTransparency": 0.7,
-  "notepadUseCompositorGap": false,
-  "notepadEdgeGap": 0,
   "soundsEnabled": true,
   "useSystemSoundTheme": false,
-  "soundLogin": false,
   "soundNewNotification": true,
   "soundVolumeChanged": true,
   "soundPluggedIn": true,
-  "muteSoundsWhenMediaPlaying": true,
   "acMonitorTimeout": 0,
   "acLockTimeout": 0,
   "acSuspendTimeout": 0,
   "acSuspendBehavior": 0,
   "acProfileName": "",
-  "acPostLockMonitorTimeout": 0,
   "batteryMonitorTimeout": 0,
   "batteryLockTimeout": 0,
   "batterySuspendTimeout": 0,
   "batterySuspendBehavior": 0,
   "batteryProfileName": "",
-  "batteryPostLockMonitorTimeout": 0,
   "batteryChargeLimit": 100,
-  "batteryNotifyChargeLimit": false,
-  "batteryCriticalThreshold": 10,
-  "batteryNotifyCritical": true,
-  "batteryLowThreshold": 20,
-  "batteryNotifyLow": false,
-  "batteryChargeLimitNotificationType": 0,
-  "batteryLowNotificationType": 0,
-  "batteryCriticalNotificationType": 1,
-  "batteryAutoPowerSaver": false,
   "lockBeforeSuspend": false,
   "loginctlLockIntegration": true,
   "fadeToLockEnabled": true,
@@ -390,10 +251,6 @@
   "qtThemingEnabled": false,
   "syncModeWithPortal": true,
   "terminalsAlwaysDark": false,
-  "muxType": "tmux",
-  "muxUseCustomCommand": false,
-  "muxCustomCommand": "",
-  "muxSessionFilter": "",
   "runDmsMatugenTemplates": true,
   "matugenTemplateGtk": true,
   "matugenTemplateNiri": true,
@@ -405,7 +262,6 @@
   "matugenTemplatePywalfox": true,
   "matugenTemplateZenBrowser": true,
   "matugenTemplateVesktop": true,
-  "matugenTemplateVencord": true,
   "matugenTemplateEquibop": true,
   "matugenTemplateGhostty": true,
   "matugenTemplateKitty": true,
@@ -417,24 +273,10 @@
   "matugenTemplateKcolorscheme": true,
   "matugenTemplateVscode": true,
   "matugenTemplateEmacs": true,
-  "matugenTemplateZed": true,
-  "matugenTemplateNeovimSettings": {
-    "dark": {
-      "baseTheme": "github_dark",
-      "harmony": 0.5
-    },
-    "light": {
-      "baseTheme": "github_light",
-      "harmony": 0.5
-    }
-  },
-  "matugenTemplateNeovimSetBackground": true,
   "showDock": false,
   "dockAutoHide": false,
   "dockSmartAutoHide": false,
-  "dockUseOverlayLayer": false,
   "dockGroupByApp": false,
-  "dockRestoreSpecialWorkspaceOnClick": false,
   "dockOpenOnOverview": false,
   "dockPosition": 1,
   "dockSpacing": 4,
@@ -457,9 +299,6 @@
   "dockMaxVisibleApps": 0,
   "dockMaxVisibleRunningApps": 0,
   "dockShowOverflowBadge": true,
-  "dockShowTrash": false,
-  "dockTrashFileManager": "default",
-  "dockTrashCustomCommand": "",
   "notificationOverlayEnabled": false,
   "notificationPopupShadowEnabled": true,
   "notificationPopupPrivacyMode": false,
@@ -475,23 +314,14 @@
   "lockAtStartup": false,
   "enableFprint": false,
   "maxFprintTries": 15,
-  "enableU2f": false,
+  "lockScreenActiveMonitor": "all",
-  "u2fMode": "or",
   "lockScreenInactiveColor": "#000000",
   "lockScreenNotificationMode": 0,
-  "lockScreenVideoEnabled": false,
-  "lockScreenVideoPath": "",
-  "lockScreenVideoCycling": false,
-  "lockScreenWallpaperPath": "",
-  "lockScreenWallpaperFillMode": "",
-  "lockScreenFontFamily": "",
   "hideBrightnessSlider": false,
   "notificationTimeoutLow": 5000,
   "notificationTimeoutNormal": 5000,
   "notificationTimeoutCritical": 0,
   "notificationCompactMode": false,
-  "notificationShowTimeoutBar": false,
-  "notificationDedupeEnabled": true,
   "notificationPopupPosition": 0,
   "notificationAnimationSpeed": 1,
   "notificationCustomAnimationDuration": 400,
@@ -502,7 +332,6 @@
   "notificationHistorySaveNormal": true,
   "notificationHistorySaveCritical": true,
   "notificationRules": [],
-  "notificationFocusedMonitor": false,
   "osdAlwaysShowValue": false,
   "osdPosition": 5,
   "osdVolumeEnabled": true,
@@ -533,13 +362,9 @@
   "customPowerActionReboot": "",
   "customPowerActionPowerOff": "",
   "updaterHideWidget": false,
-  "updaterCheckOnStart": false,
   "updaterUseCustomCommand": false,
   "updaterCustomCommand": "",
   "updaterTerminalAdditionalParams": "",
-  "updaterIntervalSeconds": 1800,
-  "updaterIncludeFlatpak": true,
-  "updaterAllowAUR": true,
   "displayNameMode": "system",
   "screenPreferences": {},
   "showOnLastDisplay": {},
@@ -550,7 +375,6 @@
   "displayProfileAutoSelect": false,
   "displayShowDisconnected": false,
   "displaySnapToEdge": true,
-  "connectedFrameBarStyleBackups": {},
   "barConfigs": [
     {
       "id": "default",
@@ -742,35 +566,8 @@
       "trigger": "?"
     }
   },
-  "clipboardClickToPaste": false,
   "clipboardEnterToPaste": false,
-  "clipboardRememberTypeFilter": false,
-  "clipboardTypeFilter": "all",
-  "clipboardVisibleEntryActions": [
-    "pin",
-    "edit",
-    "delete"
-  ],
   "launcherPluginVisibility": {},
   "launcherPluginOrder": [],
-  "frameEnabled": false,
+  "configVersion": 5
-  "frameThickness": 16,
-  "frameRounding": 23,
-  "frameColor": "",
-  "frameOpacity": 1,
-  "frameScreenPreferences": [
-    "all"
-  ],
-  "frameBarSize": 40,
-  "frameShowOnOverview": false,
-  "frameBlurEnabled": true,
-  "frameCloseGaps": true,
-  "frameLauncherEmergeSide": "bottom",
-  "frameLauncherArcExtender": false,
-  "frameLauncherEdgeHover": false,
-  "frameMode": "connected",
-  "barInsetPaddingShared": -1,
-  "barInsetPaddingSyncAll": false,
-  "frameBarInsetPadding": -1,
-  "configVersion": 12
 }

.config/alacritty/alacritty.toml

@@ -126,8 +126,3 @@ instance = "Alacritty"
 [window.padding]
 x = 6
 y = 6
-
-[[keyboard.bindings]]
-key = "Return"
-mods = "Shift"
-chars = "\u001B\r"

.config/bspwm/README.md

@@ -23,7 +23,7 @@ The default configuration file is `$XDG_CONFIG_HOME/bspwm/bspwmrc`: this is simp
 
 Keyboard and pointer bindings are defined with [sxhkd](https://github.com/baskerville/sxhkd).
 
-Example configuration files can be found in the [examples](examples) directory.
+Example configuration files can be found in the [examples](https://github.com/baskerville/bspwm/blob/master/examples) directory.
 
 ## Monitors, desktops and windows
 

.config/emacs/config.el

@@ -12,28 +12,7 @@
 (use-package all-the-icons-dired
   :hook (dired-mode . (lambda () (all-the-icons-dired-mode t))))
 
-(setq backup-directory-alist '((".*" . "~/.config/emacs/backups/")))
+(setq backup-directory-alist '((".*" . "~/.local/share/Trash/files")))
-
-(use-package claude-code
-  :ensure (claude-code :host github :repo "stevemolitor/claude-code.el")
-  :bind ("C-c c" . claude-code-transient)
-  :config
-  ;; Optional: Start the Emacs server if not already running
-  (unless (server-running-p) (server-start)))
-
-(setq claude-code-terminal-backend 'vterm)
-(setq claude-code-optimize-window-resize t)
-(setq claude-code-no-delete-other-windows t)
-(setq claude-code-toggle-auto-select t)
-
-(with-eval-after-load 'claude-code
-  (add-to-list 'display-buffer-alist
-               '((lambda (buffer-or-name _)
-                   (string-prefix-p "*claude:" (buffer-name (get-buffer buffer-or-name))))
-                 (display-buffer-reuse-window display-buffer-in-side-window)
-                 (side . right)
-                 (slot . 1) ;; Optional: keeps it separate from vterm if both are open
-                 (window-width . 0.4))))
 
 (use-package company
   :defer 2
@@ -216,7 +195,6 @@
   (define-key evil-motion-state-map (kbd "SPC") nil)
   (define-key evil-motion-state-map (kbd "RET") nil)
   (define-key evil-motion-state-map (kbd "TAB") nil))
-
 ;; Setting RETURN key in org-mode to follow links
   (setq org-return-follows-link  t)
 
@@ -316,13 +294,6 @@
     "b S" '(save-some-buffers :wk "Save multiple buffers")
     "b w" '(bookmark-save :wk "Save current bookmarks to bookmark file"))
 
-  (dt/leader-keys
-    "c" '(:ignore t :wk "Claude")
-    "c c" '(claude-code :wk "Start claude in a vterm")
-    "c k" '(claude-code-kill :wk "Kill claude process and its window")
-    "c K" '(claude-code-kill-all :wk "Kill all claude processes across all directories")
-    "c t" '(claude-code-transient :wk "Claude command menu"))
-
   (dt/leader-keys
     "d" '(:ignore t :wk "Dired")
     "d d" '(dired :wk "Open dired")
@@ -387,7 +358,7 @@
     "g r" '(vc-revert :wk "Git revert file")
     "g s" '(magit-stage-file :wk "Git stage file")
     "g t" '(git-timemachine :wk "Git time machine")
-    "g u" '(magit-unstage-file :wk "Git unstage file"))
+    "g u" '(magit-stage-file :wk "Git unstage file"))
 
  (dt/leader-keys
     "h" '(:ignore t :wk "Help")
@@ -509,7 +480,7 @@
 )
 
 (use-package git-timemachine
-  ;; :after git-timemachine
+  :after git-timemachine
   :hook (evil-normalize-keymaps . git-timemachine-hook)
   :config
     (evil-define-key 'normal git-timemachine-mode-map (kbd "C-j") 'git-timemachine-show-previous-revision)
@@ -543,9 +514,9 @@
    ("C-x B" . ivy-switch-buffer-other-window))
   :diminish
   :custom
-  (ivy-use-virtual-buffers t)
+  (setq ivy-use-virtual-buffers t)
-  (ivy-count-format "(%d/%d) ")
+  (setq ivy-count-format "(%d/%d) ")
-  (enable-recursive-minibuffers t)
+  (setq enable-recursive-minibuffers t)
   :config
   (ivy-mode))
 
@@ -558,9 +529,9 @@
   :ensure t
   :init (ivy-rich-mode 1) ;; this gets us descriptions in M-x.
   :custom
-  (ivy-virtual-abbreviate 'full)
+  (ivy-virtual-abbreviate 'full
-  (ivy-rich-switch-buffer-align-virtual-buffer t)
+   ivy-rich-switch-buffer-align-virtual-buffer t
-  (ivy-rich-path-style 'abbrev)
+   ivy-rich-path-style 'abbrev)
   :config
   (ivy-set-display-transformer 'ivy-switch-buffer
                                'ivy-rich-switch-buffer-transformer))
@@ -784,8 +755,6 @@
   (setq shell-file-name "/bin/sh"
         vterm-max-scrollback 5000))
 
-(add-hook 'vterm-mode-hook (lambda () (display-line-numbers-mode -1)))
-
 (use-package vterm-toggle
   :ensure t
   :after vterm
@@ -794,19 +763,20 @@
   ;; kills the program as it would in most standard terminal programs.
   (evil-define-key 'normal vterm-mode-map (kbd "<escape>") 'vterm--self-insert)
   (setq vterm-toggle-fullscreen-p nil)
-  (setq vterm-toggle-scope 'project))
+  (setq vterm-toggle-scope 'project)
-
-(with-eval-after-load 'vterm
   (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-in-side-window)
+                  (display-buffer-reuse-window display-buffer-at-bottom)
-                 (side . right)
+                  ;;(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-width . 0.4))))
+                  (window-height . 0.4))))
 
 (use-package sudo-edit)
 
@@ -843,6 +813,7 @@
 	  which-key-side-window-max-height 0.25
 	  which-key-idle-delay 0.8
 	  which-key-max-description-length 25
+	  which-key-allow-imprecise-window-fit nil
 	  which-key-separator " → " ))
 
 (defun reader ()
@@ -852,7 +823,7 @@
                    ("Third"  . 'third-choice))))
     (alist-get
      (completing-read "Choose: " choices)
-     choices nil nil #'equal)))
+     choices nil nil 'message)))
 
 (defun github-code-search ()
   "Search code on github for a given language."

.config/emacs/config.org

@@ -1,5 +1,7 @@
 #+TITLE: DT's GNU Emacs Config
-#+AUTHORng
+#+AUTHOR: Derek Taylor (DT)
+#+DESCRIPTION: DT's personal Emacs config.
+#+STARTUP: showeverything
 #+OPTIONS: toc:2
 
 * TABLE OF CONTENTS :toc:
@@ -8,7 +10,6 @@
   - [[#sourcing-the-scripts][Sourcing the scripts]]
 - [[#all-the-icons][ALL THE ICONS]]
 - [[#backup][BACKUP]]
-- [[#claude-code][CLAUDE-CODE]]
 - [[#company][COMPANY]]
 - [[#dashboard][DASHBOARD]]
 - [[#diminish][DIMINISH]]
@@ -93,34 +94,7 @@ This is an icon set that can be used with dashboard, dired, ibuffer and other Em
 By default, Emacs creates automatic backups of files in their original directories, such "file.el" and the backup "file.el~".  This leads to a lot of clutter, so let's tell Emacs to put all backups that it creates in the =TRASH= directory.
 
 #+begin_src emacs-lisp
-(setq backup-directory-alist '((".*" . "~/.config/emacs/backups/")))
+(setq backup-directory-alist '((".*" . "~/.local/share/Trash/files")))
-
-#+end_src
-
-* CLAUDE-CODE
-[[https://github.com/stevemolitor/claude-code.el][Claude-code.el]] is an Emacs interface for Claude Code CLI, providing integration between Emacs and Claude AI for coding assistance.
-
-#+begin_src emacs-lisp
-(use-package claude-code
-  :ensure (claude-code :host github :repo "stevemolitor/claude-code.el")
-  :bind ("C-c c" . claude-code-transient)
-  :config
-  ;; Optional: Start the Emacs server if not already running
-  (unless (server-running-p) (server-start)))
-
-(setq claude-code-terminal-backend 'vterm)
-(setq claude-code-optimize-window-resize t)
-(setq claude-code-no-delete-other-windows t)
-(setq claude-code-toggle-auto-select t)
-
-(with-eval-after-load 'claude-code
-  (add-to-list 'display-buffer-alist
-               '((lambda (buffer-or-name _)
-                   (string-prefix-p "*claude:" (buffer-name (get-buffer buffer-or-name))))
-                 (display-buffer-reuse-window display-buffer-in-side-window)
-                 (side . right)
-                 (slot . 1) ;; Optional: keeps it separate from vterm if both are open
-                 (window-width . 0.4))))
 
 #+end_src
 
@@ -143,7 +117,6 @@ By default, Emacs creates automatic backups of files in their original directori
   :after company
   :diminish
   :hook (company-mode . company-box-mode))
-
 #+end_src
 
 * DASHBOARD
@@ -360,7 +333,6 @@ An RSS newsfeed reader for Emacs.  Move through the articles with 'j/k'.  Move t
   (define-key evil-motion-state-map (kbd "SPC") nil)
   (define-key evil-motion-state-map (kbd "RET") nil)
   (define-key evil-motion-state-map (kbd "TAB") nil))
-
 ;; Setting RETURN key in org-mode to follow links
   (setq org-return-follows-link  t)
 
@@ -486,13 +458,6 @@ mouse wheel for zooming in/out.
     "b S" '(save-some-buffers :wk "Save multiple buffers")
     "b w" '(bookmark-save :wk "Save current bookmarks to bookmark file"))
 
-  (dt/leader-keys
-    "c" '(:ignore t :wk "Claude")
-    "c c" '(claude-code :wk "Start claude in a vterm")
-    "c k" '(claude-code-kill :wk "Kill claude process and its window")
-    "c K" '(claude-code-kill-all :wk "Kill all claude processes across all directories")
-    "c t" '(claude-code-transient :wk "Claude command menu"))
-
   (dt/leader-keys
     "d" '(:ignore t :wk "Dired")
     "d d" '(dired :wk "Open dired")
@@ -557,7 +522,7 @@ mouse wheel for zooming in/out.
     "g r" '(vc-revert :wk "Git revert file")
     "g s" '(magit-stage-file :wk "Git stage file")
     "g t" '(git-timemachine :wk "Git time machine")
-    "g u" '(magit-unstage-file :wk "Git unstage file"))
+    "g u" '(magit-stage-file :wk "Git unstage file"))
 
  (dt/leader-keys
     "h" '(:ignore t :wk "Help")
@@ -687,7 +652,7 @@ mouse wheel for zooming in/out.
 
 #+begin_src emacs-lisp
 (use-package git-timemachine
-  ;; :after git-timemachine
+  :after git-timemachine
   :hook (evil-normalize-keymaps . git-timemachine-hook)
   :config
     (evil-define-key 'normal git-timemachine-mode-map (kbd "C-j") 'git-timemachine-show-previous-revision)
@@ -734,9 +699,9 @@ Adding highlights to TODO and related words.
    ("C-x B" . ivy-switch-buffer-other-window))
   :diminish
   :custom
-  (ivy-use-virtual-buffers t)
+  (setq ivy-use-virtual-buffers t)
-  (ivy-count-format "(%d/%d) ")
+  (setq ivy-count-format "(%d/%d) ")
-  (enable-recursive-minibuffers t)
+  (setq enable-recursive-minibuffers t)
   :config
   (ivy-mode))
 
@@ -749,9 +714,9 @@ Adding highlights to TODO and related words.
   :ensure t
   :init (ivy-rich-mode 1) ;; this gets us descriptions in M-x.
   :custom
-  (ivy-virtual-abbreviate 'full)
+  (ivy-virtual-abbreviate 'full
-  (ivy-rich-switch-buffer-align-virtual-buffer t)
+   ivy-rich-switch-buffer-align-virtual-buffer t
-  (ivy-rich-path-style 'abbrev)
+   ivy-rich-path-style 'abbrev)
   :config
   (ivy-set-display-transformer 'ivy-switch-buffer
                                'ivy-rich-switch-buffer-transformer))
@@ -801,7 +766,7 @@ Neotree is a file tree viewer.  When you open neotree, it jumps to the current f
 | neotree-toggle | /Toggle neotree/            | SPC t n    |
 | neotree- dir   | /Open directory in neotree/ | SPC d n    |
 
-#+begin_src emacs-lisp
+#+BEGIN_SRC emacs-lisp
 (use-package neotree
   :config
   (setq neo-smart-open t
@@ -1110,9 +1075,6 @@ Vterm is a terminal emulator within Emacs.  The 'shell-file-name' setting sets t
   :config
   (setq shell-file-name "/bin/sh"
         vterm-max-scrollback 5000))
-
-(add-hook 'vterm-mode-hook (lambda () (display-line-numbers-mode -1)))
-
 #+end_src
 
 ** Vterm-Toggle 
@@ -1127,19 +1089,20 @@ Vterm is a terminal emulator within Emacs.  The 'shell-file-name' setting sets t
   ;; kills the program as it would in most standard terminal programs.
   (evil-define-key 'normal vterm-mode-map (kbd "<escape>") 'vterm--self-insert)
   (setq vterm-toggle-fullscreen-p nil)
-  (setq vterm-toggle-scope 'project))
+  (setq vterm-toggle-scope 'project)
-
-(with-eval-after-load 'vterm
   (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-in-side-window)
+                  (display-buffer-reuse-window display-buffer-at-bottom)
-                 (side . right)
+                  ;;(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-width . 0.4))))
+                  (window-height . 0.4))))
 
 #+end_src
 
@@ -1201,6 +1164,7 @@ With Emacs version 29, true transparency has been added.  I have turned transpar
 	  which-key-side-window-max-height 0.25
 	  which-key-idle-delay 0.8
 	  which-key-max-description-length 25
+	  which-key-allow-imprecise-window-fit nil
 	  which-key-separator " → " ))
 #+end_src
 
@@ -1213,7 +1177,7 @@ With Emacs version 29, true transparency has been added.  I have turned transpar
                    ("Third"  . 'third-choice))))
     (alist-get
      (completing-read "Choose: " choices)
-     choices nil nil #'equal)))
+     choices nil nil 'message)))
 
 (defun github-code-search ()
   "Search code on github for a given language."

.config/fish/config.fish

@@ -174,9 +174,6 @@ 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"
@@ -240,10 +237,6 @@ alias rr='curl -s -L https://raw.githubusercontent.com/keroserene/rickrollrc/mas
 # Mocp must be launched with bash instead of Fish!
 alias mocp="bash -c mocp"
 
-# Aliasealias s used to upload a static alias alias alias website
-alias dashdb="rsync -avz --exclude 'venv' --exclude '__pycache__' --exclude '*.pyc' /home/dt/nc/trading/dashboard/ root@157.230.6.42:/var/www/dtoptions/"
-alias dashpdf="rsync -avz /home/dt/nc/trading/trading-plans/ root@157.230.6.42:/root/nc/trading/trading-plans/"
-
 ### RANDOM COLOR SCRIPT ###
 # Get this script from my GitLab: gitlab.com/dwt1/shell-color-scripts
 # Or install it from the Arch User Repository: shell-color-scripts

.config/niri/config.kdl

@@ -382,10 +382,6 @@ binds {
     Mod+Alt+apostrophe { screenshot-window; }
     Mod+Shift+apostrophe { screenshot; }
 
-    // Force the focused window to exactly 1854 x 882 pixels
-    Mod+semicolon { spawn-sh "niri msg action set-column-width 1794 && niri msg action set-window-height 830 && niri msg action center-window"; }
-    Mod+Shift+semicolon { spawn-sh "niri msg action toggle-window-floating && niri msg action toggle-window-floating && niri msg action maximize-column"; }
-
     // Applications such as remote-desktop clients and software KVM switches may
     // request that niri stops processing the keyboard shortcuts defined here
     // so they may, for example, forward the key presses as-is to a remote machine.

.config/niri/dms/cursor.kdl

@@ -0,0 +1,9 @@
+// ! DO NOT EDIT !
+// ! AUTO-GENERATED BY DMS !
+// ! CHANGES WILL BE OVERWRITTEN !
+// ! PLACE YOUR CUSTOM CONFIGURATION ELSEWHERE !
+
+cursor {
+    xcursor-theme "Bibata-Modern-Ice"
+    xcursor-size 24
+}

.config/niri/dms/layout.kdl

@@ -14,7 +14,6 @@ layout {
         width 2
         }
         }
-
         window-rule {
         geometry-corner-radius 6
         clip-to-geometry true

.zshrc

@@ -232,10 +232,6 @@ alias regfont="setfont default8x16"
 # bare git repo alias for managing my dotfiles
 alias config="/usr/bin/git --git-dir=$HOME/dotfiles --work-tree=$HOME"
 
-# Aliasealias s used to upload a static website
-alias dashdb="rsync -avz --exclude 'venv' --exclude '__pycache__' --exclude '*.pyc' /home/dt/nc/trading/dashboard/ root@157.230.6.42:/var/www/dtoptions/"
-alias dashpdf="rsync -avz /home/dt/nc/trading/trading-plans/ root@157.230.6.42:/root/nc/trading/trading-plans/"
-
 # termbin
 alias tb="nc termbin.com 9999"