diff --git a/modules/common/shell/aliases.nix b/modules/common/shell/aliases.nix index 30f039b..92b0a24 100644 --- a/modules/common/shell/aliases.nix +++ b/modules/common/shell/aliases.nix @@ -16,7 +16,8 @@ tree = "eza --tree --git-ignore --group-directories-first"; # Editor aliases - v = "nvim ."; + x = "nvim ."; + v = "nvim"; vi = "vim"; vim = "nvim"; diff --git a/modules/dotfiles/nvim/lua/thegeneralist/lazy/colors.lua b/modules/dotfiles/nvim/lua/thegeneralist/lazy/colors.lua index 60770c0..e3727bd 100644 --- a/modules/dotfiles/nvim/lua/thegeneralist/lazy/colors.lua +++ b/modules/dotfiles/nvim/lua/thegeneralist/lazy/colors.lua @@ -1,6 +1,6 @@ function ColorMyPencils(color) -- color = color or "rose-pine" - color = color or "tokyonight-storm" or "rose-pine" or "tokyonight-night" + color = color or "catppuccin-mocha" or "tokyonight-storm" or "rose-pine" or "tokyonight-night" vim.cmd.colorscheme(color) -- vim.api.nvim_set_hl(0, "Normal", { bg = "none" }) diff --git a/modules/dotfiles/nvim/lua/thegeneralist/lazy/snacks.lua b/modules/dotfiles/nvim/lua/thegeneralist/lazy/snacks.lua new file mode 100644 index 0000000..da1afae --- /dev/null +++ b/modules/dotfiles/nvim/lua/thegeneralist/lazy/snacks.lua @@ -0,0 +1,91 @@ +return { + { + "dmtrKovalenko/fff.nvim", + build = function() + require("fff.download").download_or_build_binary() + end, + opts = { -- (optional) + debug = { + enabled = false, + show_scores = true, + }, + }, + -- No need to lazy-load with lazy.nvim. + -- This plugin initializes itself lazily. + lazy = false, + keys = { + { + "ff", -- try it if you didn't it is a banger keybinding for a picker + function() + require("fff").find_files() + end, + desc = "FFFind files", + }, + }, + }, + { + "folke/snacks.nvim", + priority = 1000, + lazy = false, + ---@type snacks.Config + opts = { + bigfile = { enabled = true }, + dashboard = { + enabled = true, + preset = { + keys = { + { + icon = " ", + key = "f", + desc = "Find File", + -- action = ":lua Snacks.dashboard.pick('files')" + action = ":lua require('fff').find_files()", + }, + { icon = " ", key = "n", desc = "New File", action = ":ene | startinsert" }, + { + icon = " ", + key = "g", + desc = "Find Text", + action = ":lua Snacks.dashboard.pick('live_grep')", + }, + { + icon = " ", + key = "r", + desc = "Recent Files", + action = ":lua Snacks.dashboard.pick('oldfiles')", + }, + { + icon = " ", + key = "c", + desc = "Config", + action = ":lua Snacks.dashboard.pick('files', {cwd = vim.fn.stdpath('config')})", + }, + { icon = " ", key = "s", desc = "Restore Session", section = "session" }, + { + icon = "󰒲 ", + key = "L", + desc = "Lazy", + action = ":Lazy", + enabled = package.loaded.lazy ~= nil, + }, + { icon = " ", key = "q", desc = "Quit", action = ":qa" }, + }, + }, + }, + explorer = { enabled = false }, + image = { enabled = true }, + input = { enabled = true }, + + picker = { enabled = true }, + notifier = { enabled = false }, + quickfile = { enabled = true }, + + scope = { enabled = true }, + + -- hmmm: + scroll = { enabled = false }, + statuscolumn = { enabled = false }, + words = { enabled = false }, + }, + }, +}