From 2849e3683e831e6ba08719b898fc66ee6a7987c5 Mon Sep 17 00:00:00 2001 From: Aria Nolan Date: Sat, 10 Feb 2024 10:23:56 -0500 Subject: [PATCH] neovim --- flake.lock | 187 ++++++++++++++++++++++++++++++ flake.nix | 6 + users/tacocat/home.nix | 2 +- users/tacocat/neovim/default.nix | 43 +++++++ users/tacocat/programs/vscode.nix | 1 - 5 files changed, 237 insertions(+), 2 deletions(-) create mode 100644 users/tacocat/neovim/default.nix diff --git a/flake.lock b/flake.lock index 955eefd..23c7bad 100644 --- a/flake.lock +++ b/flake.lock @@ -64,6 +64,43 @@ "type": "github" } }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1706830856, + "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems_2" @@ -82,6 +119,46 @@ "type": "github" } }, + "flake-utils_2": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "nixvim", + "pre-commit-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1703887061, + "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "helix": { "inputs": { "crane": "crane", @@ -145,6 +222,48 @@ "type": "github" } }, + "home-manager_3": { + "inputs": { + "nixpkgs": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1706955260, + "narHash": "sha256-W3y0j77IDVbmbajudHoUr46RpswujUCl+D5Vru53UsI=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "880d9bc2110f7cae59698f715b8ca42cdc53670c", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "nix-darwin": { + "inputs": { + "nixpkgs": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1706833576, + "narHash": "sha256-w7BL0EWRts+nD1lbLECIuz6fRzmmV+z8oWwoY7womR0=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "bdbae6ecff8fcc322bf6b9053c0b984912378af7", + "type": "github" + }, + "original": { + "owner": "lnl7", + "repo": "nix-darwin", + "type": "github" + } + }, "nixos-hardware": { "locked": { "lastModified": 1707211557, @@ -209,6 +328,30 @@ "type": "github" } }, + "nixvim": { + "inputs": { + "flake-parts": "flake-parts", + "home-manager": "home-manager_3", + "nix-darwin": "nix-darwin", + "nixpkgs": [ + "nixpkgs" + ], + "pre-commit-hooks": "pre-commit-hooks" + }, + "locked": { + "lastModified": 1707516359, + "narHash": "sha256-uDIEvKg0LOozL93UluLu0atEtP711E84+WVXsIfJ+LE=", + "owner": "nix-community", + "repo": "nixvim", + "rev": "92c623a436604b548b295536ba8888dd5e184a84", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixvim", + "type": "github" + } + }, "nur": { "locked": { "lastModified": 1707440758, @@ -224,6 +367,34 @@ "type": "github" } }, + "pre-commit-hooks": { + "inputs": { + "flake-compat": "flake-compat", + "flake-utils": "flake-utils_2", + "gitignore": "gitignore", + "nixpkgs": [ + "nixvim", + "nixpkgs" + ], + "nixpkgs-stable": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1706424699, + "narHash": "sha256-Q3RBuOpZNH2eFA1e+IHgZLAOqDD9SKhJ/sszrL8bQD4=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "7c54e08a689b53c8a1e5d70169f2ec9e2a68ffaf", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, "root": { "inputs": { "agenix": "agenix", @@ -231,6 +402,7 @@ "home-manager": "home-manager_2", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_3", + "nixvim": "nixvim", "nur": "nur" } }, @@ -288,6 +460,21 @@ "repo": "default", "type": "github" } + }, + "systems_3": { + "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", diff --git a/flake.nix b/flake.nix index 81cfcd5..f8372d8 100644 --- a/flake.nix +++ b/flake.nix @@ -24,6 +24,10 @@ nixos-hardware.url = "github:NixOs/nixos-hardware/master"; nur.url = "github:nix-community/nur"; agenix.url = "github:ryantm/agenix"; + nixvim = { + url = "github:nix-community/nixvim"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; # pass in the urls defined above @@ -36,6 +40,7 @@ nixos-hardware, nur, agenix, + nixvim, ... } @ inputs: let system = "x86_64-linux"; @@ -53,6 +58,7 @@ imports = [ toplevel agenix.homeManagerModules.default + nixvim.homeManagerModules.nixvim ]; }; } diff --git a/users/tacocat/home.nix b/users/tacocat/home.nix index 90ff771..9673b4d 100644 --- a/users/tacocat/home.nix +++ b/users/tacocat/home.nix @@ -7,6 +7,7 @@ ./wayland ./email.nix ./lf + ./neovim ]; home = { @@ -38,7 +39,6 @@ vcv-rack tor-browser discord - neovim libreoffice notify-desktop texlive.combined.scheme-medium diff --git a/users/tacocat/neovim/default.nix b/users/tacocat/neovim/default.nix new file mode 100644 index 0000000..49e10bf --- /dev/null +++ b/users/tacocat/neovim/default.nix @@ -0,0 +1,43 @@ +{pkgs, ...}: { + programs.nixvim = { + enable = true; + colorschemes.base16 = { + enable = true; + colorscheme = "solarized-dark"; + setUpBar = false; + }; + clipboard = { + providers.wl-copy.enable = true; + register = "unnamedplus"; + }; + options = { + number = true; + relativenumber = true; + tabstop = 2; + shiftwidth = 2; + expandtab = false; + scrolloff = 5; + autoindent = true; + copyindent = true; + }; + plugins = { + lightline = { + enable = true; + # colorscheme = "16color"; + }; + gitgutter = { + enable = true; + # signs = { + # added = "█|"; + # modified = "█⫶"; + # modifiedRemoved = "█▟"; + # removed = "█▁"; + # removedFirstLine = "█▔"; + # }; + }; + }; + extraPlugins = with pkgs.vimPlugins; [ + vim-airline-themes + ]; + }; +} diff --git a/users/tacocat/programs/vscode.nix b/users/tacocat/programs/vscode.nix index bb22687..e0b53b2 100644 --- a/users/tacocat/programs/vscode.nix +++ b/users/tacocat/programs/vscode.nix @@ -6,7 +6,6 @@ enableUpdateCheck = false; extensions = with pkgs.vscode-extensions; [ ritwickdey.liveserver - asvetliakov.vscode-neovim ]; userSettings = { "extensions.experimental.affinity" = {