diff --git a/core/home/config/nomarchy-skill/SKILL.md b/core/home/config/nomarchy-skill/SKILL.md index fa5dab1..ca37f1c 100644 --- a/core/home/config/nomarchy-skill/SKILL.md +++ b/core/home/config/nomarchy-skill/SKILL.md @@ -334,16 +334,6 @@ nomarchy-tui-remove-all # Bulk-remove every TUI launcher Both families write `.desktop` files into `~/.local/share/applications/` so they appear in the app launcher (walker / rofi). -### Voice dictation (Voxtype) - -```bash -nomarchy-voxtype-install # Install Voxtype + AI model (~150MB) -nomarchy-voxtype-remove # Uninstall Voxtype -nomarchy-voxtype-status # Running state (also shown in waybar) -``` - -Toggle dictation with `SUPER+CTRL+X` after install. - ### Virtualization ```bash diff --git a/core/home/config/nomarchy/default/hypr/bindings/utilities.conf b/core/home/config/nomarchy/default/hypr/bindings/utilities.conf index 5ba3d34..445c370 100644 --- a/core/home/config/nomarchy/default/hypr/bindings/utilities.conf +++ b/core/home/config/nomarchy/default/hypr/bindings/utilities.conf @@ -51,9 +51,6 @@ bindd = SUPER CTRL, B, Bluetooth controls, exec, nomarchy-launch-bluetooth bindd = SUPER CTRL, W, Wifi controls, exec, nomarchy-launch-wifi bindd = SUPER CTRL, T, Activity, exec, nomarchy-launch-tui btop -# Dictation -bindd = SUPER CTRL, X, Toggle dictation, exec, voxtype record toggle - # Zoom bindd = SUPER CTRL, Z, Zoom in, exec, hyprctl keyword cursor:zoom_factor $(hyprctl getoption cursor:zoom_factor -j | jq '.float + 1') bindd = SUPER CTRL ALT, Z, Reset zoom, exec, hyprctl keyword cursor:zoom_factor 1 diff --git a/core/home/config/nomarchy/default/voxtype/config.toml b/core/home/config/nomarchy/default/voxtype/config.toml deleted file mode 100644 index 59d1f94..0000000 --- a/core/home/config/nomarchy/default/voxtype/config.toml +++ /dev/null @@ -1,97 +0,0 @@ -# Voxtype Configuration -# -# Location: ~/.config/voxtype/config.toml -# All settings can be overridden via CLI flags -# -# State file for external integrations (Waybar, polybar, etc.) -# Use "auto" for default location ($XDG_RUNTIME_DIR/voxtype/state), -# a custom path, or "disabled" to turn off. The daemon writes state -# ("idle", "recording", "transcribing") to this file whenever it changes. -# Required for `voxtype record toggle` and `voxtype status` commands. -state_file = "auto" - -[hotkey] -# Hotkey is configured in Hyprland. Default is Super + Ctrl + X -enabled = false - -[audio] -# Audio input device ("default" uses system default) -# List devices with: pactl list sources short -device = "default" - -# Sample rate in Hz (whisper expects 16000) -sample_rate = 16000 - -# Maximum recording duration in seconds (safety limit) -max_duration_secs = 60 - -# [audio.feedback] -# Enable audio feedback sounds (beeps when recording starts/stops) -# enabled = true -# -# Sound theme: "default", "subtle", "mechanical", or path to custom theme directory -# theme = "default" -# -# Volume level (0.0 to 1.0) -# volume = 0.7 - -[whisper] -# Model to use for transcription -# Options: tiny, tiny.en, base, base.en, small, small.en, medium, medium.en, large-v3, large-v3-turbo -# .en models are English-only but faster and more accurate for English -# large-v3-turbo is faster than large-v3 with minimal accuracy loss (recommended for GPU) -# Or provide absolute path to a custom .bin model file -model = "base.en" - -# Language for transcription -# Use "en" for English, "auto" for auto-detection -# See: https://github.com/openai/whisper#available-models-and-languages -language = "en" - -# Translate non-English speech to English -translate = false - -# Number of CPU threads for inference (omit for auto-detection) -# threads = 4 - -[output] -# Primary output mode: "type" or "clipboard" -# - type: Simulates keyboard input at cursor position (requires ydotool) -# - clipboard: Copies text to clipboard (requires wl-copy) -mode = "type" - -# Fall back to clipboard if typing fails -fallback_to_clipboard = true - -# Delay between typed characters in milliseconds -# 0 = fastest possible, increase if characters are dropped -type_delay_ms = 1 - -# Post-processing command (optional) -# Pipe transcribed text through an external command for cleanup before output. -# The command receives text on stdin and outputs processed text on stdout. -# Useful for LLM-based text cleanup, grammar correction, filler word removal. -# On any failure (timeout, error), falls back to original transcription. -# -# [output.post_process] -# command = "ollama run llama3.2:1b 'Clean up this dictation. Fix grammar, remove filler words. Output only the cleaned text:'" -# timeout_ms = 30000 # 30 second timeout (generous for LLM) - -[output.notification] -# Show notification when recording starts (hotkey pressed) -on_recording_start = false - -# Show notification when recording stops (transcription beginning) -on_recording_stop = false - -# Show notification with transcribed text after transcription completes -on_transcription = false - -# [text] -# Text processing options (word replacements, spoken punctuation) -# -# Enable spoken punctuation conversion (e.g., say "period" to get ".") -# spoken_punctuation = false -# -# Custom word replacements (case-insensitive) -# replacements = { "hyperwhisper" = "hyprwhspr" } diff --git a/core/system/options.nix b/core/system/options.nix index 37b1833..bc955f6 100644 --- a/core/system/options.nix +++ b/core/system/options.nix @@ -206,14 +206,5 @@ in most users want this off. ''; }; - - voxtype = { - enable = lib.mkEnableOption '' - voxtype voice-typing integration. NOTE: voxtype is not packaged in - nixpkgs — when enabled, install voxtype yourself (e.g. via - `home.packages = [ (pkgs.callPackage … {}) ]`). With this off the - SUPER+CTRL+X keybinding and waybar widget are no-ops. - ''; - }; }; } diff --git a/docs/KEYBINDINGS.md b/docs/KEYBINDINGS.md index d74f042..3f5cd1b 100644 --- a/docs/KEYBINDINGS.md +++ b/docs/KEYBINDINGS.md @@ -52,7 +52,6 @@ _Source: `core/home/config/nomarchy/default/hypr/bindings/utilities.conf`_ | SUPER CTRL | B | Bluetooth controls | | SUPER CTRL | W | Wifi controls | | SUPER CTRL | T | Activity | -| SUPER CTRL | X | Toggle dictation | | SUPER CTRL | Z | Zoom in | | SUPER CTRL ALT | Z | Reset zoom | | SUPER CTRL | L | Lock system | diff --git a/docs/OPTIONS.md b/docs/OPTIONS.md index e74e0c7..0bbdda5 100644 --- a/docs/OPTIONS.md +++ b/docs/OPTIONS.md @@ -129,10 +129,6 @@ Without prime config, supergfxd still switches modes but render-offload via `nvi `bool`, default `false`. fcitx5 input method for CJK / IME. Wires NixOS's `i18n.inputMethod` and autostarts `fcitx5-daemon`. -### `nomarchy.system.voxtype.enable` - -`bool`, default `false`. voxtype voice-typing integration. voxtype isn't packaged in nixpkgs — when you enable this, install voxtype yourself (e.g. `home.packages = [ (pkgs.callPackage … {}) ]`). With this off the `SUPER+CTRL+X` keybinding and waybar widget are no-ops. - ### `nomarchy.hardware.isXPS` `bool`, default `false`. Dell XPS fixes — haptic touchpad service and PCI/I²C power-control udev rules. diff --git a/docs/SCRIPTS.md b/docs/SCRIPTS.md index c81e294..086e775 100644 --- a/docs/SCRIPTS.md +++ b/docs/SCRIPTS.md @@ -24,7 +24,7 @@ Phase B (per-batch PRs) refines those into `port-from-omarchy`, - `delete-dead` — Phase B verdict: remove and update callers. - `stub-with-notify` — Phase B verdict: temporary `notify-send` stub. -## Scripts (159) +## Scripts (154) | Script | Location | Callers | Status | Notes | | --- | --- | --- | --- | --- | @@ -40,7 +40,7 @@ Phase B (per-batch PRs) refines those into `port-from-omarchy`, | `nomarchy-build-iso` | `features/scripts/utils` | README.md | `kept` | | | `nomarchy-build-live-iso` | `features/scripts/utils` | README.md | `kept` | | | `nomarchy-cmd-audio-switch` | `features/scripts/utils` | core/home/config/nomarchy/default/hypr/bindings/media.conf | `kept` | | -| `nomarchy-cmd-present` | `features/scripts/utils` | core/home/config/nomarchy/hooks/battery-low.sample,features/scripts/utils/nomarchy-launch-editor, +4 more | `kept` | | +| `nomarchy-cmd-present` | `features/scripts/utils` | core/home/config/nomarchy/hooks/battery-low.sample,features/scripts/utils/nomarchy-launch-editor, +2 more | `kept` | | | `nomarchy-cmd-screenrecord` | `features/scripts/utils` | features/desktop/waybar/config/config.jsonc,features/desktop/waybar/themes/summer-night/config.jsonc, +1 more | `kept` | | | `nomarchy-cmd-screensaver` | `features/scripts/utils` | features/scripts/utils/nomarchy-launch-screensaver | `kept` | | | `nomarchy-cmd-screenshot` | `features/scripts/utils` | core/home/config/nomarchy-skill/SKILL.md,core/home/config/nomarchy/default/hypr/bindings/utilities.conf, +1 more | `kept` | | @@ -62,7 +62,7 @@ Phase B (per-batch PRs) refines those into `port-from-omarchy`, | `nomarchy-hook` | `features/scripts/utils` | core/system/scripts/nomarchy-battery-monitor,features/scripts/utils/nomarchy-env-update, +3 more | `kept` | | | `nomarchy-hw-asus-rog` | `core/system/scripts` | features/scripts/utils/nomarchy-on-boot | `kept` | | | `nomarchy-hw-match` | `core/system/scripts` | features/scripts/utils/nomarchy-on-boot | `kept` | | -| `nomarchy-hw-vulkan` | `core/system/scripts` | features/scripts/utils/nomarchy-voxtype-install | `kept` | | +| `nomarchy-hw-vulkan` | `core/system/scripts` | — | `unused?` | | | `nomarchy-hyprland-active-window-transparency-toggle` | `features/scripts/utils` | core/home/config/nomarchy/default/hypr/bindings/utilities.conf | `kept` | | | `nomarchy-hyprland-monitor-scaling-cycle` | `features/scripts/utils` | core/home/config/nomarchy/default/hypr/bindings/tiling-v2.conf,features/scripts/utils/nomarchy-menu, +1 more | `kept` | | | `nomarchy-hyprland-window-close-all` | `features/scripts/utils` | core/home/config/nomarchy/default/hypr/bindings/tiling-v2.conf,core/system/scripts/nomarchy-system-logout, +2 more | `kept` | | @@ -77,8 +77,8 @@ Phase B (per-batch PRs) refines those into `port-from-omarchy`, | `nomarchy-launch-audio` | `features/scripts/utils` | core/home/config/nomarchy/default/hypr/bindings/utilities.conf,features/desktop/waybar/config/config.jsonc, +3 more | `kept` | | | `nomarchy-launch-bluetooth` | `features/scripts/utils` | core/home/config/nomarchy/default/hypr/bindings/utilities.conf,features/desktop/waybar/config/config.jsonc, +1 more | `kept` | | | `nomarchy-launch-browser` | `features/scripts/utils` | core/home/config/nomarchy-skill/SKILL.md,features/desktop/hyprland/config/bindings.conf | `kept` | | -| `nomarchy-launch-editor` | `features/scripts/utils` | features/desktop/hyprland/config/bindings.conf,features/scripts/utils/nomarchy-menu, +1 more | `kept` | | -| `nomarchy-launch-floating-terminal-with-presentation` | `features/scripts/utils` | core/home/config/nomarchy/default/mako/core.ini,features/desktop/waybar/config/config.jsonc, +4 more | `kept` | | +| `nomarchy-launch-editor` | `features/scripts/utils` | features/desktop/hyprland/config/bindings.conf,features/scripts/utils/nomarchy-menu | `kept` | | +| `nomarchy-launch-floating-terminal-with-presentation` | `features/scripts/utils` | core/home/config/nomarchy/default/mako/core.ini,features/desktop/waybar/config/config.jsonc, +3 more | `kept` | | | `nomarchy-launch-or-focus` | `features/scripts/utils` | core/home/config/nomarchy/extensions/menu.sh,features/desktop/hyprland/config/bindings.conf, +8 more | `kept` | | | `nomarchy-launch-or-focus-tui` | `features/scripts/utils` | core/home/config/nomarchy/extensions/menu.sh,features/desktop/waybar/config/config.jsonc, +5 more | `kept` | | | `nomarchy-launch-or-focus-webapp` | `features/scripts/utils` | features/desktop/hyprland/config/bindings.conf | `kept` | | @@ -93,9 +93,9 @@ Phase B (per-batch PRs) refines those into `port-from-omarchy`, | `nomarchy-menu-keybindings` | `features/scripts/utils` | core/home/config/nomarchy-skill/SKILL.md,core/home/config/nomarchy/default/hypr/bindings/utilities.conf, +2 more | `kept` | | | `nomarchy-notification-dismiss` | `features/scripts/utils` | core/home/config/nomarchy/default/mako/core.ini | `kept` | | | `nomarchy-on-boot` | `features/scripts/utils` | core/home/config/nomarchy/default/hypr/autostart.conf | `kept` | | -| `nomarchy-pkg-add` | `features/scripts/utils` | core/home/config/nomarchy-skill/SKILL.md,features/scripts/utils/nomarchy-pkg-install, +2 more | `kept` | | +| `nomarchy-pkg-add` | `features/scripts/utils` | core/home/config/nomarchy-skill/SKILL.md,features/scripts/utils/nomarchy-pkg-install, +1 more | `kept` | | | `nomarchy-pkg-aur-add` | `features/scripts/utils` | core/home/config/nomarchy-skill/SKILL.md | `kept` | | -| `nomarchy-pkg-drop` | `features/scripts/utils` | features/scripts/utils/nomarchy-voxtype-remove | `kept` | | +| `nomarchy-pkg-drop` | `features/scripts/utils` | — | `unused?` | | | `nomarchy-pkg-install` | `features/scripts/utils` | core/home/config/nomarchy-skill/SKILL.md | `kept` | | | `nomarchy-pkg-remove` | `features/scripts/utils` | features/scripts/utils/nomarchy-pkg-drop | `kept` | | | `nomarchy-powerprofiles-list` | `core/system/scripts` | features/scripts/utils/nomarchy-menu | `kept` | | @@ -116,7 +116,7 @@ Phase B (per-batch PRs) refines those into `port-from-omarchy`, | `nomarchy-restart-terminal` | `features/scripts/utils` | core/home/config/nomarchy-skill/SKILL.md | `kept` | | | `nomarchy-restart-trackpad` | `core/system/scripts` | core/home/config/nomarchy-skill/SKILL.md | `kept` | | | `nomarchy-restart-walker` | `features/scripts/utils` | core/home/config/nomarchy-skill/SKILL.md,features/scripts/utils/nomarchy-menu, +1 more | `kept` | | -| `nomarchy-restart-waybar` | `features/scripts/utils` | core/home/config/nomarchy-skill/SKILL.md,features/scripts/utils/nomarchy-menu, +4 more | `kept` | | +| `nomarchy-restart-waybar` | `features/scripts/utils` | core/home/config/nomarchy-skill/SKILL.md,features/scripts/utils/nomarchy-menu, +2 more | `kept` | | | `nomarchy-restart-wifi` | `core/system/scripts` | features/scripts/utils/nomarchy-menu | `kept` | | | `nomarchy-restart-xcompose` | `core/system/scripts` | — | `unused?` | | | `nomarchy-setup-dns` | `core/system/scripts` | features/scripts/utils/nomarchy-menu | `kept` | | @@ -175,11 +175,6 @@ Phase B (per-batch PRs) refines those into `port-from-omarchy`, | `nomarchy-update-time` | `core/system/scripts` | features/scripts/utils/nomarchy-menu | `kept` | | | `nomarchy-upload-log` | `features/scripts/utils` | core/home/config/nomarchy-skill/SKILL.md,features/scripts/utils/nomarchy-debug | `kept` | | | `nomarchy-version` | `features/scripts/utils` | core/home/config/nomarchy-skill/SKILL.md,features/scripts/utils/nomarchy-debug, +1 more | `kept` | | -| `nomarchy-voxtype-config` | `features/scripts/utils` | features/desktop/waybar/config/config.jsonc,features/desktop/waybar/themes/summer-night/config.jsonc | `kept` | | -| `nomarchy-voxtype-install` | `features/scripts/utils` | core/home/config/nomarchy-skill/SKILL.md | `kept` | | -| `nomarchy-voxtype-model` | `features/scripts/utils` | features/desktop/waybar/config/config.jsonc,features/desktop/waybar/themes/summer-night/config.jsonc | `kept` | | -| `nomarchy-voxtype-remove` | `features/scripts/utils` | core/home/config/nomarchy-skill/SKILL.md | `kept` | | -| `nomarchy-voxtype-status` | `features/scripts/utils` | core/home/config/nomarchy-skill/SKILL.md,features/desktop/waybar/config/config.jsonc, +1 more | `kept` | | | `nomarchy-wallpaper` | `features/scripts/utils` | bin/utils/nomarchy-docs-scripts,core/home/config/nomarchy/default/hypr/autostart.conf, +3 more | `kept` | | | `nomarchy-webapp-install` | `features/scripts/utils` | core/home/config/nomarchy-skill/SKILL.md,features/scripts/utils/nomarchy-webapp-remove-all | `kept` | | | `nomarchy-webapp-remove` | `features/scripts/utils` | core/home/config/nomarchy-skill/SKILL.md | `kept` | | diff --git a/features/desktop/waybar/config/config.jsonc b/features/desktop/waybar/config/config.jsonc index 3ef0fbf..c67b031 100644 --- a/features/desktop/waybar/config/config.jsonc +++ b/features/desktop/waybar/config/config.jsonc @@ -5,7 +5,7 @@ "spacing": 0, "height": 26, "modules-left": ["custom/nomarchy", "hyprland/workspaces"], - "modules-center": ["clock", "custom/update", "custom/voxtype", "custom/screenrecording-indicator", "custom/idle-indicator", "custom/notification-silencing-indicator"], + "modules-center": ["clock", "custom/update", "custom/screenrecording-indicator", "custom/idle-indicator", "custom/notification-silencing-indicator"], "modules-right": [ "tray", "bluetooth", @@ -142,19 +142,6 @@ "signal": 10, "return-type": "json" }, - "custom/voxtype": { - "exec": "nomarchy-voxtype-status", - "return-type": "json", - "format": "{icon}", - "format-icons": { - "idle": "", - "recording": "󰍬", - "transcribing": "󰔟" - }, - "tooltip": true, - "on-click-right": "nomarchy-voxtype-config", - "on-click": "nomarchy-voxtype-model" - }, "tray": { "icon-size": 12, "spacing": 17 diff --git a/features/desktop/waybar/config/style.css b/features/desktop/waybar/config/style.css index 3ae29db..88a83cb 100644 --- a/features/desktop/waybar/config/style.css +++ b/features/desktop/waybar/config/style.css @@ -97,12 +97,3 @@ tooltip { #custom-notification-silencing-indicator.active { color: #a55555; } - -#custom-voxtype { - min-width: 12px; - margin: 0 0 0 7.5px; -} - -#custom-voxtype.recording { - color: #a55555; -} diff --git a/features/desktop/waybar/themes/summer-night/config.jsonc b/features/desktop/waybar/themes/summer-night/config.jsonc index b875b63..bbf82e2 100644 --- a/features/desktop/waybar/themes/summer-night/config.jsonc +++ b/features/desktop/waybar/themes/summer-night/config.jsonc @@ -73,20 +73,6 @@ "return-type": "json" }, - "custom/voxtype": { - "exec": "nomarchy-voxtype-status", - "return-type": "json", - "format": "{icon}", - "format-icons": { - "idle": "", - "recording": "󰍬", - "transcribing": "󰔟" - }, - "tooltip": true, - "on-click-right": "nomarchy-voxtype-config", - "on-click": "nomarchy-voxtype-model" - }, - "backlight": { "max-length": "4", "format": "{icon} {percent}%", diff --git a/features/scripts/utils/nomarchy-voxtype-config b/features/scripts/utils/nomarchy-voxtype-config deleted file mode 100755 index 27b641f..0000000 --- a/features/scripts/utils/nomarchy-voxtype-config +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -set -e - -# Used by Voxtype waybar module to open config on right click - -exec nomarchy-launch-editor ~/.config/voxtype/config.toml diff --git a/features/scripts/utils/nomarchy-voxtype-install b/features/scripts/utils/nomarchy-voxtype-install deleted file mode 100755 index 2dbc9b1..0000000 --- a/features/scripts/utils/nomarchy-voxtype-install +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -set -e - -# Install voxtype and configure it for use. - -if gum confirm "Install Voxtype + AI model (~150MB) to enable dictation?"; then - nomarchy-pkg-add wtype voxtype-bin - - # Setup voxtype - mkdir -p ~/.config/voxtype - cp ~/.config/nomarchy/default/voxtype/config.toml ~/.config/voxtype/ - - voxtype setup --download --no-post-install - if nomarchy-hw-vulkan; then - voxtype setup gpu --enable || true - fi - voxtype setup systemd - - nomarchy-restart-waybar - notify-send " Voxtype Dictation Ready" "Press Super + Ctrl + X to toggle dictation.\nEdit ~/.config/voxtype/config.toml for options." -t 10000 -fi diff --git a/features/scripts/utils/nomarchy-voxtype-model b/features/scripts/utils/nomarchy-voxtype-model deleted file mode 100755 index bd2d5ce..0000000 --- a/features/scripts/utils/nomarchy-voxtype-model +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -set -e - -nomarchy-launch-floating-terminal-with-presentation "voxtype setup model" -nomarchy-restart-waybar diff --git a/features/scripts/utils/nomarchy-voxtype-remove b/features/scripts/utils/nomarchy-voxtype-remove deleted file mode 100755 index 8eb49ca..0000000 --- a/features/scripts/utils/nomarchy-voxtype-remove +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -set -e - -# Remove voxtype and its configurations. - -if nomarchy-cmd-present voxtype; then - echo "Uninstall Voxtype to remove dictation." - - # Remove services - systemctl --user stop voxtype.service 2>/dev/null || true - rm -f ~/.config/systemd/user/voxtype* - systemctl --user daemon-reload - - # Remove packages and configs - nomarchy-pkg-drop wtype voxtype-bin - rm -rf ~/.config/voxtype - rm -rf ~/.local/share/voxtype -else - echo "Voxtype was not installed." -fi diff --git a/features/scripts/utils/nomarchy-voxtype-status b/features/scripts/utils/nomarchy-voxtype-status deleted file mode 100755 index a8dd008..0000000 --- a/features/scripts/utils/nomarchy-voxtype-status +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -set -e - -if nomarchy-cmd-present voxtype; then - voxtype status --follow --extended --format json | while read -r line; do - echo "$line" | jq -c '. + {alt: .class}' - done -else - echo '{"alt": "", "tooltip": ""}' -fi diff --git a/installer/install.sh b/installer/install.sh index 823bcc9..7b05d92 100755 --- a/installer/install.sh +++ b/installer/install.sh @@ -1740,9 +1740,6 @@ $xkb_variant_line # fcitx5 input method (CJK / IME). # nomarchy.system.inputMethod.enable = true; - # voxtype voice-typing wiring (you must install voxtype yourself). - # nomarchy.system.voxtype.enable = true; - system.stateVersion = "25.11"; } EOF