Merge pull request 'feat: Use two line fish prompt' (#21) from ui/fish into main

Reviewed-on: #21

README.org

@@ -28,6 +28,12 @@ Install and set the default shell to ~fish~.
 
 ** Utilities
 
+- ~kando~: Pie menu
+
+  Note the complicated key binding in the ~kando~ menu configuration. This is
+  used for MacOS and desktop environments where some keys cannot bind to a
+  command (e.g. Wacom tablets)
+
 - ~alacritty~: terminal emulator
 
   Note that in order to set this as the default terminal, you may need to put

doom/config.org

@@ -257,8 +257,13 @@ numbers are disabled. For relative line numbers, set this to ~relative~.
 	(setq whitespace-line-column nil)
 	(display-line-numbers-mode)
 )
-
 (add-hook 'text-mode-hook #'custom/common-richtext-hook)
+(setq
+	typescript-indent-level 3
+	css-indent-offset 3
+	sh-indentation 3
+	nxml-indent-offset 3
+)
 #+end_src
 
 ** Shells
@@ -643,47 +648,6 @@ Add the necessary hooks for LilyPond mode.
 	(setq rustic-indent-offset standard-indent))
 #+end_src
 
-*** SCAD
-
-#+begin_src emacs-lisp :tangle packages.el
-(package! scad-mode)
-#+end_src
-
-#+begin_src emacs-lisp
-(use-package! scad-mode
-	:after-call scad-mode
-	:config
-		(add-hook 'scad-mode-hook  #'custom/common-program-hook))
-(map! :after scad-mode
-	:localleader
-	:map scad-mode-map
-	:desc "Open"               "o" #'scad-open
-	:desc "Export"             "e" #'scad-export
-	:desc "Preview"            "p" #'scad-preview
-	)
-(map! :after scad-mode
-	:mode scad-preview-mode
-	:map scad-preview-mode-map
-	:desc "Size+"              "+" #'scad-preview-size+
-	:desc "Size-"              "-" #'scad-preview-size-
-	:desc "Distance+"          "[" #'scad-preview-distance+
-	:desc "Distance-"          "]" #'scad-preview-distance-
-	:desc "Toggle Projection"  "p" #'scad-preview-projection
-	:desc "Translate x-"       "h" #'scad-preview-translate-x-
-	:desc "Translate x+"       "l" #'scad-preview-translate-x+
-	:desc "Translate y-"       "j" #'scad-preview-translate-y-
-	:desc "Translate y+"       "k" #'scad-preview-translate-y+
-	:desc "Translate z-"       "n" #'scad-preview-translate-z-
-	:desc "Translate z+"       "m" #'scad-preview-translate-z+
-	:desc "Rotate x-"          "H" #'scad-preview-rotate-x-
-	:desc "Rotate x+"          "L" #'scad-preview-rotate-x+
-	:desc "Rotate y-"          "J" #'scad-preview-rotate-y-
-	:desc "Rotate y+"          "K" #'scad-preview-rotate-y+
-	:desc "Rotate z-"          "N" #'scad-preview-rotate-z-
-	:desc "Rotate z+"          "M" #'scad-preview-rotate-z+
-	)
-#+end_src
-
 ** Tools
 
 *** Language Server Protocol (LSP)
@@ -692,7 +656,7 @@ File path is removed from breadcrumb since it is provided by ~doom-modeline~ and
 since it clutters the header-line.
 
 #+begin_src emacs-lisp
