Compare commits

..

No commits in common. "0365f6f7cb427b9b2d5d85a4f12f2bb8c4dc8f09" and "edb6c4c795ab3938f54b715d4fa19836bcd8961a" have entirely different histories.

3 changed files with 30 additions and 94 deletions

View file

@ -144,16 +144,6 @@
desc = "Vertical Split"; desc = "Vertical Split";
}; };
} }
# zen mode
{
mode = "n";
action = "<cmd>ZenMode<cr>";
key = "<Leader>uz";
options = {
desc = "Go Zen Mode!";
};
}
]; ];
plugins.fzf-lua.keymaps = { plugins.fzf-lua.keymaps = {

View file

@ -4,11 +4,13 @@
pkgs, pkgs,
... ...
}: }:
{ {
plugins = { plugins = {
lsp = { lsp = {
enable = true; enable = true;
servers = { servers = {
basedpyright.enable = true; basedpyright.enable = true;
asm_lsp.enable = true; asm_lsp.enable = true;
gopls.enable = true; gopls.enable = true;
@ -64,56 +66,9 @@
enable = true; enable = true;
}; };
blink-ripgrep.enable = true; cmp = {
blink-cmp = {
enable = true; enable = true;
setupLspCapabilities = true; autoEnableSources = true;
settings = {
keymap = {
"<CR>" = [
"accept"
"fallback"
];
"<Tab>" = [
"select_next"
"snippet_forward"
"fallback"
];
"<S-Tab>" = [
"select_prev"
"snippet_backward"
"fallback"
];
};
signature = {
enabled = true;
window = {
border = "rounded";
};
};
sources = {
default = [
"buffer"
"lsp"
"path"
"snippets"
"ripgrep"
];
providers = {
lsp.score_offset = 4;
ripgrep = {
name = "ripgrep";
module = "blink-ripgrep";
score_offset = 1;
};
};
};
};
}; };
barbar.enable = true; barbar.enable = true;
@ -141,6 +96,10 @@
enable = true; enable = true;
}; };
nvim-autopairs = {
enable = true;
};
cord = { cord = {
enable = true; enable = true;
}; };
@ -148,10 +107,7 @@
chadtree = { chadtree = {
enable = true; enable = true;
view.openDirection = "right"; view.openDirection = "right";
keymap.openFileFolder.primary = [ keymap.openFileFolder.collapse = [ "l" ];
"l"
"<enter>"
];
}; };
fzf-lua = { fzf-lua = {
@ -187,8 +143,6 @@
lazygit.enable = true; lazygit.enable = true;
mini.enable = true; mini.enable = true;
mini-pairs.enable = true;
mini-starter.enable = true;
dap = { dap = {
enable = true; enable = true;
@ -221,13 +175,5 @@
todo-comments = { todo-comments = {
enable = true; enable = true;
}; };
zen-mode = {
enable = true;
};
indent-blankline.enable = true;
neorg = {
enable = true;
};
}; };
} }

42
flake.lock generated
View file

@ -5,11 +5,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1751413152, "lastModified": 1748821116,
"narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", "narHash": "sha256-F82+gS044J1APL0n4hH50GYdPRv/5JWm34oCJYmVKdE=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", "rev": "49f0870db23e8c1ca0b5259734a02cd9e1e371a1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -26,11 +26,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1751413152, "lastModified": 1743550720,
"narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", "rev": "c621e8422220273271f52058f618c94e405bb0f5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -87,11 +87,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1751949589, "lastModified": 1748792178,
"narHash": "sha256-mgFxAPLWw0Kq+C8P3dRrZrOYEQXOtKuYVlo9xvPntt8=", "narHash": "sha256-BHmgfHlCJVNisJShVaEmfDIr/Ip58i/4oFGlD1iK6lk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9b008d60392981ad674e04016d25619281550a9d", "rev": "5929de975bcf4c7c8d8b5ca65c8cd9ef9e44523e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -103,11 +103,11 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1751159883, "lastModified": 1748740939,
"narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=", "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "14a40a1d7fb9afa4739275ac642ed7301a9ba1ab", "rev": "656a64127e9d791a334452c6b6606d17539476e2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -118,11 +118,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1751786137, "lastModified": 1748406211,
"narHash": "sha256-lIlUKVGCGsh0Q2EA7/6xRtKUZjaQ/ur8uUyY+MynHXQ=", "narHash": "sha256-B3BsCRbc+x/d0WiG1f+qfSLUy+oiIfih54kalWBi+/M=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ceb24d94c6feaa4e8737a8e2bd3cf71c3a7eaaa0", "rev": "3d1f29646e4b57ed468d60f9d286cde23a8d1707",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -140,11 +140,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1752099138, "lastModified": 1748877332,
"narHash": "sha256-riX+IkcFhurR1M1vMEp2cdzraxsZEZl+XbpFWcgz3lU=", "narHash": "sha256-pcAqUaMtxR1l//kugWqclFXKNQKCJQz9zO61JySGP7A=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "2e24f8e62bc5da7e1ce81e2f2ff7d9e1f51350b7", "rev": "65d35db5cac209cf5acd3dfd40aee98840cfc127",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -163,11 +163,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1749730855, "lastModified": 1748298102,
"narHash": "sha256-L3x2nSlFkXkM6tQPLJP3oCBMIsRifhIDPMQQdHO5xWo=", "narHash": "sha256-PP11GVwUt7F4ZZi5A5+99isuq39C59CKc5u5yVisU/U=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "search", "repo": "search",
"rev": "8dfe5879dd009ff4742b668d9c699bc4b9761742", "rev": "f8a1c221afb8b4c642ed11ac5ee6746b0fe1d32f",
"type": "github" "type": "github"
}, },
"original": { "original": {