mirror of
https://github.com/youwen5/neovim-flake.git
synced 2024-11-25 03:03:49 -08:00
Compare commits
No commits in common. "59189d88dbebc19cde3d1472f4e83b572107a1ed" and "11b7a7943f94daf8a35820bb8b2fa174bd0df011" have entirely different histories.
59189d88db
...
11b7a7943f
11 changed files with 88 additions and 144 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -1 +0,0 @@
|
|||
result
|
||||
|
|
@ -1,10 +1,5 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
imports = [
|
||||
./plugins
|
||||
./keymaps.nix
|
||||
./init.nix
|
||||
];
|
||||
{pkgs, ...}: {
|
||||
imports = [./plugins ./keymaps.nix ./init.nix];
|
||||
viAlias = true;
|
||||
vimAlias = true;
|
||||
withNodeJs = true;
|
||||
|
|
|
|||
|
|
@ -278,34 +278,22 @@
|
|||
{
|
||||
action = "<Plug>(YankyPutAfter)";
|
||||
key = "p";
|
||||
mode = [
|
||||
"n"
|
||||
"x"
|
||||
];
|
||||
mode = ["n" "x"];
|
||||
}
|
||||
{
|
||||
action = "<Plug>(YankyPutBefore)";
|
||||
key = "P";
|
||||
mode = [
|
||||
"n"
|
||||
"x"
|
||||
];
|
||||
mode = ["n" "x"];
|
||||
}
|
||||
{
|
||||
action = "<Plug>(YankyGPutAfter)";
|
||||
key = "gp";
|
||||
mode = [
|
||||
"n"
|
||||
"x"
|
||||
];
|
||||
mode = ["n" "x"];
|
||||
}
|
||||
{
|
||||
action = "<Plug>(YankyGPutBefore)";
|
||||
key = "gP";
|
||||
mode = [
|
||||
"n"
|
||||
"x"
|
||||
];
|
||||
mode = ["n" "x"];
|
||||
}
|
||||
{
|
||||
action = ":Telescope yank_history<CR>";
|
||||
|
|
|
|||
|
|
@ -5,24 +5,14 @@
|
|||
enable = true;
|
||||
settings = {
|
||||
autoEnableSources = true;
|
||||
experimental = {
|
||||
ghost_text = true;
|
||||
};
|
||||
experimental = {ghost_text = true;};
|
||||
performance = {
|
||||
debounce = 60;
|
||||
fetchingTimeout = 200;
|
||||
maxViewEntries = 30;
|
||||
};
|
||||
snippet = {
|
||||
expand = "luasnip";
|
||||
};
|
||||
formatting = {
|
||||
fields = [
|
||||
"kind"
|
||||
"abbr"
|
||||
"menu"
|
||||
];
|
||||
};
|
||||
snippet = {expand = "luasnip";};
|
||||
formatting = {fields = ["kind" "abbr" "menu"];};
|
||||
sources = [
|
||||
{name = "nvim_lsp";}
|
||||
{name = "emoji";}
|
||||
|
|
@ -43,12 +33,8 @@
|
|||
];
|
||||
|
||||
window = {
|
||||
completion = {
|
||||
border = "solid";
|
||||
};
|
||||
documentation = {
|
||||
border = "solid";
|
||||
};
|
||||
completion = {border = "solid";};
|
||||
documentation = {border = "solid";};
|
||||
};
|
||||
|
||||
mapping = {
|
||||
|
|
|
|||
|
|
@ -1,13 +1,3 @@
|
|||
{
|
||||
imports = [
|
||||
./lsps.nix
|
||||
./setup.nix
|
||||
./formatters.nix
|
||||
./cmp.nix
|
||||
./qol.nix
|
||||
./mini.nix
|
||||
./misc.nix
|
||||
./navigation.nix
|
||||
./treesitter.nix
|
||||
];
|
||||
imports = [./lsps.nix ./setup.nix ./formatters.nix ./cmp.nix ./qol.nix ./mini.nix ./misc.nix ./navigation.nix ./treesitter.nix];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,15 +1,14 @@
|
|||
# Code formatters
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
{pkgs, ...}: {
|
||||
extraPackages = with pkgs; [
|
||||
# TS/JS, Markdown, TOML, JSON, etc
|
||||
# TS/JS
|
||||
nodePackages.prettier
|
||||
|
||||
# Rust
|
||||
rustfmt
|
||||
|
||||
# Nix
|
||||
nixfmt-rfc-style
|
||||
alejandra
|
||||
|
||||
# Python
|
||||
black
|
||||
|
|
@ -21,7 +20,7 @@
|
|||
haskellPackages.fourmolu
|
||||
|
||||
# Misc
|
||||
# codespell
|
||||
codespell
|
||||
];
|
||||
|
||||
plugins.conform-nvim = {
|
||||
|
|
@ -34,18 +33,11 @@
|
|||
formatters_by_ft = {
|
||||
lua = ["stylua"];
|
||||
python = ["black"];
|
||||
nix = [ "nixfmt" ];
|
||||
nix = ["alejandra"];
|
||||
svelte = ["prettier"];
|
||||
rust = ["rustfmt"];
|
||||
haskell = ["fourmolu"];
|
||||
toml = [ "prettier" ];
|
||||
json = [ "prettier" ];
|
||||
markdown = [ "prettier" ];
|
||||
yaml = [ "prettier" ];
|
||||
html = [ "prettier" ];
|
||||
javascript = [ "prettier" ];
|
||||
typescript = [ "prettier" ];
|
||||
# "*" = ["codespell"];
|
||||
"*" = ["codespell"];
|
||||
"_" = ["trim_whitespace"];
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
# LSP setup
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
{pkgs, ...}: {
|
||||
extraPackages = with pkgs; [
|
||||
rust-analyzer
|
||||
lua-language-server
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
# Quality of life plugins
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
{pkgs, ...}: {
|
||||
extraPackages = with pkgs; [
|
||||
ripgrep
|
||||
yazi
|
||||
|
|
|
|||
50
flake.lock
50
flake.lock
|
|
@ -40,11 +40,11 @@
|
|||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1725234343,
|
||||
"narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=",
|
||||
"lastModified": 1722555600,
|
||||
"narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "567b938d64d4b4112ee253b9274472dc3a346eb6",
|
||||
"rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -109,11 +109,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1724857454,
|
||||
"narHash": "sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk=",
|
||||
"lastModified": 1724440431,
|
||||
"narHash": "sha256-9etXEOUtzeMgqg1u0wp+EdwG7RpmrAZ2yX516bMj2aE=",
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"rev": "4509ca64f1084e73bc7a721b20c669a8d4c5ebe6",
|
||||
"rev": "c8a54057aae480c56e28ef3e14e4960628ac495b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -173,11 +173,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1724561770,
|
||||
"narHash": "sha256-zv8C9RNa86CIpyHwPIVO/k+5TfM8ZbjGwOOpTe1grls=",
|
||||
"lastModified": 1724469941,
|
||||
"narHash": "sha256-+U5152FwmDD9EUOiFi5CFxCK6/yFESyDei9jEIlmUtI=",
|
||||
"owner": "lnl7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "ac5694a0b855a981e81b4d9f14052e3ff46ca39e",
|
||||
"rev": "ea319a737939094b48fda9063fa3201ef2479aac",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -188,11 +188,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1725103162,
|
||||
"narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=",
|
||||
"lastModified": 1724224976,
|
||||
"narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b",
|
||||
"rev": "c374d94f1536013ca8e92341b540eba4c22f9c62",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -204,14 +204,14 @@
|
|||
},
|
||||
"nixpkgs-lib": {
|
||||
"locked": {
|
||||
"lastModified": 1725233747,
|
||||
"narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=",
|
||||
"lastModified": 1722555339,
|
||||
"narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz"
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz"
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz"
|
||||
}
|
||||
},
|
||||
"nixvim": {
|
||||
|
|
@ -229,11 +229,11 @@
|
|||
"treefmt-nix": "treefmt-nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1725269752,
|
||||
"narHash": "sha256-AtZ9fSo2q6UeMoDy6kw6solM1B+BCABbKgCyUclsctg=",
|
||||
"lastModified": 1724528976,
|
||||
"narHash": "sha256-5W13nD/5ySIsxSvDqXHlj4bg2F3tNcYGKCGudWzpNzw=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixvim",
|
||||
"rev": "18b7597e6ca4b98a6c3f20ddc9783165d5998018",
|
||||
"rev": "8234ee85eaa2c8b7f2c74f5b4cdf02c4965b07fc",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -251,11 +251,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1724584782,
|
||||
"narHash": "sha256-7FfHv7b1jwMPSu9SPY9hdxStk8E6EeSwzqdvV69U4BM=",
|
||||
"lastModified": 1723969429,
|
||||
"narHash": "sha256-BuewfNEXEf11MIkJY+uvWsdLu1dIvgJqntWChvNdALg=",
|
||||
"owner": "NuschtOS",
|
||||
"repo": "search",
|
||||
"rev": "5a08d691de30b6fc28d58ce71a5e420f2694e087",
|
||||
"rev": "a05d1805f2a2bc47d230e5e92aecbf69f784f3d0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -294,11 +294,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1724833132,
|
||||
"narHash": "sha256-F4djBvyNRAXGusJiNYInqR6zIMI3rvlp6WiKwsRISos=",
|
||||
"lastModified": 1724338379,
|
||||
"narHash": "sha256-kKJtaiU5Ou+e/0Qs7SICXF22DLx4V/WhG1P6+k4yeOE=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "3ffd842a5f50f435d3e603312eefa4790db46af5",
|
||||
"rev": "070f834771efa715f3e74cd8ab93ecc96fabc951",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
14
flake.nix
14
flake.nix
|
|
@ -8,8 +8,7 @@
|
|||
flake-parts.url = "github:hercules-ci/flake-parts";
|
||||
};
|
||||
|
||||
outputs =
|
||||
{
|
||||
outputs = {
|
||||
nixvim,
|
||||
flake-parts,
|
||||
...
|
||||
|
|
@ -22,13 +21,11 @@
|
|||
"aarch64-darwin"
|
||||
];
|
||||
|
||||
perSystem =
|
||||
{
|
||||
perSystem = {
|
||||
pkgs,
|
||||
system,
|
||||
...
|
||||
}:
|
||||
let
|
||||
}: let
|
||||
nixvimLib = nixvim.lib.${system};
|
||||
nixvim' = nixvim.legacyPackages.${system};
|
||||
nixvimModule = {
|
||||
|
|
@ -36,9 +33,8 @@
|
|||
module = import ./config;
|
||||
};
|
||||
nvim = nixvim'.makeNixvimWithModule nixvimModule;
|
||||
in
|
||||
{
|
||||
formatter = pkgs.nixfmt-rfc-style;
|
||||
in {
|
||||
formatter = pkgs.alejandra;
|
||||
checks = {
|
||||
default = nixvimLib.check.mkTestDerivationFromNixvimModule nixvimModule;
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue