nixvim -> nvf
This commit is contained in:
Don Harper
parent
183418e843
commit
bda5f1c550
5 changed files with 186 additions and 97 deletions
132
flake.lock
generated
132
flake.lock
generated
|
|
@ -94,6 +94,22 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat_3": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1751685974,
|
||||
"narHash": "sha256-NKw96t+BgHIYzHUjkTK95FqYRVKB8DHpVhefWSz/kTw=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "549f2762aebeff29a2e5ece7a7dc0f955281a1d1",
|
||||
"revCount": 92,
|
||||
"type": "git",
|
||||
"url": "https://git.lix.systems/lix-project/flake-compat.git"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "https://git.lix.systems/lix-project/flake-compat.git"
|
||||
}
|
||||
},
|
||||
"flake-parts": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": [
|
||||
|
|
@ -118,16 +134,16 @@
|
|||
"flake-parts_2": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": [
|
||||
"nixvim",
|
||||
"nvf",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1754091436,
|
||||
"narHash": "sha256-XKqDMN1/Qj1DKivQvscI4vmHfDfvYR2pfuFOJiCeewM=",
|
||||
"lastModified": 1753121425,
|
||||
"narHash": "sha256-TVcTNvOeWWk1DXljFxVRp+E0tzG1LhrVjOGGoMHuXio=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "67df8c627c2c39c41dbec76a1f201929929ab0bd",
|
||||
"rev": "644e0fc48951a860279da645ba77fe4a6e814c5e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -187,24 +203,6 @@
|
|||
"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": [
|
||||
|
|
@ -256,31 +254,18 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"ixx": {
|
||||
"inputs": {
|
||||
"flake-utils": [
|
||||
"nixvim",
|
||||
"nuschtosSearch",
|
||||
"flake-utils"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nixvim",
|
||||
"nuschtosSearch",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"mnw": {
|
||||
"locked": {
|
||||
"lastModified": 1748294338,
|
||||
"narHash": "sha256-FVO01jdmUNArzBS7NmaktLdGA5qA3lUMJ4B7a05Iynw=",
|
||||
"owner": "NuschtOS",
|
||||
"repo": "ixx",
|
||||
"rev": "cc5f390f7caf265461d4aab37e98d2292ebbdb85",
|
||||
"lastModified": 1748710831,
|
||||
"narHash": "sha256-eZu2yH3Y2eA9DD3naKWy/sTxYS5rPK2hO7vj8tvUCSU=",
|
||||
"owner": "Gerg-L",
|
||||
"repo": "mnw",
|
||||
"rev": "cff958a4e050f8d917a6ff3a5624bc4681c6187d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NuschtOS",
|
||||
"ref": "v0.0.8",
|
||||
"repo": "ixx",
|
||||
"owner": "Gerg-L",
|
||||
"repo": "mnw",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
|
|
@ -506,49 +491,27 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixvim": {
|
||||
"nvf": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_3",
|
||||
"flake-parts": "flake-parts_2",
|
||||
"mnw": "mnw",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"nuschtosSearch": "nuschtosSearch",
|
||||
"systems": "systems_4"
|
||||
"systems": "systems_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1754397955,
|
||||
"narHash": "sha256-4hQT8mDSRNgPKiPdpYwr2QVJdA4FaUhOjT2lKkW8QHQ=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixvim",
|
||||
"rev": "8d47a07563120b36af149edf2273034563339a91",
|
||||
"lastModified": 1754552918,
|
||||
"narHash": "sha256-vbT+nGdMLNAeYZ1S5WBBLJTVWosGne2VRt46rqPfB2A=",
|
||||
"owner": "notashelf",
|
||||
"repo": "nvf",
|
||||
"rev": "d61de135ce174f4e04b4e509de02e1afe040a834",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "nixvim",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nuschtosSearch": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_4",
|
||||
"ixx": "ixx",
|
||||
"nixpkgs": [
|
||||
"nixvim",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1754301638,
|
||||
"narHash": "sha256-aRgzcPDd2axHFOuMlPLuzmDptUM2JU8mUL3jfgbBeyc=",
|
||||
"owner": "NuschtOS",
|
||||
"repo": "search",
|
||||
"rev": "a60091045273484c040a91f5c229ba298f8ecc27",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NuschtOS",
|
||||
"repo": "search",
|
||||
"owner": "notashelf",
|
||||
"repo": "nvf",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
|
|
@ -563,7 +526,7 @@
|
|||
"nixos-hardware": "nixos-hardware",
|
||||
"nixpkgs": "nixpkgs_6",
|
||||
"nixpkgs-stable": "nixpkgs-stable",
|
||||
"nixvim": "nixvim"
|
||||
"nvf": "nvf"
|
||||
}
|
||||
},
|
||||
"rust-overlay": {
|
||||
|
|
@ -644,21 +607,6 @@
|
|||
"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"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
|
|
|
|||
|
|
@ -15,8 +15,10 @@
|
|||
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
||||
naviterm.url = "gitlab:detoxify92/naviterm";
|
||||
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
|
||||
nixvim.url = "github:nix-community/nixvim";
|
||||
nixvim.inputs.nixpkgs.follows = "nixpkgs";
|
||||
nvf.url = "github:notashelf/nvf";
|
||||
nvf.inputs.nixpkgs.follows = "nixpkgs";
|
||||
# nixvim.url = "github:nix-community/nixvim";
|
||||
# nixvim.inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
outputs = inputs@{ self, nixpkgs, nix, nixpkgs-stable, nixos-hardware
|
||||
|
|
|
|||
|
|
@ -12,10 +12,10 @@
|
|||
./liquidprompt.nix
|
||||
./listadmin.nix
|
||||
./mail.nix
|
||||
# ./mopidy.nix
|
||||
./naviterm.nix
|
||||
./newsboat.nix
|
||||
./nixvim.nix
|
||||
./nvf.nix
|
||||
# ./nixvim.nix
|
||||
./ssh.nix
|
||||
./taskwarrior.nix
|
||||
./topgrade.nix
|
||||
|
|
|
|||
138
home/common/nvf.nix
Normal file
138
home/common/nvf.nix
Normal file
|
|
@ -0,0 +1,138 @@
|
|||
{ config, pkgs, nixvim, ... }: {
|
||||
programs.nvf = {
|
||||
enable = true;
|
||||
settings = {
|
||||
vim = {
|
||||
autocomplete.nvim-cmp.enable = true;
|
||||
dashboard.alpha = {
|
||||
enable = true;
|
||||
theme = "dashboard";
|
||||
};
|
||||
filetree.neo-tree = { enable = true; };
|
||||
comments.comment-nvim.enable = true;
|
||||
autopairs.nvim-autopairs.enable = true;
|
||||
snippets.luasnip.enable = true;
|
||||
terminal = {
|
||||
toggleterm = {
|
||||
enable = true;
|
||||
lazygit = {
|
||||
enable = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
treesitter = {
|
||||
enable = true;
|
||||
context.enable = true;
|
||||
fold = true;
|
||||
autotagHtml.enable = true;
|
||||
};
|
||||
syntaxHighlighting = true;
|
||||
keymaps = [
|
||||
{
|
||||
key = "<Tab>";
|
||||
action = ":bnext<CR>";
|
||||
mode = ["n"];
|
||||
}
|
||||
{
|
||||
key = "<leader>t";
|
||||
action = ":Telescope buffers<CR>";
|
||||
mode = ["n"];
|
||||
}
|
||||
{
|
||||
key = "<leader>T";
|
||||
action = ":terminal<CR>";
|
||||
mode = ["n"];
|
||||
}
|
||||
{
|
||||
key = "<leader>e";
|
||||
action = ":Neotree toggle<CR>";
|
||||
mode = ["n"];
|
||||
}
|
||||
{
|
||||
key = "<leader>o";
|
||||
action = ":Obsidian<CR>";
|
||||
mode = ["n"];
|
||||
}
|
||||
{
|
||||
key = "<leader>gg";
|
||||
action = ":LazyGit<CR>";
|
||||
mode = ["n"];
|
||||
}
|
||||
{
|
||||
key = "<leader>gl";
|
||||
action = ":LazyGitLog<CR>";
|
||||
mode = ["n"];
|
||||
}
|
||||
];
|
||||
git = {
|
||||
enable = true;
|
||||
gitsigns.enable = true;
|
||||
gitsigns.codeActions.enable = false;
|
||||
neogit.enable = true;
|
||||
};
|
||||
languages = {
|
||||
enableTreesitter = true;
|
||||
enableFormat = true;
|
||||
enableExtraDiagnostics = true;
|
||||
bash.enable = true;
|
||||
lua.enable = true;
|
||||
go.enable = true;
|
||||
python.enable = true;
|
||||
markdown = {
|
||||
enable = true;
|
||||
extensions.render-markdown-nvim.enable = true;
|
||||
};
|
||||
nix.enable = true;
|
||||
html.enable = true;
|
||||
};
|
||||
lsp = {
|
||||
enable = true;
|
||||
formatOnSave = true;
|
||||
lspkind.enable = false;
|
||||
lightbulb.enable = true;
|
||||
lspsaga.enable = false;
|
||||
trouble.enable = true;
|
||||
};
|
||||
options = { conceallevel = 1; };
|
||||
statusline.lualine.enable = true;
|
||||
telescope.enable = true;
|
||||
theme = {
|
||||
enable = true;
|
||||
name = "catppuccin";
|
||||
style = "mocha";
|
||||
};
|
||||
viAlias = true;
|
||||
vimAlias = true;
|
||||
notes = {
|
||||
obsidian = {
|
||||
enable = true;
|
||||
setupOpts = {
|
||||
legacy_commands = true;
|
||||
completion.nvim-cmp = true;
|
||||
templates = { subdir = "Templates"; };
|
||||
daily_notes = {
|
||||
date_format = "%Y-%m-%d";
|
||||
folder = "Daily";
|
||||
};
|
||||
workspaces = [
|
||||
{
|
||||
name = "main";
|
||||
path = "~/.obsidian/main";
|
||||
}
|
||||
{
|
||||
name = "journal";
|
||||
path = "~/.obsidian/journal";
|
||||
}
|
||||
{
|
||||
name = "food";
|
||||
path = "~/.obsidian/Food";
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -12,7 +12,8 @@
|
|||
don = {
|
||||
imports = [
|
||||
inputs.catppuccin.homeModules.catppuccin
|
||||
inputs.nixvim.homeModules.nixvim
|
||||
inputs.nvf.homeManagerModules.default
|
||||
# inputs.nixvim.homeModules.nixvim
|
||||
./common
|
||||
];
|
||||
home = {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue