diff --git a/modules/cli/shell/starship.nix b/modules/cli/shell/starship.nix index fe3361a..ece00f0 100644 --- a/modules/cli/shell/starship.nix +++ b/modules/cli/shell/starship.nix @@ -19,18 +19,36 @@ in add_newline = false; command_timeout = 2000; nix_shell.disabled = true; - format = let - dedupDollar = list: let - result = builtins.foldl' (acc: elem: - if lib.hasPrefix "$" elem then - if builtins.elem elem acc.seen - then acc - else acc // { result = acc.result ++ [elem]; seen = acc.seen ++ [elem]; } - else - acc // { result = acc.result ++ [elem]; } - ) { result = []; seen = []; } (lib.reverseList list); - in lib.reverseList result.result; - in "$all" + lib.concatStrings (dedupDollar cfg.format); + format = + let + dedupDollar = + list: + let + result = + builtins.foldl' + ( + acc: elem: + if lib.hasPrefix "$" elem then + if builtins.elem elem acc.seen then + acc + else + acc + // { + result = acc.result ++ [ elem ]; + seen = acc.seen ++ [ elem ]; + } + else + acc // { result = acc.result ++ [ elem ]; } + ) + { + result = [ ]; + seen = [ ]; + } + (lib.reverseList list); + in + lib.reverseList result.result; + in + "$all" + lib.concatStrings (dedupDollar cfg.format); }; }; }; diff --git a/modules/cli/shpool.nix b/modules/cli/shpool.nix index 94aee1a..4cd091e 100644 --- a/modules/cli/shpool.nix +++ b/modules/cli/shpool.nix @@ -35,6 +35,9 @@ in }; }; }; - my.cli.shell.starship.format = [ "\${custom.shpool}" "$character" ]; + my.cli.shell.starship.format = [ + "\${custom.shpool}" + "$character" + ]; }; } diff --git a/modules/cli/tmux.nix b/modules/cli/tmux.nix index 9592f88..f08e853 100644 --- a/modules/cli/tmux.nix +++ b/modules/cli/tmux.nix @@ -47,6 +47,9 @@ in }; }; }; - my.cli.shell.starship.format = [ "\${custom.tmux}" "$character" ]; + my.cli.shell.starship.format = [ + "\${custom.tmux}" + "$character" + ]; }; } diff --git a/modules/coding/editor/neovim/nvim/lua/plugins/plugins-setup.lua b/modules/coding/editor/neovim/nvim/lua/plugins/plugins-setup.lua index b0238d3..a449285 100644 --- a/modules/coding/editor/neovim/nvim/lua/plugins/plugins-setup.lua +++ b/modules/coding/editor/neovim/nvim/lua/plugins/plugins-setup.lua @@ -27,7 +27,7 @@ local plugins = { end, }, { - 'echasnovski/mini.nvim', + "echasnovski/mini.nvim", config = function() -- Better Around/Inside textobjects -- @@ -35,31 +35,31 @@ local plugins = { -- - va) - [V]isually select [A]round [)]paren -- - yinq - [Y]ank [I]nside [N]ext [Q]uote -- - ci' - [C]hange [I]nside [']quote - require('mini.ai').setup { n_lines = 500 } + require("mini.ai").setup({ n_lines = 500 }) -- Add/delete/replace surroundings (brackets, quotes, etc.) -- -- - saiw) - [S]urround [A]dd [I]nner [W]ord [)]Paren -- - sd' - [S]urround [D]elete [']quotes -- - sr)' - [S]urround [R]eplace [)] ['] - require('mini.surround').setup() + require("mini.surround").setup() -- ... and there is more! -- Check out: https://github.com/echasnovski/mini.nvim end, }, { - 'nvim-neo-tree/neo-tree.nvim', - version = '*', + "nvim-neo-tree/neo-tree.nvim", + version = "*", dependencies = { - 'nvim-lua/plenary.nvim', - 'nvim-tree/nvim-web-devicons', - 'MunifTanjim/nui.nvim', + "nvim-lua/plenary.nvim", + "nvim-tree/nvim-web-devicons", + "MunifTanjim/nui.nvim", }, - cmd = 'Neotree', + cmd = "Neotree", keys = { - { '\\', ':Neotree reveal toggle', desc = 'Toggle NeoTree', silent = true }, - { 'e', ':Neotree reveal toggle', desc = 'Toggle NeoTree', silent = true }, + { "\\", ":Neotree reveal toggle", desc = "Toggle NeoTree", silent = true }, + { "e", ":Neotree reveal toggle", desc = "Toggle NeoTree", silent = true }, }, --- @type neotree.Config opts = { @@ -71,7 +71,7 @@ local plugins = { window = { width = 30, mappings = { - ['\\'] = 'close_window', + ["\\"] = "close_window", ["e"] = "close_window", [""] = "set_root", },