cleanup nvim merge and general janitorial work

flake.nix

@@ -4,10 +4,6 @@
     nixos-hardware.url = "github:NixOS/nixos-hardware";
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.11";
-    pre-commit-hooks = {
-      url = "github:cachix/pre-commit-hooks.nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     sops-nix = {
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -24,14 +20,6 @@
       url = "github:nix-community/home-manager/master";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    # nvim = {
-    #   url = "github:iofq/nvim.nix";
-    #   url = "path:/home/e/dev/nvim.nix";
-    # };
-    nvim = {
-      url = "github:iofq/nvim.nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     deploy-rs = {
       url = "github:serokell/deploy-rs";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -41,80 +29,69 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     determinate.url = "https://flakehub.com/f/DeterminateSystems/determinate/*";
-    systems.url = "github:nix-systems/default";
     jj-vine = {
       url = "github:abrenneke/jj-vine";
       flake = false;
     };
+    dart.url = "github:iofq/dart.nvim";
+    neovim-nightly-overlay = {
+      url = "github:nix-community/neovim-nightly-overlay";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     llm-agents.url = "github:numtide/llm-agents.nix";
+    jj-nvim = {
+      url = "github:NicolasGB/jj.nvim";
+      flake = false;
+    };
   };
   outputs =
     {
       self,
       nixpkgs,
-      systems,
       ...
     }@inputs:
     let
       attrs = {
         username = "e";
       };
-      system = "x86_64-linux";
-      pkgs = import nixpkgs {
-        inherit system;
-        config.allowUnfree = true;
-        overlays = [
-          inputs.nvim.overlays.default
-          inputs.llm-agents.overlays.default
-          inputs.self.overlays.stable-packages
-        ];
-      };
-      eachSystem = f: nixpkgs.lib.genAttrs (import systems) (system: f nixpkgs.legacyPackages.${system});
-      treefmtEval = eachSystem (pkgs: inputs.treefmt-nix.lib.evalModule pkgs ./treefmt.nix);
+      systems = [
+        "aarch64-linux"
+        "x86_64-linux"
+        "aarch64-darwin"
+        "x86_64-darwin"
+      ];
+      mkPkgs =
+        system:
+        import nixpkgs {
+          inherit system;
+          config.allowUnfree = true;
+          overlays = [
+            inputs.neovim-nightly-overlay.overlays.default
+            inputs.llm-agents.overlays.default
+            inputs.self.overlays.stable-packages
+            (
+              final: prev:
+              import ./pkgs {
+                inherit inputs;
+                pkgs = prev;
+              }
+            )
+          ];
+        };
+      eachSystem = f: nixpkgs.lib.genAttrs systems (system: f (mkPkgs system));
+      treefmtEval = eachSystem (
+        pkgs: (inputs.treefmt-nix.lib.evalModule pkgs ./treefmt.nix).config.build.wrapper
+      );
     in
     {
-      packages = eachSystem (pkgs: import ./pkgs { inherit inputs pkgs; });
       overlays = import ./overlays { inherit inputs; };
-      formatter = eachSystem (pkgs: treefmtEval.${pkgs.system}.config.build.wrapper);
-      nixosConfigurations = import ./nixos {
-        inherit
-          inputs
-          pkgs
-          attrs
-          system
-          ;
-      };
-      homeConfigurations = import ./home-manager { inherit inputs pkgs attrs; };
-      checks = {
-        pre-commit-check = inputs.pre-commit-hooks.lib.${system}.run {
-          src = inputs.self;
-          hooks = {
-            treefmt.enable = true;
-            treefmt.package = treefmtEval.${system}.config.build.wrapper;
-          };
-        };
-      };
-      deploy.nodes = import ./fleet.nix { inherit inputs self system; };
-      devShells.${system}.default = pkgs.mkShell {
-        inherit (self.checks.pre-commit-check) shellHook;
-        buildInputs = with pkgs; [
-          age
-          deploy-rs
-          git
-          home-manager
-          k9s
-          kubectl
-          kubeseal
-          sops
-          ssh-to-age
-          treefmtEval.${system}.config.build.wrapper
-          velero
-          (pkgs.writeShellScriptBin "deploy-k8s" ''
-            cd $(git rev-parse --show-toplevel)
-            kubectl config use-context lab
-            kubectl apply -k ./clusters/lab
-          '')
-        ];
-      };
+      nixosConfigurations = import ./nixos { inherit inputs mkPkgs attrs; };
+      homeConfigurations = import ./home-manager { inherit inputs mkPkgs attrs; };
+      deploy.nodes = import ./fleet.nix { inherit inputs self; };
+      formatter = eachSystem (pkgs: treefmtEval.${pkgs.system});
+      packages = eachSystem (pkgs: import ./pkgs { inherit inputs pkgs; });
+      devShells = eachSystem (pkgs: {
+        default = import ./shell.nix { inherit pkgs; };
+      });
     };
 }