-(setq-hook! lsp-mode
+(setq-hook! 'lsp-mode-hook
 	lsp-headerline-breadcrumb-enable t
 	lsp-headerline-breadcrumb-enable-symbol-numbers nil
 	lsp-headerline-breadcrumb-segments '(symbols)

doom/init.el

@@ -63,7 +63,7 @@
        ;;objed             ; text object editing for the innocent
        ;;parinfer          ; turn lisp into python, sort of
        ;;rotate-text       ; cycle region at point between text candidates
-       snippets          ; my elves. They type so I don't have to
+       ;;snippets          ; my elves. They type so I don't have to
        ;;word-wrap         ; soft wrapping with language-aware indent
 
        :emacs
@@ -95,8 +95,8 @@
        (eval +overlay)   ; run code, run (also, repls)
        ;;gist            ; interacting with github gists
        lookup            ; navigate your code and its documentation
-       (lsp +peek)       ; M-x vscode
-       magit             ; a git porcelain for Emacs
+       (lsp +peek +eglot)       ; M-x vscode
+       (magit +forge)             ; a git porcelain for Emacs
        make              ; run make tasks from Emacs
        pass            ; password manager for nerds
        pdf               ; pdf enhancements
@@ -161,7 +161,7 @@
        ;;qt                ; the 'cutest' gui framework ever
        ;;racket            ; a DSL for DSLs
        ;;raku              ; the artist formerly known as perl6
-       ;;rest              ; Emacs as a REST client
+       rest              ; Emacs as a REST client
        ;;rst               ; ReST in peace
        ;;(ruby +rails)     ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"}
        (rust +lsp +tree-sitter)       ; Fe2O3.unwrap().unwrap().unwrap().unwrap()

fish/functions/fish_prompt.fish

@@ -40,39 +40,54 @@ end
 
 function fish_prompt
 #	set_color white
-#	echo -n '['
+#	printf '['
 
 	set -l FishStatusCodeCache $status
 
-	set_color -o 00FF00
-	echo -n (whoami)
+	set_color -o 00FF00 -b 333333
+	printf (whoami)
 
 	set_color normal
-	echo -n '@'
+	set_color -b 333333
+	printf '@'
 
 	set_color AFD75F
-	echo -n (prompt_hostname)
+	printf (prompt_hostname)
 
 	set_color white
-	echo -n ':'
+	printf ':'
 
 	set_color 8787FF
-	echo -n (prompt_abbr $PWD)
+	printf (prompt_abbr $PWD)
 
-	set_color 5F87D7
-	echo -n (__fish_vcs_prompt)
+	set -l vcs_prompt (fish_vcs_prompt)
+	if test -n "$vcs_prompt"
+		printf " "
+		set_color 5F87D7
+		printf '\uf126'
+		printf (fish_vcs_prompt)
+	end
 
 	if test $FishStatusCodeCache -eq 0
 		#set_color 18C412
 	else
 		set_color E84505
-		echo -n " [$FishStatusCodeCache]"
+		printf " [$FishStatusCodeCache]"
 	end
 
 #	set_color white
-#	echo -n "]"
+#	printf "]"
 
-	set_color -o white
-	echo -n "> "
+	set_color 999999
+	printf " "
+	printf (date '+%Y/%m/%d %H:%M:%S')
+	printf "\n"
+
+	#set_color -o white
+	#printf "> "
+
+	set_color normal
+	set_color -o green
+	printf "⮀ "
 	set_color normal
 end

fish/functions/fish_right_prompt.fish

@@ -1,8 +0,0 @@
-#!/bin/fish
-
-function fish_right_prompt
-	set_color grey
-	printf (date '+%H:%M:%S')
-	set_color normal
-end
-

hypr/hyprland.conf

@@ -10,7 +10,7 @@ monitor=,preferred,auto,auto
 
 # See https://wiki.hyprland.org/Configuring/Keywords/ for more
 
-exec-once = hyprpaper & swaync & fcitx5 & flameshot & eww --config ~/.config/eww/bar open vbar
+exec-once = hyprpaper & swaync & fcitx5 & flameshot & eww --config ~/.config/eww/bar open vbar & kando
 
 # Source a file (multi-file configs)
 # source = ~/.config/hypr/myColors.conf
@@ -142,6 +142,9 @@ bind = $mainMod SHIFT, left,  movewindow, l
 bind = $mainMod SHIFT, right, movewindow, r
 bind = $mainMod SHIFT, up,    movewindow, u
 bind = $mainMod SHIFT, down,  movewindow, d
+bind = , SUPER_R, global, kando:main
+# F13
+bind = , code:191, global, kando:edit
 
 # Workspaces
 $w1 = ~/.config/hypr/wallpaper.sh 1
@@ -197,3 +200,9 @@ bindm = $mainMod, mouse:273, resizewindow
 
 bind = SUPER,Tab,cyclenext,          # change focus to another window
 bind = SUPER,Tab,bringactivetotop,   # bring it to the top
+
+# Functional keys
+bindl=, XF86AudioMute, exec, amixer set Master toggle
+bindl=, XF86AudioPlay, exec, playerctl play-pause
+bindl=, XF86AudioNext, exec, playerctl next
+bindl=, XF86AudioPrev, exec, playerctl previous

kando/.gitignore

@@ -0,0 +1,2 @@
+/Singleton*
+/session

kando/config.json

@@ -0,0 +1,15 @@
+{
+  "menuTheme": "neon-lights",
+  "darkMenuTheme": "default",
+  "menuThemeColors": {
+    "neon-lights": {
+      "glow-color": "rgba(168, 255, 196, 1)",
+      "connector-color": "rgba(173, 222, 255, 0.75)"
+    }
+  },
+  "darkMenuThemeColors": {},
+  "enableDarkModeForMenuThemes": false,
+  "sidebarVisible": false,
+  "enableVersionCheck": true,
+  "zoomFactor": 1
+}

kando/menus.json

@@ -0,0 +1,429 @@
+{
+  "menus": [
+    {
+      "shortcut": "Control+Alt+Shift+U",
+      "shortcutID": "main",
+      "centered": false,
+      "root": {
+        "type": "submenu",
+        "name": "Main",
+        "icon": "award_star",
+        "iconTheme": "material-symbols-rounded",
+        "children": [
+          {
+            "type": "submenu",
+            "name": "Apps",
+            "icon": "apps",
+            "iconTheme": "material-symbols-rounded",
+            "children": [
+              {
+                "type": "command",
+                "data": {
+                  "command": "x-www-browser"
+                },
+                "name": "Web Browser",
+                "icon": "globe",
+                "iconTheme": "material-symbols-rounded"
+              },
+              {
+                "type": "command",
+                "data": {
+                  "command": "xdg-email"
+                },
+                "name": "E-Mail",
+                "icon": "mail",
+                "iconTheme": "material-symbols-rounded"
+              },
+              {
+                "type": "command",
+                "data": {
+                  "command": "gimp"
+                },
+                "name": "GIMP",
+                "icon": "gimp",
+                "iconTheme": "simple-icons"
+              },
+              {
+                "type": "command",
+                "data": {
+                  "command": "xdg-open ~"
+                },
+                "name": "File Browser",
+                "icon": "folder_shared",
+                "iconTheme": "material-symbols-rounded"
+              },
+              {
+                "type": "command",
+                "data": {
+                  "command": "x-terminal-emulator"
+                },
+                "name": "Terminal",
+                "icon": "terminal",
+                "iconTheme": "material-symbols-rounded"
+              }
+            ]
+          },
+          {
+            "type": "submenu",
+            "name": "Web Links",
+            "icon": "public",
+            "iconTheme": "material-symbols-rounded",
+            "children": [
+              {
+                "type": "uri",
+                "data": {
+                  "uri": "https://www.google.com"
+                },
+                "name": "Google",
+                "icon": "google",
+                "iconTheme": "simple-icons"
+              },
+              {
+                "type": "uri",
+                "data": {
+                  "uri": "https://github.com/kando-menu/kando"
+                },
+                "name": "Kando on GitHub",
+                "icon": "github",
+                "iconTheme": "simple-icons"
+              },
+              {
+                "type": "uri",
+                "data": {
+                  "uri": "https://ko-fi.com/schneegans"
+                },
+                "name": "Kando on Ko-fi",
+                "icon": "kofi",
+                "iconTheme": "simple-icons"
+              },
+              {
+                "type": "uri",
+                "data": {
+                  "uri": "https://www.youtube.com/@simonschneegans"
+                },
+                "name": "Kando on YouTube",
+                "icon": "youtube",
+                "iconTheme": "simple-icons"
+              },
+              {
+                "type": "uri",
+                "data": {
+                  "uri": "https://discord.gg/hZwbVSDkhy"
+                },
+                "name": "Kando on Discord",
+                "icon": "discord",
+                "iconTheme": "simple-icons"
+              }
+            ]
+          },
+          {
+            "type": "hotkey",
+            "data": {
+              "hotkey": "ControlLeft+AltLeft+ArrowRight",
+              "delayed": false
+            },
+            "name": "Next Workspace",
+            "icon": "arrow_forward",
+            "iconTheme": "material-symbols-rounded"
+          },
+          {
+            "type": "submenu",
+            "name": "Clipboard",
+            "icon": "assignment",
+            "iconTheme": "material-symbols-rounded",
+            "children": [
+              {
+                "type": "hotkey",
+                "data": {
+                  "hotkey": "ControlLeft+KeyV",
+                  "delayed": true
+                },
+                "name": "Paste",
+                "icon": "content_paste_go",
+                "iconTheme": "material-symbols-rounded",
+                "angle": 90
+              },
+              {
+                "type": "hotkey",
+                "data": {
+                  "hotkey": "ControlLeft+KeyC",
+                  "delayed": true
+                },
+                "name": "Copy",
+                "icon": "content_copy",
+                "iconTheme": "material-symbols-rounded"
+              },
+              {
+                "type": "hotkey",
+                "data": {
+                  "hotkey": "ControlLeft+KeyX",
+                  "delayed": true
+                },
+                "name": "Cut",
+                "icon": "cut",
+                "iconTheme": "material-symbols-rounded"
+              }
+            ]
+          },
+          {
+            "type": "submenu",
+            "name": "Audio",
+            "icon": "play_circle",
+            "iconTheme": "material-symbols-rounded",
+            "children": [
+              {
+                "type": "hotkey",
+                "data": {
+                  "hotkey": "MediaTrackNext",
+                  "delayed": false
+                },
+                "name": "Next Track",
+                "icon": "skip_next",
+                "iconTheme": "material-symbols-rounded",
+                "angle": 90
+              },
+              {
+                "type": "hotkey",
+                "data": {
+                  "hotkey": "MediaPlayPause",
+                  "delayed": false
+                },
+                "name": "Play / Pause",
+                "icon": "play_pause",
+                "iconTheme": "material-symbols-rounded"
+              },
+              {
+                "type": "hotkey",
+                "data": {
+                  "hotkey": "AudioVolumeMute",
+                  "delayed": false
+                },
+                "name": "Mute",
+                "icon": "music_off",
+                "iconTheme": "material-symbols-rounded"
+              },
+              {
+                "type": "hotkey",
+                "data": {
+                  "hotkey": "MediaTrackPrevious",
+                  "delayed": false
+                },
+                "name": "Previous Track",
+                "icon": "skip_previous",
+                "iconTheme": "material-symbols-rounded",
+                "angle": 270
+              }
+            ]
+          },
+          {
+            "type": "submenu",
+            "name": "Windows",
+            "icon": "select_window",
+            "iconTheme": "material-symbols-rounded",
+            "children": [
+              {
+                "type": "hotkey",
+                "data": {
+                  "hotkey": "MetaLeft+ArrowUp",
+                  "delayed": true
+                },
+                "name": "Toggle Maximize",
+                "icon": "open_in_full",
+                "iconTheme": "material-symbols-rounded",
+                "angle": 0
+              },
+              {
+                "type": "hotkey",
+                "data": {
+                  "hotkey": "MetaLeft+ArrowRight",
+                  "delayed": true
+                },
+                "name": "Tile Right",
+                "icon": "text_select_jump_to_end",
+                "iconTheme": "material-symbols-rounded",
+                "angle": 90
+              },
+              {
+                "type": "hotkey",
+                "data": {
+                  "hotkey": "AltLeft+F4",
+                  "delayed": true
+                },
+                "name": "Close Window",
+                "icon": "cancel_presentation",
+                "iconTheme": "material-symbols-rounded"
+              },
+              {
+                "type": "hotkey",
+                "data": {
+                  "hotkey": "MetaLeft+ArrowLeft",
+                  "delayed": true
+                },
+                "name": "Tile Left",
+                "icon": "text_select_jump_to_beginning",
+                "iconTheme": "material-symbols-rounded",
+                "angle": 270
+              }
+            ]
+          },
+          {
+            "type": "hotkey",
+            "data": {
+              "hotkey": "ControlLeft+AltLeft+ArrowLeft",
+              "delayed": false
+            },
+            "name": "Previous Workspace",
+            "icon": "arrow_back",
+            "iconTheme": "material-symbols-rounded"
+          },
+          {
+            "type": "submenu",
+            "name": "Bookmarks",
+            "icon": "folder_special",
+            "iconTheme": "material-symbols-rounded",
+            "children": [
+              {
+                "type": "command",
+                "data": {
+                  "command": "xdg-open \"$(xdg-user-dir DOWNLOAD)\""
+                },
+                "name": "Downloads",
+                "icon": "download",
+                "iconTheme": "material-symbols-rounded"
+              },
+              {
+                "type": "command",
+                "data": {
+                  "command": "xdg-open \"$(xdg-user-dir VIDEOS)\""
+                },
+                "name": "Videos",
+                "icon": "video_camera_front",
+                "iconTheme": "material-symbols-rounded"
+              },
+              {
+                "type": "command",
+                "data": {
+                  "command": "xdg-open \"$(xdg-user-dir PICTURES)\""
+                },
+                "name": "Pictures",
+                "icon": "imagesmode",
+                "iconTheme": "material-symbols-rounded"
+              },
+              {
+                "type": "command",
+                "data": {
+                  "command": "xdg-open \"$(xdg-user-dir DOCUMENTS)\""
+                },
+                "name": "Documents",
+                "icon": "text_ad",
+                "iconTheme": "material-symbols-rounded"
+              },
+              {
+                "type": "command",
+                "data": {
+                  "command": "xdg-open \"$(xdg-user-dir DESKTOP)\""
+                },
+                "name": "Desktop",
+                "icon": "desktop_windows",
+                "iconTheme": "material-symbols-rounded"
+              },
+              {
+                "type": "command",
+                "data": {
+                  "command": "xdg-open ~"
+                },
+                "name": "Home",
+                "icon": "home",
+                "iconTheme": "material-symbols-rounded"
+              },
+              {
+                "type": "command",
+                "data": {
+                  "command": "xdg-open \"$(xdg-user-dir MUSIC)\""
+                },
+                "name": "Music",
+                "icon": "music_note",
+                "iconTheme": "material-symbols-rounded"
+              }
+            ]
+          }
+        ]
+      }
+    },
+    {
+      "root": {
+        "type": "submenu",
+        "name": "Edit",
+        "icon": "trip_origin",
+        "iconTheme": "material-symbols-rounded",
+        "children": [
+          {
+            "type": "hotkey",
+            "data": {
+              "hotkey": "ControlLeft+KeyZ",
+              "delayed": true
+            },
+            "name": "Undo",
+            "icon": "undo",
+            "iconTheme": "material-symbols-rounded"
+          },
+          {
+            "type": "hotkey",
+            "data": {
+              "hotkey": "ControlLeft+ShiftLeft+KeyZ",
+              "delayed": true
+            },
+            "name": "Redo",
+            "icon": "redo",
+            "iconTheme": "material-symbols-rounded"
+          },
+          {
+            "type": "hotkey",
+            "data": {
+              "hotkey": "ControlLeft+KeyR",
+              "delayed": true
+            },
+            "name": "Remesh",
+            "icon": "background_grid_small",
+            "iconTheme": "material-symbols-rounded"
+          },
+          {
+            "type": "hotkey",
+            "data": {
+              "hotkey": "F3",
+              "delayed": true
+            },
+            "name": "Search",
+            "icon": "search",
+            "iconTheme": "material-symbols-rounded"
+          },
+          {
+            "type": "hotkey",
+            "data": {
+              "hotkey": "ShiftLeft+Space",
+              "delayed": true
+            },
+            "name": "Brush",
+            "icon": "brush",
+            "iconTheme": "material-symbols-rounded"
+          },
+          {
+            "type": "hotkey",
+            "data": {
+              "hotkey": "",
+              "delayed": true
+            },
+            "name": "Save",
+            "icon": "save",
+            "iconTheme": "material-symbols-rounded"
+          }
+        ]
+      },
+      "shortcut": "Control+Alt+Shift+Y",
+      "shortcutID": "edit",
+      "centered": false,
+      "anchored": false
+    }
+  ],
+  "templates": []
+}