From 028df1fd35a31754a07d2e68f4e1b960faf74aae Mon Sep 17 00:00:00 2001 From: biscuit Date: Tue, 3 Jun 2025 03:55:42 -0500 Subject: [PATCH] NEO added --- custom/neovim/config/default.nix | 7 +++++ custom/neovim/flake.nix | 49 ++++++++++++++++++++++++++++++++ info.nix | 1 + 3 files changed, 57 insertions(+) create mode 100644 custom/neovim/config/default.nix create mode 100644 custom/neovim/flake.nix diff --git a/custom/neovim/config/default.nix b/custom/neovim/config/default.nix new file mode 100644 index 0000000..2f30e11 --- /dev/null +++ b/custom/neovim/config/default.nix @@ -0,0 +1,7 @@ +let + files = builtins.readDir ./.; + nixFiles = builtins.filter (name: name != "default.nix" && builtins.match ".*\\.nix" name != null) (builtins.attrName files); + imports = map (name: ./. + "/${name}") nixFiles; +in { + imports = imports; +} diff --git a/custom/neovim/flake.nix b/custom/neovim/flake.nix new file mode 100644 index 0000000..895b8bc --- /dev/null +++ b/custom/neovim/flake.nix @@ -0,0 +1,49 @@ +{ + description = "A nixvim configuration"; + inputs = { + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixvim.url = "github:nix-community/nixvim"; + flake-parts.url = "github:hercules-ci/flake-parts"; + }; + outputs = { + nixvim, + flake-parts, + rust-overlay, + ... + } @ inputs: + flake-parts.lib.mkFlake {inherit inputs;} { + systems = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; + perSystem = {system, ...}: let + overlays = [(import rust-overlay)]; + nixvimLib = nixvim.lib.${system}; + nixvim' = nixvim.legacyPackages.${system}; + baseNixvimModule = { + inherit pkgs; + module = {pkgs, ...}: { + imports = [./config]; + extraPackages = with pkgs; [sops]; + }; + extraSpecialArgs = {}; + }; + pkgs = import inputs.nixpkgs { + inherit system overlays; + config.allowUnfree = true; + }; + baseNvim = nixvim'.makeNixvimWithModule baseNixvimModule; + in { + checks = { + # Run `nix flake check .` to verify that your config is not broken + default = nixvimLib.check.mkTestDerivationFromNixvimModule baseNixvimModule; + }; + packages = { + # Lets you run `nix run .` to start nixvim + default = baseNvim; + }; + }; + }; +} diff --git a/info.nix b/info.nix index 632b7c0..aa0e832 100644 --- a/info.nix +++ b/info.nix @@ -15,6 +15,7 @@ upd = "sudo nixos-rebuild switch --flake ~/Nixos/#desktop"; hupd = "home-manager switch --flake ~/Nixos/#desktop"; agu = "pkill gjs & ags run ~/Nixos/pkgs/ags/biscuit/app.ts &"; + neo = "nix run github:fred-drake/neovim#"; }; touchpadSupport = false;