From 4600c02bbfe902c8755587983600623626a8d8da Mon Sep 17 00:00:00 2001 From: Josh Date: Mon, 1 Jan 2024 21:13:49 -0500 Subject: starship and xplr updates --- starship/starship.toml | 5 +-- starship/transient.toml | 5 --- xplr/init.lua | 38 ++++++++++++++++----- xplr/plugins/icons | 1 - xplr/plugins/icons.lua | 90 +++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 122 insertions(+), 17 deletions(-) delete mode 160000 xplr/plugins/icons create mode 100644 xplr/plugins/icons.lua diff --git a/starship/starship.toml b/starship/starship.toml index 978f3d2..7b32ef3 100644 --- a/starship/starship.toml +++ b/starship/starship.toml @@ -65,12 +65,13 @@ format = '[ $symbol $branch ]($style)' [git_status] style = "bg:git_color fg:black bold" +deleted = '󰗨' format = '[$all_status$ahead_behind ]($style)' [character] disabled = false -success_symbol = '[─󰁔](fg:id_color)' -error_symbol = '[⟮](fg:id_color)[󰁔](fg:red)' +success_symbol = '[─](fg:id_color)' +error_symbol = '[⟮](fg:id_color)[](fg:red)' vimcmd_symbol = '[⟮](fg:id_color)[](fg:green)' vimcmd_replace_one_symbol = '[⟮](fg:id_color)[](fg:mauve)' vimcmd_replace_symbol = '[⟮](fg:id_color)[](fg:mauve)' diff --git a/starship/transient.toml b/starship/transient.toml index 089db4d..906877f 100644 --- a/starship/transient.toml +++ b/starship/transient.toml @@ -6,8 +6,3 @@ id_color = "#f0c6c6" # flamingo [character] disabled = false success_symbol = '[󰑂─󰁔](fg:id_color)' -error_symbol = '[󰑂┤](fg:id_color)[󰁔](fg:red)' -vimcmd_symbol = '[󰑂┤](fg:id_color)[](fg:green)' -vimcmd_replace_one_symbol = '[󰑂┤](fg:id_color)[](fg:mauve)' -vimcmd_replace_symbol = '[󰑂┤](fg:id_color)[](fg:mauve)' -vimcmd_visual_symbol = '[󰑂┤](fg:id_color)[](fg:yellow)' diff --git a/xplr/init.lua b/xplr/init.lua index 54e748b..db4f0b5 100644 --- a/xplr/init.lua +++ b/xplr/init.lua @@ -1,11 +1,16 @@ version = "0.21.3" local home = os.getenv("HOME") +package.path = home + .. "/.config/xplr/plugins/?/init.lua;" + .. home + .. "/.config/xplr/plugins/?.lua;" + .. package.path + local xpm_path = home .. "/.local/share/xplr/dtomvan/xpm.xplr" local xpm_url = "https://github.com/dtomvan/xpm.xplr" - package.path = package.path - .. ";" +.. ";" .. xpm_path .. "/?.lua;" .. xpm_path @@ -23,13 +28,13 @@ os.execute( require("xpm").setup({ plugins = { 'dtomvan/xpm.xplr', - { name = 'sayanarijit/fzf.xplr' }, - { name = 'prncss-xyz/icons.xplr' }, - { 'dtomvan/extra-icons.xplr', - after = function() - xplr.config.general.table.row.cols[2] = { format = "custom.icons_dtomvan_col_1" } - end - }, + 'sayanarijit/fzf.xplr', + 'gitlab:hartan/web-devicons.xplr', + 'sayanarijit/wl-clipboard.xplr', + 'sayanarijit/map.xplr', + 'sayanarijit/command-mode.xplr', + 'sayanarijit/zoxide.xplr', + 'sayanarijit/zentable.xplr', }, auto_install = true, auto_cleanup = true, @@ -42,3 +47,18 @@ xplr.config.modes.builtin.default.key_bindings.on_key.x = { { SwitchModeCustom = "xpm" }, }, } + +require("fzf").setup({ + mode = "default", + key = "ctrl-f", + bin = "fzf", + recursive = true, + enter_dir = true, +}) + +require("command-mode").setup() +require("wl-clipboard").setup() +require("map").setup() +require("zoxide").setup() +require("zentable").setup() +require("icons").setup() diff --git a/xplr/plugins/icons b/xplr/plugins/icons deleted file mode 160000 index 6133ea7..0000000 --- a/xplr/plugins/icons +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6133ea79c41629591c72fa4c51132f7a3cb30782 diff --git a/xplr/plugins/icons.lua b/xplr/plugins/icons.lua new file mode 100644 index 0000000..58e9a74 --- /dev/null +++ b/xplr/plugins/icons.lua @@ -0,0 +1,90 @@ +local xplr = xplr + +local function setup() + local function black(x) + return "\x1b[30m" .. x .. "\x1b[0m" + end + + local function red(x) + return "\x1b[31m" .. x .. "\x1b[0m" + end + + local function green(x) + return "\x1b[32m" .. x .. "\x1b[0m" + end + + local function yellow(x) + return "\x1b[33m" .. x .. "\x1b[0m" + end + + local function blue(x) + return "\x1b[34m" .. x .. "\x1b[0m" + end + + local function magenta(x) + return "\x1b[35m" .. x .. "\x1b[0m" + end + + local function cyan(x) + return "\x1b[36m" .. x .. "\x1b[0m" + end + + local function white(x) + return "\x1b[37m" .. x .. "\x1b[0m" + end + + xplr.config.node_types.mime_essence = { + audio = { + ["*"] = { meta = { icon = yellow "󰎈" } }, + }, + video = { + ["*"] = { meta = { icon = "󰟞" } }, + }, + image = { + ["*"] = { meta = { icon = "" } }, + }, + application = { + -- application/zip + zip = { meta = { icon = "󰀼" } }, + }, + text = { + ["*"] = { meta = { icon = "󰈙" } }, + }, + } + + xplr.config.node_types.directory.meta.icon = blue "" + xplr.config.node_types.file.meta.icon = cyan "󰈔" + xplr.config.node_types.symlink.meta.icon = magenta "" + + xplr.config.node_types.special["Desktop"] = { meta = { icon = blue "󰟀" } } + xplr.config.node_types.special["Documents"] = { meta = { icon = blue "󰃖" } } + xplr.config.node_types.special["Downloads"] = { meta = { icon = blue "󰃘" } } + xplr.config.node_types.special["Music"] = { meta = { icon = blue "󱍙" } } + xplr.config.node_types.special["Pictures"] = { meta = { icon = blue "󰉔" } } + xplr.config.node_types.special["Templates"] = { meta = { icon = blue "󰗇" } } + xplr.config.node_types.special["Videos"] = { meta = { icon = blue "󰈰" } } + + xplr.config.node_types.extension["7z"] = { meta = { icon = "󰀼" } } + xplr.config.node_types.extension.apk = { meta = { icon = "󰀼" } } + xplr.config.node_types.extension.bz2 = { meta = { icon = "󰀼" } } + xplr.config.node_types.extension.cab = { meta = { icon = "󰀼" } } + xplr.config.node_types.extension.cbr = { meta = { icon = "󰀼" } } + xplr.config.node_types.extension.cbr = { meta = { icon = "󰀼" } } + xplr.config.node_types.extension.cbz = { meta = { icon = "󰀼" } } + xplr.config.node_types.extension.cpio = { meta = { icon = "󰀼" } } + xplr.config.node_types.extension.gz = { meta = { icon = "󰀼" } } + xplr.config.node_types.extension.gzip = { meta = { icon = "󰀼" } } + xplr.config.node_types.extension.lha = { meta = { icon = "󰀼" } } + xplr.config.node_types.extension.lzh = { meta = { icon = "󰀼" } } + xplr.config.node_types.extension.lzma = { meta = { icon = "󰀼" } } + xplr.config.node_types.extension.rar = { meta = { icon = "󰀼" } } + xplr.config.node_types.extension.rpm = { meta = { icon = "󰀼" } } + xplr.config.node_types.extension.tar = { meta = { icon = "󰀼" } } + xplr.config.node_types.extension.tgz = { meta = { icon = "󰀼" } } + xplr.config.node_types.extension.txz = { meta = { icon = "󰀼" } } + xplr.config.node_types.extension.xbps = { meta = { icon = "󰀼" } } + xplr.config.node_types.extension.xz = { meta = { icon = "󰀼" } } + xplr.config.node_types.extension.zip = { meta = { icon = "󰀼" } } +end + +return { setup = setup } -- cgit v1.3