alejandro-angulo/nixvim-config
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: alejandro-angulo:ddb857e6acfead07a9bdbf591cac148f88e291b3
Branches Tags
alejandro-angulo:main
..
compare: alejandro-angulo:7d69922dc91e7d82a8e925e316adad7c3ff9f307
Branches Tags
alejandro-angulo:main

No commits in common. "ddb857e6acfead07a9bdbf591cac148f88e291b3" and "7d69922dc91e7d82a8e925e316adad7c3ff9f307" have entirely different histories.
ddb857e6ac ... 7d69922dc9

8 changed files with 86 additions and 100 deletions
Show stats Expand all files Collapse all files

11
config/default.nix
View file

@ -1,5 +1,4 @@
{ ... }: {...}: {
{
# Import all your configuration modules here # Import all your configuration modules here
# imports = [./bufferline.nix]; # imports = [./bufferline.nix];
imports = [ imports = [
@ -45,13 +44,13 @@
autoCmd = [ autoCmd = [
{ {
event = [ "BufEnter" ]; event = ["BufEnter"];
pattern = [ "*" ]; pattern = ["*"];
command = "setlocal cursorline"; command = "setlocal cursorline";
} }
{ {
event = [ "BufLeave" ]; event = ["BufLeave"];
pattern = [ "*" ]; pattern = ["*"];
command = "setlocal nocursorline"; command = "setlocal nocursorline";
} }
]; ];

16
config/plugins/cmp.nix
View file

@ -2,9 +2,7 @@
plugins.cmp = { plugins.cmp = {
enable = true; enable = true;
settings = { settings = {
completion = { completion = {keyword_length = 2;};
keyword_length = 2;
};
mapping = { mapping = {
"<C-n>" = "cmp.mapping.select_next_item()"; "<C-n>" = "cmp.mapping.select_next_item()";
@ -24,12 +22,12 @@
''; '';
sources = [ sources = [
{ name = "nvim_lsp"; } {name = "nvim_lsp";}
{ name = "buffer"; } {name = "buffer";}
{ name = "cmdline"; } {name = "cmdline";}
{ name = "cmp-clippy"; } {name = "cmp-clippy";}
{ name = "luasnip"; } {name = "luasnip";}
{ name = "path"; } {name = "path";}
]; ];
}; };
}; };

5
config/plugins/lsp.nix
View file

@ -1,5 +1,4 @@
{ pkgs, ... }: {pkgs, ...}: {
{
plugins.lsp = { plugins.lsp = {
enable = true; enable = true;
@ -75,7 +74,7 @@
# nix # nix
nixd = { nixd = {
enable = true; enable = true;
settings.formatting.command = [ "${pkgs.nixfmt-rfc-style}/bin/nixfmt" ]; settings.formatting.command = ["${pkgs.alejandra}/bin/alejandra"];
}; };
}; };
}; };

9
config/plugins/rhubarb.nix
View file

@ -1,17 +1,16 @@
{ pkgs, ... }: {pkgs, ...}: {
{ extraPlugins = with pkgs.vimPlugins; [rhubarb];
extraPlugins = with pkgs.vimPlugins; [ rhubarb ];
keymaps = [ keymaps = [
{ {
action = "<cmd>GBrowse<CR>"; action = "<cmd>GBrowse<CR>";
key = "<leader>bro"; key = "<leader>bro";
mode = [ "n" ]; mode = ["n"];
} }
{ {
action = ":GBrowse<CR>"; action = ":GBrowse<CR>";
key = "<leader>bro"; key = "<leader>bro";
mode = [ "v" ]; mode = ["v"];
} }
]; ];
} }

8
config/plugins/telescope.nix
View file

@ -11,12 +11,8 @@
}; };
settings.defaults.mappings = { settings.defaults.mappings = {
"i" = { "i" = {
"<C-n>" = { "<C-n>" = {__raw = "require('telescope.actions').cycle_history_next";};
__raw = "require('telescope.actions').cycle_history_next"; "<C-p>" = {__raw = "require('telescope.actions').cycle_history_prev";};
};
"<C-p>" = {
__raw = "require('telescope.actions').cycle_history_prev";
};
}; };
}; };
}; };

3
config/plugins/vim-obsession.nix
View file

@ -1,5 +1,4 @@
{ pkgs, ... }: {pkgs, ...}: {
{
extraPlugins = [ extraPlugins = [
(pkgs.vimUtils.buildVimPlugin { (pkgs.vimUtils.buildVimPlugin {
name = "vim-obsession"; name = "vim-obsession";

68
flake.lock
View file

@ -40,11 +40,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1733312601, "lastModified": 1730504689,
"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "rev": "506278e768c2a08bec68eb62932193e341f55c90",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -61,11 +61,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733312601, "lastModified": 1730504689,
"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "rev": "506278e768c2a08bec68eb62932193e341f55c90",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -109,11 +109,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1734797603, "lastModified": 1731363552,
"narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=", "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498", "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -152,11 +152,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1734862405, "lastModified": 1731604581,
"narHash": "sha256-bXZJvUMJ2A6sIpYcCUAGjYCD5UDzmpmQCdmJSkPhleU=", "narHash": "sha256-Qq2YZZaDTB3FZLWU/Hgh1uuWlUBl3cMLGB99bm7rFUM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "cb27edb5221d2f2920a03155f8becc502cf60e35", "rev": "1d0862ee2d7c6f6cd720d6f32213fa425004be10",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -201,11 +201,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733570843, "lastModified": 1731642829,
"narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=", "narHash": "sha256-vG+O2RZRzYZ8BUMNNJ+BLSj6PUoGW7taDQbp6QNJ3Xo=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "a35b08d09efda83625bef267eb24347b446c80b8", "rev": "f86f158efd4bab8dce3e207e4621f1df3a760b7a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -216,11 +216,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1735291276, "lastModified": 1731676054,
"narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "634fd46801442d760e09493a794c4f15db2d0cbb", "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -232,23 +232,23 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1733096140, "lastModified": 1730504152,
"narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=", "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=",
"type": "tarball", "type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1734649271, "lastModified": 1731319897,
"narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", "rev": "dc460ec76cbff0e66e269457d7b728432263166c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -271,11 +271,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1735343514, "lastModified": 1731780782,
"narHash": "sha256-CZGsEGSRN5PQnf3ciNFdlpCDorvyo6+YQ1cPQ1ebVxk=", "narHash": "sha256-CG3rcxcZEViYEUTAXatqXrW0Gn9tQvydF+lLYH+0VPA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "0307cdf297cd6bdafd55a66d69c54b55c482edf8", "rev": "9d99d7cfdbd7f94da9571a4d7bbb9de185241935",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -294,11 +294,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733773348, "lastModified": 1731582522,
"narHash": "sha256-Y47y+LesOCkJaLvj+dI/Oa6FAKj/T9sKVKDXLNsViPw=", "narHash": "sha256-1w6aM4bG5cl2E4jHLPnMKkrUO4tY1jUX1NI6/RwJN7Y=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "search", "repo": "search",
"rev": "3051be7f403bff1d1d380e4612f0c70675b44fc9", "rev": "13300b2297c51368e0892c3ebe220f688014fe15",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -337,11 +337,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1734704479, "lastModified": 1730321837,
"narHash": "sha256-MMi74+WckoyEWBRcg/oaGRvXC9BVVxDZNRMpL+72wBI=", "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "65712f5af67234dad91a5a4baee986a8b62dbf8f", "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc",
"type": "github" "type": "github"
}, },
"original": { "original": {

66
flake.nix
View file

@ -7,13 +7,12 @@
flake-parts.url = "github:hercules-ci/flake-parts"; flake-parts.url = "github:hercules-ci/flake-parts";
}; };
outputs = outputs = {
{ nixvim,
nixvim, flake-parts,
flake-parts, ...
... } @ inputs:
}@inputs: flake-parts.lib.mkFlake {inherit inputs;} {
flake-parts.lib.mkFlake { inherit inputs; } {
systems = [ systems = [
"x86_64-linux" "x86_64-linux"
"aarch64-linux" "aarch64-linux"
@ -21,36 +20,33 @@
"aarch64-darwin" "aarch64-darwin"
]; ];
perSystem = perSystem = {
{ pkgs,
pkgs, system,
system, ...
... }: let
}: nixvimLib = nixvim.lib.${system};
let nixvim' = nixvim.legacyPackages.${system};
nixvimLib = nixvim.lib.${system}; nixvimModule = {
nixvim' = nixvim.legacyPackages.${system}; inherit pkgs;
nixvimModule = { module = import ./config; # import the module directly
inherit pkgs; # You can use `extraSpecialArgs` to pass additional arguments to your module files
module = import ./config; # import the module directly extraSpecialArgs = {
# You can use `extraSpecialArgs` to pass additional arguments to your module files # inherit (inputs) foo;
extraSpecialArgs = {
# inherit (inputs) foo;
};
};
nvim = nixvim'.makeNixvimWithModule nixvimModule;
in
{
checks = {
# Run `nix flake check .` to verify that your config is not broken
default = nixvimLib.check.mkTestDerivationFromNixvimModule nixvimModule;
};
packages = {
# Lets you run `nix run .` to start nixvim
default = nvim;
}; };
}; };
nvim = nixvim'.makeNixvimWithModule nixvimModule;
in {
checks = {
# Run `nix flake check .` to verify that your config is not broken
default = nixvimLib.check.mkTestDerivationFromNixvimModule nixvimModule;
};
packages = {
# Lets you run `nix run .` to start nixvim
default = nvim;
};
};
} }
// { // {
hydraJobs = { hydraJobs = {