Merge branch 'fish-config' into 'master'

Fix fish_user_paths

Closes #123

See merge request dwt1/dotfiles!86

.config/DankMaterialShell/settings.json

@@ -161,17 +161,6 @@
   "centeringMode": "index",
   "clockDateFormat": "",
   "lockDateFormat": "",
-  "greeterRememberLastSession": true,
-  "greeterRememberLastUser": true,
-  "greeterEnableFprint": false,
-  "greeterEnableU2f": false,
-  "greeterWallpaperPath": "",
-  "greeterUse24HourClock": true,
-  "greeterShowSeconds": false,
-  "greeterPadHours12Hour": false,
-  "greeterLockDateFormat": "",
-  "greeterFontFamily": "",
-  "greeterWallpaperFillMode": "",
   "mediaSize": 1,
   "appLauncherViewMode": "grid",
   "spotlightModalViewMode": "grid",
@@ -284,7 +273,6 @@
   "matugenTemplateKcolorscheme": true,
   "matugenTemplateVscode": true,
   "matugenTemplateEmacs": true,
-  "matugenTemplateZed": true,
   "showDock": false,
   "dockAutoHide": false,
   "dockSmartAutoHide": false,
@@ -326,8 +314,6 @@
   "lockAtStartup": false,
   "enableFprint": false,
   "maxFprintTries": 15,
-  "enableU2f": false,
-  "u2fMode": "or",
   "lockScreenActiveMonitor": "all",
   "lockScreenInactiveColor": "#000000",
   "lockScreenNotificationMode": 0,
@@ -424,8 +410,7 @@
       "centerWidgets": [
         {
           "id": "music",
-          "enabled": true,
+          "enabled": true
-          "mediaSize": 0
         },
         {
           "id": "clock",

.config/emacs/config.el

@@ -14,27 +14,6 @@
 
 (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
   :diminish
@@ -315,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")
@@ -644,14 +616,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)
 
@@ -783,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
@@ -793,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)))
+                     (let ((buffer (get-buffer buffer-or-name)))
-                     (with-current-buffer buffer
+                       (with-current-buffer buffer
-                       (or (equal major-mode 'vterm-mode)
+                         (or (equal major-mode 'vterm-mode)
-                           (string-prefix-p vterm-buffer-name (buffer-name buffer))))))
+                             (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)
-                 (reusable-frames . visible)
+                  ;;display-buffer-in-direction/direction/dedicated is added in emacs27
-                 (window-width . 0.4))))
+                  ;;(direction . bottom)
+                  ;;(dedicated . t) ;dedicated is supported in emacs27
+                  (reusable-frames . visible)
+                  (window-height . 0.4))))
 
 (use-package sudo-edit)
 

.config/emacs/config.org

@@ -10,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]]
@@ -99,33 +98,6 @@ By default, Emacs creates automatic backups of files in their original directori
 
 #+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
-
 * COMPANY
 [[https://company-mode.github.io/][Company]] is a text completion framework for Emacs. The name stands for "complete anything".  Completion will start automatically after you type a few letters. Use M-n and M-p to select, <return> to complete or <tab> to complete the common part.
 
@@ -145,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
@@ -487,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")
@@ -1111,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 
@@ -1128,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)))
+                     (let ((buffer (get-buffer buffer-or-name)))
-                     (with-current-buffer buffer
+                       (with-current-buffer buffer
-                       (or (equal major-mode 'vterm-mode)
+                         (or (equal major-mode 'vterm-mode)
-                           (string-prefix-p vterm-buffer-name (buffer-name buffer))))))
+                             (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)
-                 (reusable-frames . visible)
+                  ;;display-buffer-in-direction/direction/dedicated is added in emacs27
-                 (window-width . 0.4))))
+                  ;;(direction . bottom)
+                  ;;(dedicated . t) ;dedicated is supported in emacs27
+                  (reusable-frames . visible)
+                  (window-height . 0.4))))
 
 #+end_src
 

.config/fish/config.fish

@@ -10,7 +10,7 @@
 # First line removes the path; second line sets it.  Without the first line,
 # your path gets massive and fish becomes very slow.
 set -e fish_user_paths
-set -U fish_user_paths $HOME/.bin  $HOME/.local/bin $HOME/.config/emacs/bin $HOME/Applications /var/lib/flatpak/exports/bin/ $fish_user_paths
+set -U fish_user_paths $HOME/.bin  $HOME/.local/bin $HOME/.config/emacs/bin $HOME/Applications /var/lib/flatpak/exports/bin/
 
 ### EXPORT ###
 set fish_greeting                                 # Supresses fish's intro message

.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
+}