diff --git a/hosts/eddie/configuration.nix b/hosts/eddie/configuration.nix index e893725..2be8675 100644 --- a/hosts/eddie/configuration.nix +++ b/hosts/eddie/configuration.nix @@ -457,6 +457,7 @@ pkgs.xdg-desktop-portal pkgs.xdg-desktop-portal-wlr pkgs.gnome-keyring + pkgs.xdg-desktop-portal-termfilechooser ]; }; diff --git a/modules/home/shell-conf.nix b/modules/home/shell-conf.nix index 99ac51d..c414eb8 100644 --- a/modules/home/shell-conf.nix +++ b/modules/home/shell-conf.nix @@ -69,7 +69,6 @@ fishPlugins.foreign-env fishPlugins.fzf-fish - fishPlugins.fifc fishPlugins.bass fishPlugins.autopair fishPlugins.forgit diff --git a/modules/home/yazi.nix b/modules/home/yazi.nix index bd724bf..43ef250 100644 --- a/modules/home/yazi.nix +++ b/modules/home/yazi.nix @@ -40,12 +40,6 @@ rev = "HEAD"; sha256 = "sha256-JiUik4umi+ujsJmHliUbLsIj7ZTKayrWAAM8HmRdjwk="; }; - starship = pkgs.fetchFromGitHub { - owner = "Rolv-Apneseth"; - repo = "starship.yazi"; - rev = "HEAD"; - sha256 = "sha256-bhLUziCDnF4QDCyysRn7Az35RAy8ibZIVUzoPgyEO1A="; - }; restore = pkgs.fetchFromGitHub { owner = "boydaihungst"; repo = "restore.yazi"; @@ -64,6 +58,19 @@ rev = "HEAD"; sha256 = "sha256-7X8uAiJ8vBXYBXOgyKhVVikOnTBGrdCcXOJemjQNolI="; }; + rich-preview = pkgs.fetchFromGitHub { + owner = "AnirudhG07"; + repo = "rich-preview.yazi"; + rev = "HEAD"; + sha256 = "sha256-dW2gAAv173MTcQdqMV32urzfrsEX6STR+oCJoRVGGpA="; + }; + mediainfo= pkgs.fetchFromGitHub { + owner = "boydaihungst"; + repo = "mediainfo.yazi"; + rev = "HEAD"; + sha256 = "sha256-U6rr3TrFTtnibrwJdJ4rN2Xco4Bt4QbwEVUTNXlWRps="; + }; + dir-rules = ./yazi/plugins/dir-rules.yazi; smart-tab = ./yazi/plugins/smart-tab.yazi; }; @@ -183,5 +190,4 @@ xdg.configFile."yazi/theme.toml".source = ./yazi/theme.toml; xdg.configFile."yazi/flavors".source = ./yazi/flavors; - # xdg.configFile."yazi/plugins".source = ./yazi/plugins; } diff --git a/modules/home/yazi/init.lua b/modules/home/yazi/init.lua index fd93a6c..cb22b1e 100644 --- a/modules/home/yazi/init.lua +++ b/modules/home/yazi/init.lua @@ -1,99 +1,93 @@ --- require("git"):setup() +require("git"):setup() require("dir-rules"):setup() +-- require("yatline"):setup({ +-- section_separator = { open = "", close = "" }, +-- part_separator = { open = "", close = "" }, +-- inverse_separator = { open = "", close = "" }, -require("starship"):setup { - config_file = "~/.config/starship.toml", -} +-- style_a = { +-- fg = "black", +-- bg_mode = { +-- normal = "white", +-- select = "brightyellow", +-- un_set = "brightred" +-- } +-- }, +-- style_b = { bg = "#111111", fg = "brightwhite" }, +-- style_c = { bg = "#111111", fg = "brightwhite" }, -require("yatline"):setup({ - --theme = my_theme, - section_separator = { open = "", close = "" }, - part_separator = { open = "", close = "" }, - inverse_separator = { open = "", close = "" }, +-- permissions_t_fg = "green", +-- permissions_r_fg = "yellow", +-- permissions_w_fg = "red", +-- permissions_x_fg = "cyan", +-- permissions_s_fg = "white", - style_a = { - fg = "black", - bg_mode = { - normal = "white", - select = "brightyellow", - un_set = "brightred" - } - }, - style_b = { bg = "#111111", fg = "brightwhite" }, - style_c = { bg = "#111111", fg = "brightwhite" }, +-- tab_width = 20, +-- tab_use_inverse = false, - permissions_t_fg = "green", - permissions_r_fg = "yellow", - permissions_w_fg = "red", - permissions_x_fg = "cyan", - permissions_s_fg = "white", +-- selected = { icon = "󰻭", fg = "yellow" }, +-- copied = { icon = "", fg = "green" }, +-- cut = { icon = "", fg = "red" }, - tab_width = 20, - tab_use_inverse = false, +-- total = { icon = "󰮍", fg = "yellow" }, +-- succ = { icon = "", fg = "green" }, +-- fail = { icon = "", fg = "red" }, +-- found = { icon = "󰮕", fg = "blue" }, +-- processed = { icon = "󰐍", fg = "green" }, - selected = { icon = "󰻭", fg = "yellow" }, - copied = { icon = "", fg = "green" }, - cut = { icon = "", fg = "red" }, +-- show_background = true, - total = { icon = "󰮍", fg = "yellow" }, - succ = { icon = "", fg = "green" }, - fail = { icon = "", fg = "red" }, - found = { icon = "󰮕", fg = "blue" }, - processed = { icon = "󰐍", fg = "green" }, +-- display_header_line = true, +-- display_status_line = true, - show_background = true, +-- component_positions = { "header", "tab", "status" }, - display_header_line = true, - display_status_line = true, +-- -- header_line = { +-- -- left = { +-- -- section_a = { +-- -- {type = "line", custom = false, name = "tabs", params = {"left"}}, +-- -- }, +-- -- section_b = { +-- -- }, +-- -- section_c = { +-- -- } +-- -- }, +-- -- right = { +-- -- section_a = { +-- -- }, +-- -- section_b = { +-- -- }, +-- -- section_c = { +-- -- } +-- -- } +-- -- }, - component_positions = { "header", "tab", "status" }, - - header_line = { - left = { - section_a = { - {type = "line", custom = false, name = "tabs", params = {"left"}}, - }, - section_b = { - }, - section_c = { - } - }, - right = { - section_a = { - }, - section_b = { - }, - section_c = { - } - } - }, - - status_line = { - left = { - section_a = { - {type = "string", custom = false, name = "tab_mode"}, - }, - section_b = { - {type = "string", custom = false, name = "hovered_size"}, - }, - section_c = { - {type = "string", custom = false, name = "hovered_path"}, - { type = "coloreds", custom = false, name = "symlink" }, - {type = "coloreds", custom = false, name = "count"}, - } - }, - right = { - section_a = { - {type = "string", custom = false, name = "cursor_position"}, - }, - section_b = { - {type = "string", custom = false, name = "cursor_percentage"}, - }, - section_c = { - {type = "string", custom = false, name = "hovered_file_extension", params = {true}}, - {type = "coloreds", custom = false, name = "permissions"}, - {type = "string", custom = false, name = "hovered_ownership"} - } - } - } -}) +-- status_line = { +-- left = { +-- section_a = { +-- {type = "string", custom = false, name = "tab_mode"}, +-- }, +-- section_b = { +-- {type = "string", custom = false, name = "hovered_size"}, +-- }, +-- section_c = { +-- {type = "string", custom = false, name = "hovered_path"}, +-- { type = "coloreds", custom = false, name = "symlink" }, +-- {type = "coloreds", custom = false, name = "count"}, +-- } +-- }, +-- right = { +-- section_a = { +-- {type = "string", custom = false, name = "cursor_position"}, +-- }, +-- section_b = { +-- {type = "string", custom = false, name = "cursor_percentage"}, +-- }, +-- section_c = { +-- {type = "string", custom = false, name = "hovered_file_extension", params = {true}}, +-- {type = "coloreds", custom = false, name = "permissions"}, +-- {type = "string", custom = false, name = "hovered_ownership"} +-- } +-- } +-- } +-- }) diff --git a/modules/home/yazi/theme.toml b/modules/home/yazi/theme.toml index 7dc8392..aaacbbb 100644 --- a/modules/home/yazi/theme.toml +++ b/modules/home/yazi/theme.toml @@ -1,2 +1,7 @@ [flavor] dark = "onedark" + +[status] +overall = { bg = "#282C34" } +sep_left = { open = "", close = "" } +sep_right = { open = "", close = "" }