don/NixOS-Configs
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Activity

home | switch from nvf back to nixvim

Browse source
This commit is contained in:
Don Harper 2026-01-04 22:47:45 -06:00
parent f33943bfa0
commit 5a0ece7206
5 changed files with 188 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

169
flake.lock generated
View file

@ -132,6 +132,27 @@
}
},
"flake-parts_2": {
"inputs": {
"nixpkgs-lib": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1765835352,
"narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "a34fae9c08a15ad73f295041fec82323541400a9",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_3": {
"inputs": {
"nixpkgs-lib": [
"nvf",
@ -203,6 +224,24 @@
"type": "github"
}
},
"flake-utils_4": {
"inputs": {
"systems": "systems_3"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"git-hooks-nix": {
"inputs": {
"flake-compat": [
@ -254,6 +293,34 @@
"type": "github"
}
},
"ixx": {
"inputs": {
"flake-utils": [
"nixvim",
"nuschtosSearch",
"flake-utils"
],
"nixpkgs": [
"nixvim",
"nuschtosSearch",
"nixpkgs"
]
},
"locked": {
"lastModified": 1754860581,
"narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=",
"owner": "NuschtOS",
"repo": "ixx",
"rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281",
"type": "github"
},
"original": {
"owner": "NuschtOS",
"ref": "v0.1.1",
"repo": "ixx",
"type": "github"
}
},
"mnw": {
"locked": {
"lastModified": 1758834834,
@ -290,7 +357,7 @@
},
"ndg": {
"inputs": {
"nixpkgs": "nixpkgs_7"
"nixpkgs": "nixpkgs_8"
},
"locked": {
"lastModified": 1765720983,
@ -507,6 +574,22 @@
}
},
"nixpkgs_7": {
"locked": {
"lastModified": 1767325753,
"narHash": "sha256-yA/CuWyqm+AQo2ivGy6PlYrjZBQm7jfbe461+4HF2fo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "64049ca74d63e971b627b5f3178d95642e61cedd",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-25.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_8": {
"locked": {
"lastModified": 1764242076,
"narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=",
@ -522,7 +605,7 @@
"type": "github"
}
},
"nixpkgs_8": {
"nixpkgs_9": {
"locked": {
"lastModified": 1766125104,
"narHash": "sha256-l/YGrEpLromL4viUo5GmFH3K5M1j0Mb9O+LiaeCPWEM=",
@ -538,16 +621,61 @@
"type": "github"
}
},
"nixvim": {
"inputs": {
"flake-parts": "flake-parts_2",
"nixpkgs": "nixpkgs_7",
"nuschtosSearch": "nuschtosSearch",
"systems": "systems_4"
},
"locked": {
"lastModified": 1767448089,
"narHash": "sha256-U1fHsZBnFrUil731NHD9Sg5HoiG+eSHau8OFuClhwW0=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "983751b66f255bbea1adc185364e9e7b73f82358",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "nixos-25.11",
"repo": "nixvim",
"type": "github"
}
},
"nuschtosSearch": {
"inputs": {
"flake-utils": "flake-utils_4",
"ixx": "ixx",
"nixpkgs": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1761730856,
"narHash": "sha256-t1i5p/vSWwueZSC0Z2BImxx3BjoUDNKyC2mk24krcMY=",
"owner": "NuschtOS",
"repo": "search",
"rev": "e29de6db0cb3182e9aee75a3b1fd1919d995d85b",
"type": "github"
},
"original": {
"owner": "NuschtOS",
"repo": "search",
"type": "github"
}
},
"nvf": {
"inputs": {
"flake-compat": "flake-compat_3",
"flake-parts": "flake-parts_2",
"flake-parts": "flake-parts_3",
"mnw": "mnw",
"ndg": "ndg",
"nixpkgs": [
"nixpkgs"
],
"systems": "systems_3"
"systems": "systems_5"
},
"locked": {
"lastModified": 1766596669,
@ -574,6 +702,7 @@
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_6",
"nixpkgs-stable": "nixpkgs-stable",
"nixvim": "nixvim",
"nvf": "nvf",
"sops-nix": "sops-nix"
}
@ -598,7 +727,7 @@
},
"sops-nix": {
"inputs": {
"nixpkgs": "nixpkgs_8"
"nixpkgs": "nixpkgs_9"
},
"locked": {
"lastModified": 1766289575,
@ -674,6 +803,36 @@
"repo": "default",
"type": "github"
}
},
"systems_4": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_5": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
}
},
"root": "root",

2
flake.nix
View file

@ -5,6 +5,8 @@
nixConfig = {allowUnfree = true;};
inputs = {
# nixvim.url = "github:nix-community/nixvim";
nixvim.url = "github:nix-community/nixvim/nixos-25.11";
# nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
sops-nix.url = "github:Mic92/sops-nix";

3
home/common/default.nix
View file

@ -19,7 +19,8 @@
./mail.nix
./naviterm.nix
./newsboat.nix
./nvf.nix
./nixvim.nix
# ./nvf.nix
./ssh.nix
./taskwarrior.nix
./topgrade.nix

34
home/common/nvf.nix
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";

4
home/default.nix
View file

@ -19,8 +19,8 @@
don = {
imports = [
inputs.catppuccin.homeModules.catppuccin
inputs.nvf.homeManagerModules.default
# inputs.nixvim.homeModules.nixvim
# inputs.nvf.homeManagerModules.default
inputs.nixvim.homeModules.nixvim
./common
];
home = {