Squash merge testing into main

This commit is contained in:
Don Harper 2026-01-06 23:27:49 -06:00
parent fa956f5da2
commit 30bb818058
18 changed files with 289 additions and 97 deletions

View file

@ -19,7 +19,8 @@
./mail.nix
./naviterm.nix
./newsboat.nix
./nvf.nix
./nixvim.nix
# ./nvf.nix
./ssh.nix
./taskwarrior.nix
./topgrade.nix
@ -65,7 +66,6 @@
keychain
keyutils
lazygit
librewolf
links2
liquidprompt
lynx

View file

@ -1,9 +1,10 @@
{ pkgs, ... }: {
home.packages = with pkgs; [ tree-sitter fd ripgrep ];
{pkgs, ...}: {
home.packages = with pkgs; [tree-sitter fd ripgrep];
programs.nvf = {
enable = true;
enableManpages = true;
settings = {
# https://nvf.notashelf.dev/options.html
vim = {
luaConfigPost = ''
vim.o.tabstop = 2
@ -14,12 +15,12 @@
vim.o.sidescrolloff = 8
'';
autocomplete.blink-cmp.enable = true;
binds = { cheatsheet.enable = true; };
binds = {cheatsheet.enable = true;};
dashboard.alpha = {
enable = true;
theme = "dashboard";
};
filetree.neo-tree = { enable = true; };
filetree.neo-tree = {enable = true;};
comments.comment-nvim.enable = true;
autopairs.nvim-autopairs.enable = true;
snippets.luasnip.enable = true;
@ -31,7 +32,7 @@
terminal = {
toggleterm = {
enable = true;
lazygit = { enable = true; };
lazygit = {enable = true;};
};
};
treesitter = {
@ -39,48 +40,49 @@
context.enable = true;
fold = true;
autotagHtml.enable = true;
indent.enable = true;
};
syntaxHighlighting = true;
keymaps = [
{
key = "<Tab>";
action = ":bnext<CR>";
mode = [ "n" ];
mode = ["n"];
}
{
key = "<leader>t";
action = ":Telescope buffers<CR>";
mode = [ "n" ];
mode = ["n"];
}
{
key = "<leader>T";
action = ":terminal<CR>";
mode = [ "n" ];
mode = ["n"];
}
{
key = "<leader>e";
action = ":Neotree toggle<CR>";
mode = [ "n" ];
mode = ["n"];
}
{
key = "<leader>ow";
action = ":ObsidianWorkspace<CR>";
mode = [ "n" ];
mode = ["n"];
}
{
key = "<leader>od";
action = ":ObsidianDailies<CR>";
mode = [ "n" ];
mode = ["n"];
}
{
key = "<leader>on";
action = ":ObsidianNew<CR>";
mode = [ "n" ];
mode = ["n"];
}
{
key = "<leader>oN";
action = ":ObsidianNewFromTemplate<CR>";
mode = [ "n" ];
mode = ["n"];
}
];
git = {
@ -117,9 +119,9 @@
codewindow.enable = true;
};
notify = { nvim-notify.enable = true; };
notify = {nvim-notify.enable = true;};
options = { conceallevel = 1; };
options = {conceallevel = 1;};
statusline.lualine = {
enable = true;
@ -141,7 +143,7 @@
legacy_commands = true;
ui.enable = false;
completion.nvim-cmp = true;
templates = { subdir = "Templates"; };
templates = {subdir = "Templates";};
daily_notes = {
date_format = "%Y-%m-%d";
folder = "Daily";