diff --git a/dot_config/nvim/lua/plugins/ui.lua.tmpl b/dot_config/nvim/lua/plugins/ui.lua.tmpl index b79521b..d36ad23 100644 --- a/dot_config/nvim/lua/plugins/ui.lua.tmpl +++ b/dot_config/nvim/lua/plugins/ui.lua.tmpl @@ -444,6 +444,7 @@ return { config = { header = vim.split(logo, "\n"), center = { + {{- if eq .chezmoi.os "openbsd" }} { action = "Telescope find_files", desc = " Find file", @@ -463,11 +464,7 @@ return { key = "g", }, { - {{- if eq .chezmoi.os "openbsd" }} action = [[lua require("telescope.builtin").find_files({ cwd = vim.fn.stdpath("config") })]], -{{- else }} - action = [[lua require("lazyvim.util").telescope.config_files()()]], -{{- end }} desc = " Config", icon = " ", key = "c", @@ -485,6 +482,45 @@ return { key = "l", }, { action = "qa", desc = " Quit", icon = " ", key = "q" }, +{{- else }} + { + action = "lua LazyVim.pick()()", + desc = " Find file", + icon = " ", + key = "f", + }, + { + action = "Telescope oldfiles", + desc = " Recent files", + icon = " ", + key = "r", + }, + { + action = 'lua LazyVim.pick("live_grep")()', + desc = " Find text", + icon = " ", + key = "g", + }, + { + action = "lua LazyVim.pick.config_files()()", + desc = " Config", + icon = " ", + key = "c", + }, + { + action = "Telekasten find_notes", + desc = " Find notes", + icon = " ", + key = "n", + }, + { + action = "Lazy", + desc = " Lazy", + icon = "󰒲 ", + key = "l", + }, + { action = "qa", desc = " Quit", icon = " ", key = "q" }, + {{- end }} }, footer = function() local stats = require("lazy").stats() @@ -517,5 +553,22 @@ return { { "stevearc/oil.nvim", opts = {}, + config = function() + require("oil").setup({ + default_file_explorer = true, + delete_to_trash = true, + skip_confirm_for_simple_edits = true, + view_options = { + show_hidden = true, + natural_order = true, + is_always_hidden = function(name, _) + return name == '..' or name == '.git' + end, + }, + win_options = { + wrap = true, + } + }) + end, }, } diff --git a/dot_config/zed/private_settings.json b/dot_config/zed/private_settings.json deleted file mode 100644 index 9ef790b..0000000 --- a/dot_config/zed/private_settings.json +++ /dev/null @@ -1,23 +0,0 @@ -// Zed settings -// -// For information on how to configure Zed, see the Zed -// documentation: https://zed.dev/docs/configuring-zed -// -// To see all of Zed's default settings without changing your -// custom settings, run the `zed: Open Default Settings` command -// from the command palette -{ - "telemetry": { - "diagnostics": true, - "metrics": false - }, - "vim_mode": true, - "ui_font_size": 12, - "buffer_font_family": "BrutalistMono Nerd Font", - "buffer_font_size": 12, - "theme": { - "mode": "system", - "dark": "Gruvbox Dark Hard", - "light": "Gruvbox Dark Hard" - } -} diff --git a/dot_config/zed/settings.json.tmpl b/dot_config/zed/settings.json.tmpl new file mode 100644 index 0000000..a6a1b7c --- /dev/null +++ b/dot_config/zed/settings.json.tmpl @@ -0,0 +1,15 @@ +{ + "telemetry": { + "diagnostics": true, + "metrics": false + }, + "vim_mode": true, + "ui_font_size": {{ .fontsize }}, + "buffer_font_size": {{ .fontsize }}, + "buffer_font_family": "BrutalistMono Nerd Font", + "theme": { + "mode": "system", + "dark": "Gruvbox Dark Hard", + "light": "Gruvbox Dark Hard" + } +}