.forgejo/workflows/release.yml

@@ -1,165 +0,0 @@
-name: Release
-
-on:
-  push:
-    tags:
-      - 'v*'
-
-jobs:
-  release:
-    runs-on: ubuntu-latest
-    container:
-      image: rust:bookworm
-      volumes:
-        - /opt/runner/keys:/keys:ro
-
-    steps:
-      - name: Install tools
-        run: |
-          apt-get update
-          apt-get install -y dpkg-dev git curl openssh-client
-
-      - name: Setup SSH
-        run: |
-          test -r /keys/forgejo_runner || { echo "Deploy key /keys/forgejo_runner chybi"; exit 1; }
-          install -m 600 /keys/forgejo_runner /tmp/forgejo_runner
-          echo "GIT_SSH_COMMAND=ssh -p 554 -i /tmp/forgejo_runner -o IdentitiesOnly=yes -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o LogLevel=ERROR" >> "$GITHUB_ENV"
-
-      - name: Checkout source
-        run: |
-          git clone ssh://git@git-ssh.janvete.com:554/seth/lines.git src
-          cd src
-          git checkout "${{ github.ref_name }}"
-
-      - name: Build Linux release binary and .deb
-        working-directory: src
-        run: |
-          VERSION=${{ github.ref_name }}
-          VER=${VERSION#v}
-          mkdir -p dist
-
-          cargo build --release
-
-          # .deb package
-          DEB_DIR="lines_${VER}_amd64"
-          mkdir -p "${DEB_DIR}/DEBIAN" "${DEB_DIR}/usr/bin"
-          cp target/release/lines "${DEB_DIR}/usr/bin/lines"
-          chmod 755 "${DEB_DIR}/usr/bin/lines"
-
-          cat > "${DEB_DIR}/DEBIAN/control" << CONTROL
-          Package: lines
-          Version: ${VER}
-          Section: utils
-          Priority: optional
-          Architecture: amd64
-          Maintainer: janvete <jan.vete@example.com>
-          Description: TUI for running frequently used commands from markdown files
-          CONTROL
-
-          dpkg-deb --build "${DEB_DIR}" "dist/${DEB_DIR}.deb"
-
-          # Linux tarball
-          STAGING=$(mktemp -d)
-          cp target/release/lines "${STAGING}/lines"
-          tar -czf "dist/lines-${VERSION}-linux-amd64.tar.gz" -C "${STAGING}" lines
-          rm -rf "${STAGING}"
-
-      - name: Print checksums
-        working-directory: src
-        run: |
-          echo "=== SHA256 checksums ==="
-          sha256sum dist/*
-
-      - name: Create Forgejo Release
-        working-directory: src
-        env:
-          FORGEJO_TOKEN: ${{ secrets.FORGEJO_TOKEN }}
-          FORGEJO_URL: https://git.janvete.com
-        run: |
-          VERSION=${{ github.ref_name }}
-          API="${FORGEJO_URL}/api/v1/repos/seth/lines"
-
-          RELEASE_JSON=$(curl -sS -H "Authorization: token ${FORGEJO_TOKEN}" \
-            -H "Content-Type: application/json" \
-            -X POST \
-            -d "{\"tag_name\":\"${VERSION}\",\"name\":\"${VERSION}\",\"draft\":false,\"prerelease\":false}" \
-            "${API}/releases")
-
-          echo "Create release response: ${RELEASE_JSON}"
-          RELEASE_ID=$(echo "${RELEASE_JSON}" | grep -o '"id":[0-9]*' | head -1 | cut -d: -f2)
-
-          if [ -z "${RELEASE_ID}" ]; then
-            echo "Release may already exist, fetching existing release..."
-            EXISTING=$(curl -sS -H "Authorization: token ${FORGEJO_TOKEN}" \
-              "${API}/releases/tags/${VERSION}")
-            echo "Existing release response: ${EXISTING}"
-            RELEASE_ID=$(echo "${EXISTING}" | grep -o '"id":[0-9]*' | head -1 | cut -d: -f2)
-          fi
-
-          if [ -z "${RELEASE_ID}" ]; then
-            echo "Failed to create or fetch release"
-            exit 1
-          fi
-
-          for ARCHIVE in dist/*; do
-            [ -e "${ARCHIVE}" ] || continue
-            NAME=$(basename "${ARCHIVE}")
-            case "${NAME}" in
-              *.tar.gz) CONTENT_TYPE="application/gzip" ;;
-              *.deb)    CONTENT_TYPE="application/vnd.debian.binary-package" ;;
-              *)        CONTENT_TYPE="application/octet-stream" ;;
-            esac
-            curl -sS -H "Authorization: token ${FORGEJO_TOKEN}" \
-              -H "Content-Type: ${CONTENT_TYPE}" \
-              --data-binary "@${ARCHIVE}" \
-              "${API}/releases/${RELEASE_ID}/assets?name=${NAME}"
-            echo "Uploaded ${NAME}"
-          done
-
-      - name: Update APT repository
-        working-directory: src
-        run: |
-          VERSION=${{ github.ref_name }}
-
-          git clone ssh://git@git-ssh.janvete.com:554/seth/apt.git apt-repo
-          cp dist/*.deb apt-repo/
-
-          cd apt-repo
-
-          # Remove any corrupted .deb files left from previous failed runs
-          for f in *.deb; do
-            [ -e "$f" ] || continue
-            if ! dpkg-deb -I "$f" >/dev/null 2>&1; then
-              echo "Removing corrupted package: $f"
-              rm -f "$f"
-            fi
-          done
-
-          dpkg-scanpackages . > Packages
-          gzip -k -f Packages
-
-          cat > Release << RELEASE
-          Origin: janvete
-          Label: janvete
-          Suite: stable
-          Codename: stable
-          Version: 1.0
-          Architectures: amd64
-          Components: main
-          Description: janvete tools APT repository
-          Date: $(date -Ru)
-          RELEASE
-
-          {
-            echo "SHA256:"
-            for f in Packages Packages.gz *.deb; do
-              [ -e "$f" ] || continue
-              printf " %s %16d %s\n" "$(sha256sum "$f" | cut -d' ' -f1)" "$(stat -c%s "$f")" "$f"
-            done
-          } >> Release
-
-          git config user.email "forgejo-actions[bot]@janvete.com"
-          git config user.name "forgejo-actions[bot]"
-          git add -A
-          git commit -m "chore: add lines ${VERSION}"
-          git push

.github/workflows/release.yml

@@ -0,0 +1,34 @@
+name: Release
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+permissions:
+  contents: write
+
+jobs:
+  build-deb:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install Rust
+        uses: dtolnay/rust-toolchain@stable
+
+      - name: Install cargo-deb
+        run: cargo install cargo-deb
+
+      - name: Build release binary
+        run: cargo build --release
+
+      - name: Build .deb package
+        run: cargo deb --no-build
+
+      - name: Upload .deb to release
+        uses: softprops/action-gh-release@v2
+        with:
+          files: target/debian/*.deb
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Cargo.lock

@@ -825,7 +825,7 @@ dependencies = [
 
 [[package]]
 name = "lines"
-version = "0.1.21"
+version = "0.1.0"
 dependencies = [
  "base64",
  "chrono",

Cargo.toml

@@ -1,12 +1,12 @@
 [package]
 name = "lines"
-version = "0.1.21"
+version = "0.1.0"
 edition = "2024"
 authors = ["janvete"]
 description = "TUI for running frequently used commands"
 license = "MIT"
-repository = "https://git.janvete.com/seth/lines"
+repository = "https://github.com/janvete/lines"
-homepage = "https://git.janvete.com/seth/lines"
+homepage = "https://github.com/janvete/lines"
 keywords = ["cli", "tui", "ssh", "commands"]
 categories = ["command-line-utilities"]
 

README.md

@@ -7,22 +7,24 @@ A TUI app for quickly running frequently used commands — ideal for SSH scripts
 ### macOS (Homebrew)
 
 ```bash
-brew tap janvete/tools https://git.janvete.com/seth/homebrew-tools.git
+brew tap janvete/tools
 brew install lines
 ```
 
-### Debian / Ubuntu (APT)
+### Debian / Ubuntu (.deb)
+
+Download the latest `.deb` from the [GitHub Releases](https://github.com/janvete/lines/releases) page and install it:
 
 ```bash
-echo "deb [trusted=yes] https://git.janvete.com/seth/apt/raw/branch/main ./" | sudo tee /etc/apt/sources.list.d/janvete.list
+sudo apt install ./lines_*.deb
-sudo apt update
+# or
-sudo apt install lines
+sudo dpkg -i lines_*.deb
 ```
 
 ### From source
 
 ```bash
-cargo install --git ssh://git@git-ssh.janvete.com:554/seth/lines
+cargo install --git https://github.com/janvete/lines
 ```
 
 ## Usage
@@ -121,8 +123,6 @@ Use `{}` as a placeholder if your lines are just addresses:
 ssh {} lsblk
 ```
 
-Variables like `$HOME` or `$USER` are treated as remote-shell variables, so they are expanded on the target host, not by your local shell.
-
 ## Global search
 
 Press `/` to search across all commands, files, groups, and section names. Type your query, use `↑/↓` to select a result, and press `Enter` to run it.

src/app.rs

@@ -1,7 +1,5 @@
 use std::path::PathBuf;
 
-use ratatui::widgets::ListState;
-
 use crate::config::Terminal;
 use crate::parser::{load_groups, CommandFile, Group, Section};
 
@@ -25,7 +23,6 @@ pub struct SearchState {
     pub query: String,
     pub results: Vec<SearchResult>,
     pub cursor: usize,
-    pub list_state: ListState,
 }
 
 #[derive(Debug, Clone)]
@@ -40,7 +37,6 @@ pub struct PendingCommand {
 pub enum CustomFocus {
     Lines,
     Input,
-    PreCommand,
 }
 
 #[derive(Debug, Clone)]
@@ -56,8 +52,6 @@ pub struct CustomState {
     pub cursor: usize,
     pub focus: CustomFocus,
     pub command: String,
-    pub pre_command: String,
-    pub list_state: ListState,
 }
 
 impl CustomState {
@@ -75,16 +69,12 @@ impl CustomState {
             }
         }
         let selected = vec![false; lines.len()];
-        let mut list_state = ListState::default();
-        list_state.select(Some(0));
         CustomState {
             lines,
             selected,
             cursor: 0,
             focus: CustomFocus::Lines,
             command: String::new(),
-            pre_command: String::new(),
-            list_state,
         }
     }
 
@@ -118,12 +108,12 @@ impl CustomState {
             .collect()
     }
 
-    pub fn cycle_focus(&mut self) {
+    pub fn focus_input(&mut self) {
-        self.focus = match self.focus {
+        self.focus = CustomFocus::Input;
-            CustomFocus::Lines => CustomFocus::Input,
+    }
-            CustomFocus::Input => CustomFocus::PreCommand,
+
-            CustomFocus::PreCommand => CustomFocus::Lines,
+    pub fn focus_lines(&mut self) {
-        };
+        self.focus = CustomFocus::Lines;
     }
 
     pub fn toggle_all(&mut self) {
@@ -158,20 +148,11 @@ pub struct App {
     pub search_state: Option<SearchState>,
     pub pending_command: Option<PendingCommand>,
     pub message: Option<String>,
-    pub group_list_state: ListState,
-    pub file_list_state: ListState,
-    pub section_list_state: ListState,
 }
 
 impl App {
     pub fn new(data_dir: PathBuf, terminal: Terminal, shell: String) -> Self {
         let groups = load_groups(&data_dir);
-        let mut group_list_state = ListState::default();
-        let mut file_list_state = ListState::default();
-        let mut section_list_state = ListState::default();
-        group_list_state.select(Some(0));
-        file_list_state.select(Some(0));
-        section_list_state.select(Some(0));
         App {
             data_dir,
             terminal,
@@ -186,9 +167,6 @@ impl App {
             search_state: None,
             pending_command: None,
             message: None,
-            group_list_state,
-            file_list_state,
-            section_list_state,
         }
     }
 
@@ -213,13 +191,10 @@ impl App {
 
     pub fn enter_search(&mut self) {
         let results = build_search_index(&self.groups);
-        let mut list_state = ListState::default();
-        list_state.select(Some(0));
         self.search_state = Some(SearchState {
             query: String::new(),
             results,
             cursor: 0,
-            list_state,
         });
         self.screen = Screen::Search;
     }

src/custom.rs

@@ -2,9 +2,7 @@ use crate::app::CustomState;
 
 pub fn build_commands(state: &CustomState) -> Vec<String> {
     let command = state.command.trim();
-    let pre_command = state.pre_command.trim();
+    if command.is_empty() {
-
-    if command.is_empty() && pre_command.is_empty() {
         return Vec::new();
     }
 
@@ -13,53 +11,25 @@ pub fn build_commands(state: &CustomState) -> Vec<String> {
         return Vec::new();
     }
 
-    let prefix = if pre_command.is_empty() {
-        String::new()
-    } else {
-        format!("{} ", pre_command)
-    };
-
     selected
         .iter()
         .map(|line| {
             let line = line.trim();
-            let built = if command.is_empty() {
+            if command.contains("{}") {
-                line.to_string()
+                command.replace("{}", line)
-            } else if command.contains("{}") {
-                escape_dollars(&command.replace("{}", line))
             } else {
-                let escaped = escape_dollars(command).replace('"', "\\\"");
+                format!("{} \"{}\"", line, command.replace('"', "\\\""))
-                format!("{} \"{}\"", line, escaped)
+            }
-            };
-            format!("{}{}", prefix, built)
         })
         .collect()
 }
 
-/// Escape `$` as `\$` unless it is already escaped, so that variables are
-/// expanded by the remote shell rather than the local one when the built
-/// command is passed to `ssh`.
-fn escape_dollars(command: &str) -> String {
-    let mut result = String::with_capacity(command.len());
-    let mut prev_backslash = false;
-    for c in command.chars() {
-        if c == '$' && !prev_backslash {
-            result.push('\\');
-        }
-        result.push(c);
-        prev_backslash = c == '\\' && !prev_backslash;
-    }
-    result
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
     use crate::app::{CustomLine, CustomState};
 
-    fn make_state(lines: Vec<&str>, selected: Vec<bool>, command: &str, pre_command: &str) -> CustomState {
+    fn make_state(lines: Vec<&str>, selected: Vec<bool>, command: &str) -> CustomState {
-        let mut list_state = ratatui::widgets::ListState::default();
-        list_state.select(Some(0));
         CustomState {
             lines: lines
                 .into_iter()
@@ -72,8 +42,6 @@ mod tests {
             cursor: 0,
             focus: crate::app::CustomFocus::Lines,
             command: command.to_string(),
-            pre_command: pre_command.to_string(),
-            list_state,
         }
     }
 
@@ -83,7 +51,6 @@ mod tests {
             vec!["ssh root@ip1", "ssh root@ip2", "ssh root@ip3"],
             vec![false, true, true],
             "lsblk",
-            "",
         );
         assert_eq!(
             build_commands(&state),
@@ -93,7 +60,7 @@ mod tests {
 
     #[test]
     fn test_build_commands_placeholder() {
-        let state = make_state(vec!["root@ip1", "root@ip2"], vec![true, true], "ssh {} lsblk", "");
+        let state = make_state(vec!["root@ip1", "root@ip2"], vec![true, true], "ssh {} lsblk");
         assert_eq!(
             build_commands(&state),
             vec!["ssh root@ip1 lsblk", "ssh root@ip2 lsblk"]
@@ -102,81 +69,7 @@ mod tests {
 
     #[test]
     fn test_build_commands_empty_selection() {
-        let state = make_state(vec!["ssh root@ip1"], vec![false], "lsblk", "");
+        let state = make_state(vec!["ssh root@ip1"], vec![false], "lsblk");
         assert!(build_commands(&state).is_empty());
     }
-
-    #[test]
-    fn test_build_commands_pre_command() {
-        let state = make_state(
-            vec!["ssh root@ip1", "ssh root@ip2"],
-            vec![true, true],
-            "ping",
-            "lview",
-        );
-        assert_eq!(
-            build_commands(&state),
-            vec![
-                "lview ssh root@ip1 \"ping\"",
-                "lview ssh root@ip2 \"ping\""
-            ]
-        );
-    }
-
-    #[test]
-    fn test_build_commands_pre_command_placeholder() {
-        let state = make_state(
-            vec!["root@ip1", "root@ip2"],
-            vec![true, true],
-            "ssh {} lsblk",
-            "lview",
-        );
-        assert_eq!(
-            build_commands(&state),
-            vec!["lview ssh root@ip1 lsblk", "lview ssh root@ip2 lsblk"]
-        );
-    }
-
-    #[test]
-    fn test_build_commands_pre_command_only() {
-        let state = make_state(vec!["ssh root@ip1", "ssh root@ip2"], vec![false, true], "", "lview");
-        assert_eq!(build_commands(&state), vec!["lview ssh root@ip2"]);
-    }
-
-    #[test]
-    fn test_build_commands_escapes_dollar_variables() {
-        let state = make_state(
-            vec!["ssh root@ip1"],
-            vec![true],
-            "echo $HOME && echo $USER",
-            "",
-        );
-        assert_eq!(
-            build_commands(&state),
-            vec!["ssh root@ip1 \"echo \\$HOME && echo \\$USER\""]
-        );
-    }
-
-    #[test]
-    fn test_build_commands_preserves_already_escaped_dollars() {
-        let state = make_state(
-            vec!["ssh root@ip1"],
-            vec![true],
-            "echo \\$HOME",
-            "",
-        );
-        assert_eq!(
-            build_commands(&state),
-            vec!["ssh root@ip1 \"echo \\$HOME\""]
-        );
-    }
-
-    #[test]
-    fn test_build_commands_placeholder_escapes_dollars() {
-        let state = make_state(vec!["root@ip1"], vec![true], "ssh {} echo $HOSTNAME", "");
-        assert_eq!(
-            build_commands(&state),
-            vec!["ssh root@ip1 echo \\$HOSTNAME"]
-        );
-    }
 }

src/events.rs

@@ -1,25 +1,21 @@
-use crossterm::event::{self, Event, KeyCode, KeyEventKind, MouseEventKind};
+use crossterm::event::{self, Event, KeyCode, KeyEventKind};
 use std::io;
 use std::time::Duration;
 
-use crate::app::{App, CustomFocus, CustomState, PendingCommand, Screen};
+use crate::app::{App, CustomFocus, PendingCommand, Screen};
 use crate::commands::{edit_file, run_section};
 use crate::custom::build_commands;
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum AppEvent {
     Tick,
     Key(event::KeyEvent),
-    Mouse(event::MouseEvent),
-    Paste(String),
 }
 
 pub fn poll_event(timeout: Duration) -> io::Result<Option<AppEvent>> {
     if event::poll(timeout)? {
         match event::read()? {
             Event::Key(key) => Ok(Some(AppEvent::Key(key))),
-            Event::Mouse(mouse) => Ok(Some(AppEvent::Mouse(mouse))),
-            Event::Paste(text) => Ok(Some(AppEvent::Paste(text))),
             _ => Ok(Some(AppEvent::Tick)),
         }
     } else {
@@ -41,50 +37,6 @@ pub fn handle_event(app: &mut App, event: AppEvent) -> bool {
                 Screen::Search => handle_search_event(app, key),
             }
         }
-        AppEvent::Mouse(mouse) => match mouse.kind {
-            MouseEventKind::ScrollDown => {
-                scroll_down(app);
-                true
-            }
-            MouseEventKind::ScrollUp => {
-                scroll_up(app);
-                true
-            }
-            _ => true,
-        },
-        AppEvent::Paste(text) => handle_paste_event(app, &text),
-    }
-}
-
-fn scroll_down(app: &mut App) {
-    match app.screen {
-        Screen::Main => app.next(),
-        Screen::Custom => {
-            if let Some(state) = app.custom_state.as_mut() {
-                state.next();
-            }
-        }
-        Screen::Search => {
-            if let Some(state) = app.search_state.as_mut() && !state.results.is_empty() {
-                state.cursor = (state.cursor + 1) % state.results.len();
-            }
-        }
-    }
-}
-
-fn scroll_up(app: &mut App) {
-    match app.screen {
-        Screen::Main => app.previous(),
-        Screen::Custom => {
-            if let Some(state) = app.custom_state.as_mut() {
-                state.previous();
-            }
-        }
-        Screen::Search => {
-            if let Some(state) = app.search_state.as_mut() && !state.results.is_empty() {
-                state.cursor = state.cursor.checked_sub(1).unwrap_or(state.results.len() - 1);
-            }
-        }
     }
 }
 
@@ -163,7 +115,11 @@ fn handle_custom_event(app: &mut App, key: event::KeyEvent) -> bool {
             app.exit_custom();
         }
         KeyCode::Tab => {
-            state.cycle_focus();
+            if state.focus == CustomFocus::Lines {
+                state.focus_input();
+            } else {
+                state.focus_lines();
+            }
         }
         KeyCode::Down => {
             if state.focus == CustomFocus::Lines {
@@ -179,21 +135,19 @@ fn handle_custom_event(app: &mut App, key: event::KeyEvent) -> bool {
             if state.focus == CustomFocus::Lines {
                 state.toggle();
             } else {
-                push_to_active_input(state, ' ');
+                state.command.push(' ');
             }
         }
         KeyCode::Char('a') => {
             if state.focus == CustomFocus::Lines {
                 state.toggle_all();
-            } else {
-                push_to_active_input(state, 'a');
             }
         }
         KeyCode::Backspace => {
-            pop_from_active_input(state);
+            state.command.pop();
         }
         KeyCode::Enter => {
-            if state.focus == CustomFocus::Input || state.focus == CustomFocus::PreCommand {
+            if state.focus == CustomFocus::Input {
                 let commands = build_commands(state);
                 if !commands.is_empty()
                     && let (Some(file), Some(group)) = (app.current_file(), app.current_group())
@@ -207,70 +161,17 @@ fn handle_custom_event(app: &mut App, key: event::KeyEvent) -> bool {
                     return false;
                 }
             } else {
-                state.focus = CustomFocus::Input;
+                state.focus_input();
             }
         }
         KeyCode::Char(c) => {
-            if state.focus == CustomFocus::Lines {
             state.command.push(c);
-            } else {
-                push_to_active_input(state, c);
-            }
         }
         _ => {}
     }
     true
 }
 
-fn push_to_active_input(state: &mut CustomState, c: char) {
-    match state.focus {
-        CustomFocus::Input => state.command.push(c),
-        CustomFocus::PreCommand => state.pre_command.push(c),
-        CustomFocus::Lines => {}
-    }
-}
-
-fn pop_from_active_input(state: &mut CustomState) {
-    match state.focus {
-        CustomFocus::Input => {
-            state.command.pop();
-        }
-        CustomFocus::PreCommand => {
-            state.pre_command.pop();
-        }
-        CustomFocus::Lines => {}
-    }
-}
-
-fn handle_paste_event(app: &mut App, text: &str) -> bool {
-    match app.screen {
-        Screen::Main => true,
-        Screen::Custom => {
-            let Some(state) = app.custom_state.as_mut() else {
-                app.exit_custom();
-                return true;
-            };
-            match state.focus {
-                CustomFocus::Input => state.command.push_str(text),
-                CustomFocus::PreCommand => state.pre_command.push_str(text),
-                CustomFocus::Lines => {}
-            }
-            true
-        }
-        Screen::Search => {
-            let Some(state) = app.search_state.as_mut() else {
-                app.exit_search();
-                return true;
-            };
-            // Search queries are single-line; keep only the first pasted line.
-            let query = text.lines().next().unwrap_or(text);
-            state.query.push_str(query);
-            app.update_search();
-            true
-        }
-    }
-}
-
 fn handle_search_event(app: &mut App, key: event::KeyEvent) -> bool {
     let Some(state) = app.search_state.as_mut() else {
         app.exit_search();

src/main.rs

@@ -14,9 +14,7 @@ use std::time::Duration;
 
 use clap::Parser;
 use crossterm::{
-    event::{
+    event::{DisableMouseCapture, EnableMouseCapture},
-        DisableBracketedPaste, DisableMouseCapture, EnableBracketedPaste, EnableMouseCapture,
-    },
     execute,
     terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen},
 };
@@ -56,12 +54,7 @@ fn main() -> io::Result<()> {
 
     enable_raw_mode()?;
     let mut stdout = io::stdout();
-    execute!(
+    execute!(stdout, EnterAlternateScreen, EnableMouseCapture)?;
-        stdout,
-        EnterAlternateScreen,
-        EnableMouseCapture,
-        EnableBracketedPaste
-    )?;
     let backend = CrosstermBackend::new(stdout);
     let mut terminal = Terminal::new(backend)?;
 
@@ -71,8 +64,7 @@ fn main() -> io::Result<()> {
     execute!(
         terminal.backend_mut(),
         LeaveAlternateScreen,
-        DisableMouseCapture,
+        DisableMouseCapture
-        DisableBracketedPaste
     )?;
     terminal.show_cursor()?;
 
@@ -98,7 +90,7 @@ where
     let tick_rate = Duration::from_millis(100);
 
     loop {
-        terminal.draw(|f| ui::draw(f, &mut app))?;
+        terminal.draw(|f| ui::draw(f, &app))?;
 
         if let Some(event) = poll_event(tick_rate)?
             && !handle_event(&mut app, event)

src/ui.rs

@@ -8,7 +8,7 @@ use ratatui::{
 
 use crate::app::{App, CustomFocus, Focus, Screen};
 
-pub fn draw(f: &mut Frame, app: &mut App) {
+pub fn draw(f: &mut Frame, app: &App) {
     match app.screen {
         Screen::Main => draw_main(f, app),
         Screen::Custom => draw_custom(f, app),
@@ -16,7 +16,7 @@ pub fn draw(f: &mut Frame, app: &mut App) {
     }
 }
 
-fn draw_main(f: &mut Frame, app: &mut App) {
+fn draw_main(f: &mut Frame, app: &App) {
     let chunks = Layout::default()
         .direction(Direction::Vertical)
         .margin(1)
@@ -43,19 +43,18 @@ fn draw_main(f: &mut Frame, app: &mut App) {
     draw_status(f, app, chunks[2]);
 }
 
-fn draw_custom(f: &mut Frame, app: &mut App) {
+fn draw_custom(f: &mut Frame, app: &App) {
     let chunks = Layout::default()
         .direction(Direction::Vertical)
         .margin(1)
         .constraints([
             Constraint::Min(5),
-            Constraint::Length(5),
+            Constraint::Length(3),
-            Constraint::Length(5),
             Constraint::Length(1),
         ])
         .split(f.area());
 
-    let Some(state) = app.custom_state.as_mut() else {
+    let Some(state) = app.custom_state.as_ref() else {
         return;
     };
 
@@ -95,8 +94,7 @@ fn draw_custom(f: &mut Frame, app: &mut App) {
             Style::default().fg(Color::DarkGray)
         });
     let list = List::new(items).block(list_block);
-    state.list_state.select(Some(state.cursor));
+    f.render_widget(list, chunks[0]);
-    f.render_stateful_widget(list, chunks[0], &mut state.list_state);
 
     let input = Paragraph::new(state.command.as_str())
         .block(
@@ -112,30 +110,16 @@ fn draw_custom(f: &mut Frame, app: &mut App) {
         .wrap(Wrap { trim: true });
     f.render_widget(input, chunks[1]);
 
-    let pre_command = Paragraph::new(state.pre_command.as_str())
+    let help = "↑/↓: move | Space: toggle | a: select all | Tab: focus | Enter: run | Esc: back";
-        .block(
-            Block::default()
-                .title(" Pre-command ")
-                .borders(Borders::ALL)
-                .border_style(if state.focus == CustomFocus::PreCommand {
-                    Style::default().fg(Color::Yellow)
-                } else {
-                    Style::default().fg(Color::DarkGray)
-                }),
-        )
-        .wrap(Wrap { trim: true });
-    f.render_widget(pre_command, chunks[2]);
-
-    let help = "↑/↓: move | Space: toggle | a: select all | Tab: focus | Enter: run | Esc: back | scroll: move";
     let text = match &app.message {
         Some(msg) => Text::from(msg.as_str()),
         None => Text::from(help),
     };
     let paragraph = Paragraph::new(text).style(Style::default().fg(Color::Gray));
-    f.render_widget(paragraph, chunks[3]);
+    f.render_widget(paragraph, chunks[2]);
 }
 
-fn draw_search(f: &mut Frame, app: &mut App) {
+fn draw_search(f: &mut Frame, app: &App) {
     let chunks = Layout::default()
         .direction(Direction::Vertical)
         .margin(1)
@@ -146,7 +130,7 @@ fn draw_search(f: &mut Frame, app: &mut App) {
         ])
         .split(f.area());
 
-    let Some(state) = app.search_state.as_mut() else {
+    let Some(state) = app.search_state.as_ref() else {
         return;
     };
 
@@ -173,15 +157,11 @@ fn draw_search(f: &mut Frame, app: &mut App) {
             } else {
                 Style::default()
             };
-            let label = if result.command.is_empty() {
+            ListItem::new(format!(
-                format!("[{}] {} — {}", result.group, result.file, result.section)
+                "[{}] {} — {}",
-            } else {
+                result.group, result.file, result.section
-                format!(
+            ))
-                    "[{}] {} — {} — {}",
+            .style(style)
-                    result.group, result.file, result.section, result.command
-                )
-            };
-            ListItem::new(label).style(style)
         })
         .collect();
 
@@ -190,8 +170,7 @@ fn draw_search(f: &mut Frame, app: &mut App) {
             .title(format!(" Results ({}) ", state.results.len()))
             .borders(Borders::ALL),
     );
-    state.list_state.select(Some(state.cursor));
+    f.render_widget(list, chunks[1]);
-    f.render_stateful_widget(list, chunks[1], &mut state.list_state);
 
     let preview_text = state
         .results
@@ -204,7 +183,7 @@ fn draw_search(f: &mut Frame, app: &mut App) {
     f.render_widget(preview, chunks[2]);
 }
 
-fn draw_groups(f: &mut Frame, app: &mut App, area: ratatui::layout::Rect) {
+fn draw_groups(f: &mut Frame, app: &App, area: ratatui::layout::Rect) {
     let items: Vec<ListItem> = app
         .groups
         .iter()
@@ -228,11 +207,10 @@ fn draw_groups(f: &mut Frame, app: &mut App, area: ratatui::layout::Rect) {
         .border_style(border_style(app.focus == Focus::Groups));
 
     let list = List::new(items).block(block);
-    app.group_list_state.select(Some(app.group_index));
+    f.render_widget(list, area);
-    f.render_stateful_widget(list, area, &mut app.group_list_state);
 }
 
-fn draw_files(f: &mut Frame, app: &mut App, area: ratatui::layout::Rect) {
+fn draw_files(f: &mut Frame, app: &App, area: ratatui::layout::Rect) {
     let items: Vec<ListItem> = app
         .current_files()
         .iter()
@@ -256,11 +234,10 @@ fn draw_files(f: &mut Frame, app: &mut App, area: ratatui::layout::Rect) {
         .border_style(border_style(app.focus == Focus::Files));
 
     let list = List::new(items).block(block);
-    app.file_list_state.select(Some(app.file_index));
+    f.render_widget(list, area);
-    f.render_stateful_widget(list, area, &mut app.file_list_state);
 }
 
-fn draw_sections(f: &mut Frame, app: &mut App, area: ratatui::layout::Rect) {
+fn draw_sections(f: &mut Frame, app: &App, area: ratatui::layout::Rect) {
     let items: Vec<ListItem> = app
         .current_sections()
         .iter()
@@ -289,8 +266,7 @@ fn draw_sections(f: &mut Frame, app: &mut App, area: ratatui::layout::Rect) {
         .border_style(border_style(app.focus == Focus::Sections));
 
     let list = List::new(items).block(block);
-    app.section_list_state.select(Some(app.section_index));
+    f.render_widget(list, area);
-    f.render_stateful_widget(list, area, &mut app.section_list_state);
 }
 
 fn draw_preview(f: &mut Frame, app: &App, area: ratatui::layout::Rect) {