From 74ef348905bc2b4eac3fb7ff1aebbcc08194c16e Mon Sep 17 00:00:00 2001 From: LordMZTE Date: Fri, 7 Jul 2023 12:44:04 +0200 Subject: [PATCH] switch to nfm --- .config/fish/config.fish | 1 - .config/joshuto/joshuto.toml | 33 ---- .config/joshuto/keymap.toml | 209 ---------------------- .config/joshuto/preview.sh | 12 -- .config/nfm/config.ini | 9 + .local/share/applications/joshuto.desktop | 7 - scripts/start-joshuto.sh | 7 - setup/commands/install-scripts.rkt | 1 - 8 files changed, 9 insertions(+), 270 deletions(-) delete mode 100644 .config/joshuto/joshuto.toml delete mode 100644 .config/joshuto/keymap.toml delete mode 100755 .config/joshuto/preview.sh create mode 100644 .config/nfm/config.ini delete mode 100644 .local/share/applications/joshuto.desktop delete mode 100755 scripts/start-joshuto.sh diff --git a/.config/fish/config.fish b/.config/fish/config.fish index c1a7aab..9f80e77 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -2,7 +2,6 @@ fish_vi_key_bindings # ALIASES -alias jo="TERM=xterm-256color joshuto" alias clip="xclip -sel clip" alias nv="nvim" #alias nvide="rbg neovide --nofork --multigrid --" diff --git a/.config/joshuto/joshuto.toml b/.config/joshuto/joshuto.toml deleted file mode 100644 index 4eccf1f..0000000 --- a/.config/joshuto/joshuto.toml +++ /dev/null @@ -1,33 +0,0 @@ -# currently does not work -scroll_offset = 6 - -xdg_open = false -use_trash = true - -[display] -automatically_count_files = false -collapse_preview = true -# ratios for parent view, current view and preview -column_ratio = [1, 4, 4] -show_borders = true -show_hidden = false -show_icons = true -show_preview = true -tilde_in_titlebar = true - -[display.sort] -# lexical, mtime, natural -method = "lexical" -case_sensitive = false -directories_first = true -reverse = false - -# Not fully implemented yet -[preview] -max_preview_size = 2097152 # 2MB -preview_images = true -preview_script = "~/.config/joshuto/preview.sh" - -[tab] -# inherit, home, root -home_page = "inherit" diff --git a/.config/joshuto/keymap.toml b/.config/joshuto/keymap.toml deleted file mode 100644 index c6f5aa6..0000000 --- a/.config/joshuto/keymap.toml +++ /dev/null @@ -1,209 +0,0 @@ -[keymaps] -# backspace = 263 - -[[mapcommand]] -command = "new_tab" -keys = ["T"] - -[[mapcommand]] -command = "new_tab" -keys = ["ctrl+t"] -[[mapcommand]] -command = "close_tab" -keys = ["W"] -[[mapcommand]] -command = "close_tab" -keys = ["ctrl+w"] -[[mapcommand]] -command = "close_tab" -keys = ["q"] -[[mapcommand]] -command = "force_quit" -keys = ["Q"] -[[mapcommand]] -command = "reload_dirlist" -keys = ["R"] -[[mapcommand]] -command = "toggle_hidden" -keys = ["z", "h"] - -[[mapcommand]] -command = "tab_switch 1" -keys = ["\t"] -[[mapcommand]] -command = "tab_switch -1" -keys = ["backtab"] - -[[mapcommand]] -command = "cursor_move_up" -keys = ["arrow_up"] -[[mapcommand]] -command = "cursor_move_up" -keys = ["k"] -[[mapcommand]] -command = "cursor_move_up 10" -keys = ["ctrl+u"] -[[mapcommand]] -command = "cursor_move_down 10" -keys = ["ctrl+d"] -[[mapcommand]] -command = "cursor_move_down" -keys = ["arrow_down"] -[[mapcommand]] -command = "cursor_move_down" -keys = ["j"] -[[mapcommand]] -command = "cursor_move_end" -keys = ["end"] -[[mapcommand]] -command = "cursor_move_end" -keys = ["G"] -[[mapcommand]] -command = "cursor_move_home" -keys = ["home"] -[[mapcommand]] -command = "cursor_move_home" -keys = ["g", "g"] -[[mapcommand]] -command = "cursor_move_page_up" -keys = ["page_up"] -[[mapcommand]] -command = "cursor_move_page_down" -keys = ["page_down"] - -[[mapcommand]] -command = "parent_cursor_move_up" -keys = ["["] -[[mapcommand]] -command = "parent_cursor_move_down" -keys = ["]"] - -[[mapcommand]] -command = "open" -keys = ["arrow_right"] -[[mapcommand]] -command = "open" -keys = ["l"] -[[mapcommand]] -command = "open" -keys = ["\n"] -[[mapcommand]] -command = "open_with" -keys = ["r"] - -[[mapcommand]] -command = ":cd " -keys = ["c", "d"] -[[mapcommand]] -command = "cd .." -keys = ["arrow_left"] -[[mapcommand]] -command = "cd .." -keys = ["h"] - -[[mapcommand]] -command = "cut_files" -keys = ["d", "d"] -[[mapcommand]] -command = "copy_files" -keys = ["y", "y"] -[[mapcommand]] -command = "copy_filename" -keys = ["y", "n"] -[[mapcommand]] -command = "copy_filename_without_extension" -keys = ["y", "."] -[[mapcommand]] -command = "copy_filepath" -keys = ["y", "p"] -[[mapcommand]] -command = "copy_dirname" -keys = ["y", "d"] -[[mapcommand]] -command = "paste_files" -keys = ["p", "p"] -[[mapcommand]] -command = "paste_files --overwrite=true" -keys = ["p", "o"] -[[mapcommand]] -command = "delete_files" -keys = ["d", "D"] -[[mapcommand]] -command = "delete_files" -keys = ["delete"] - -[[mapcommand]] -command = "rename_append" -keys = ["a"] -[[mapcommand]] -command = "rename_prepend" -keys = ["A"] - -[[mapcommand]] -command = "select --toggle=true" -keys = [" "] -[[mapcommand]] -command = "select --toggle=true --all=true" -keys = ["t"] - -[[mapcommand]] -command = "search_skim" -keys = ["f", "f"] -[[mapcommand]] -command = ":search " -keys = ["/"] -[[mapcommand]] -command = ":search_glob " -keys = ["\\"] -[[mapcommand]] -command = "search_next" -keys = ["n"] -[[mapcommand]] -command = "search_prev" -keys = ["N"] - -[[mapcommand]] -command = "bulk_rename" -keys = ["b", "b"] -[[mapcommand]] -command = "set_mode" -keys = ["="] - -[[mapcommand]] -command = ":" -keys = [";"] -[[mapcommand]] -command = ":" -keys = [":"] -[[mapcommand]] -command = ":mkdir " -keys = ["m", "k"] -[[mapcommand]] -command = ":rename " -keys = ["c", "w"] -[[mapcommand]] -command = ":touch" -keys = ["f", "t"] - -[[mapcommand]] -command = "sort lexical" -keys = ["s", "l"] -[[mapcommand]] -command = "sort mtime" -keys = ["s", "m"] -[[mapcommand]] -command = "sort natural" -keys = ["s", "n"] -[[mapcommand]] -command = "sort ext" -keys = ["s", "e"] -[[mapcommand]] -command = "sort reverse" -keys = ["s", "r"] - -[[mapcommand]] -command = "cd /" -keys = ["g", "/"] -[[mapcommand]] -command = "cd /etc" -keys = ["g", "e"] diff --git a/.config/joshuto/preview.sh b/.config/joshuto/preview.sh deleted file mode 100755 index 25d8d8d..0000000 --- a/.config/joshuto/preview.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -set -e -# viuer doesn't like xterm-kitty -export TERM=xterm-256color - -mime=$(file -b --mime-type "$1") - -case $mime in -image/*) viu $1 ;; -*) bat $1 --color=always ;; -esac diff --git a/.config/nfm/config.ini b/.config/nfm/config.ini new file mode 100644 index 0000000..79c2da8 --- /dev/null +++ b/.config/nfm/config.ini @@ -0,0 +1,9 @@ +[main] +opener = xdg-open; +shell = /usr/bin/fish -c; +theme = catppuccin-mocha; +show-hidden = true; +mouse-support = true; + +[keybinds] +C-h = toggle-hidden-files; diff --git a/.local/share/applications/joshuto.desktop b/.local/share/applications/joshuto.desktop deleted file mode 100644 index e672137..0000000 --- a/.local/share/applications/joshuto.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -Name=Joshuto -Comment=TUI File Manager -Terminal=false -Exec=alacritty -e start-joshuto -Icon=file-manager -Type=Application diff --git a/scripts/start-joshuto.sh b/scripts/start-joshuto.sh deleted file mode 100755 index 0590b5b..0000000 --- a/scripts/start-joshuto.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -if [ -z $1 ]; then - joshuto -else - joshuto --path "$@" -fi - diff --git a/setup/commands/install-scripts.rkt b/setup/commands/install-scripts.rkt index 2fcbdba..a2c72c1 100644 --- a/setup/commands/install-scripts.rkt +++ b/setup/commands/install-scripts.rkt @@ -15,7 +15,6 @@ ;; Symlink interpreted scripts (mklink "scripts/map-touch-display.rkt" (bin-path "map-touch-display")) - (mklink "scripts/start-joshuto.sh" (bin-path "start-joshuto")) (mklink "scripts/startriver.sh" (bin-path "startriver")) (mklink "scripts/update-nvim-plugins.rkt" (bin-path "update-nvim-plugins"))