diff --git a/home-manager/features/neovim/config/lua/plugins/fzf.lua b/home-manager/features/neovim/config/lua/plugins/fzf.lua deleted file mode 100644 index 79c7fa9..0000000 --- a/home-manager/features/neovim/config/lua/plugins/fzf.lua +++ /dev/null @@ -1,12 +0,0 @@ -return { - -- https://www.lazyvim.org/extras/editor/fzf - "ibhagwan/fzf-lua", - enabled = false, - keys = { - { - "", - "FzfLua buffers sort_mru=true sort_lastused=true", - desc = "Switch Buffer", - }, - }, -} diff --git a/home-manager/features/neovim/config/lua/plugins/obsidian.lua b/home-manager/features/neovim/config/lua/plugins/obsidian.lua index 57b60c8..23b4503 100644 --- a/home-manager/features/neovim/config/lua/plugins/obsidian.lua +++ b/home-manager/features/neovim/config/lua/plugins/obsidian.lua @@ -28,7 +28,7 @@ return { -- Optional, if you want to change the date format for the ID of daily notes. date_format = "%Y-%m-%d", -- Optional, if you want to automatically insert a template from your template directory like '' - template = nil, + template = "Daily Note", }, templates = { folder = "Templates", diff --git a/home-manager/features/neovim/config/lua/plugins/snacks.lua b/home-manager/features/neovim/config/lua/plugins/snacks.lua index 9e53ae1..f7d630b 100644 --- a/home-manager/features/neovim/config/lua/plugins/snacks.lua +++ b/home-manager/features/neovim/config/lua/plugins/snacks.lua @@ -9,5 +9,257 @@ return { end, desc = "Smart Find Files", }, + + -- The rest of these are just default bindings. Setting the one binding above seems to override the others. + { + ",", + function() + Snacks.picker.buffers() + end, + desc = "Buffers", + }, + { "/", LazyVim.pick("grep"), desc = "Grep (Root Dir)" }, + { + ":", + function() + Snacks.picker.command_history() + end, + desc = "Command History", + }, + { + "n", + function() + Snacks.picker.notifications() + end, + desc = "Notification History", + }, + -- find + { + "fb", + function() + Snacks.picker.buffers() + end, + desc = "Buffers", + }, + { + "fB", + function() + Snacks.picker.buffers({ hidden = true, nofile = true }) + end, + desc = "Buffers (all)", + }, + { "fc", LazyVim.pick.config_files(), desc = "Find Config File" }, + { "ff", LazyVim.pick("files"), desc = "Find Files (Root Dir)" }, + { "fF", LazyVim.pick("files", { root = false }), desc = "Find Files (cwd)" }, + { + "fg", + function() + Snacks.picker.git_files() + end, + desc = "Find Files (git-files)", + }, + { "fr", LazyVim.pick("oldfiles"), desc = "Recent" }, + { + "fR", + function() + Snacks.picker.recent({ filter = { cwd = true } }) + end, + desc = "Recent (cwd)", + }, + { + "fp", + function() + Snacks.picker.projects() + end, + desc = "Projects", + }, + -- git + { + "gd", + function() + Snacks.picker.git_diff() + end, + desc = "Git Diff (hunks)", + }, + { + "gs", + function() + Snacks.picker.git_status() + end, + desc = "Git Status", + }, + { + "gS", + function() + Snacks.picker.git_stash() + end, + desc = "Git Stash", + }, + -- Grep + { + "sb", + function() + Snacks.picker.lines() + end, + desc = "Buffer Lines", + }, + { + "sB", + function() + Snacks.picker.grep_buffers() + end, + desc = "Grep Open Buffers", + }, + { "sg", LazyVim.pick("live_grep"), desc = "Grep (Root Dir)" }, + { "sG", LazyVim.pick("live_grep", { root = false }), desc = "Grep (cwd)" }, + { + "sp", + function() + Snacks.picker.lazy() + end, + desc = "Search for Plugin Spec", + }, + { "sw", LazyVim.pick("grep_word"), desc = "Visual selection or word (Root Dir)", mode = { "n", "x" } }, + { + "sW", + LazyVim.pick("grep_word", { root = false }), + desc = "Visual selection or word (cwd)", + mode = { "n", "x" }, + }, + -- search + { + 's"', + function() + Snacks.picker.registers() + end, + desc = "Registers", + }, + { + "s/", + function() + Snacks.picker.search_history() + end, + desc = "Search History", + }, + { + "sa", + function() + Snacks.picker.autocmds() + end, + desc = "Autocmds", + }, + { + "sc", + function() + Snacks.picker.command_history() + end, + desc = "Command History", + }, + { + "sC", + function() + Snacks.picker.commands() + end, + desc = "Commands", + }, + { + "sd", + function() + Snacks.picker.diagnostics() + end, + desc = "Diagnostics", + }, + { + "sD", + function() + Snacks.picker.diagnostics_buffer() + end, + desc = "Buffer Diagnostics", + }, + { + "sh", + function() + Snacks.picker.help() + end, + desc = "Help Pages", + }, + { + "sH", + function() + Snacks.picker.highlights() + end, + desc = "Highlights", + }, + { + "si", + function() + Snacks.picker.icons() + end, + desc = "Icons", + }, + { + "sj", + function() + Snacks.picker.jumps() + end, + desc = "Jumps", + }, + { + "sk", + function() + Snacks.picker.keymaps() + end, + desc = "Keymaps", + }, + { + "sl", + function() + Snacks.picker.loclist() + end, + desc = "Location List", + }, + { + "sM", + function() + Snacks.picker.man() + end, + desc = "Man Pages", + }, + { + "sm", + function() + Snacks.picker.marks() + end, + desc = "Marks", + }, + { + "sR", + function() + Snacks.picker.resume() + end, + desc = "Resume", + }, + { + "sq", + function() + Snacks.picker.qflist() + end, + desc = "Quickfix List", + }, + { + "su", + function() + Snacks.picker.undo() + end, + desc = "Undotree", + }, + -- ui + { + "uC", + function() + Snacks.picker.colorschemes() + end, + desc = "Colorschemes", + }, }, } diff --git a/home-manager/features/neovim/config/lua/plugins/telescope.lua b/home-manager/features/neovim/config/lua/plugins/telescope.lua deleted file mode 100644 index d31cb7c..0000000 --- a/home-manager/features/neovim/config/lua/plugins/telescope.lua +++ /dev/null @@ -1,15 +0,0 @@ --- This is disabled because both snacks and fzf do a better job. -return { - "nvim-telescope/telescope.nvim", - enabled = false, - keys = { - -- Switch the default keybind to switch buffers instead of find files - { - "", - "Telescope buffers sort_mru=true sort_lastused=true", - desc = "Open Files", - }, - -- Disable the since it's so hard to type and redundant with the above. - { "", false }, - }, -} diff --git a/home-manager/features/neovim/config/lua/plugins/tokyonight.lua b/home-manager/features/neovim/config/lua/plugins/tokyonight.lua new file mode 100644 index 0000000..a6bc152 --- /dev/null +++ b/home-manager/features/neovim/config/lua/plugins/tokyonight.lua @@ -0,0 +1,10 @@ +return { + "folke/tokyonight.nvim", + opts = { + transparent = true, + styles = { + sidebars = "transparent", + -- floats = "transparent", + }, + }, +} diff --git a/home-manager/features/terminal.nix b/home-manager/features/terminal.nix index 27eda3d..9c6a38d 100644 --- a/home-manager/features/terminal.nix +++ b/home-manager/features/terminal.nix @@ -60,7 +60,7 @@ }; colors = { - alpha = 0.8; + alpha = 0.9; # Tokionight Night theme # From https://codeberg.org/dnkl/foot/src/branch/master/themes/tokyonight-night background = "1a1b26";