diff --git a/flake.lock b/flake.lock index 0f69426..8d11d7c 100644 --- a/flake.lock +++ b/flake.lock @@ -296,6 +296,7 @@ "gitignore": { "inputs": { "nixpkgs": [ + "nixvim", "pre-commit-hooks", "nixpkgs" ] @@ -394,27 +395,6 @@ "type": "github" } }, - "nix-darwin": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1713946171, - "narHash": "sha256-lc75rgRQLdp4Dzogv5cfqOg6qYc5Rp83oedF2t0kDp8=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "230a197063de9287128e2c68a7a4b0cd7d0b50a7", - "type": "github" - }, - "original": { - "owner": "lnl7", - "repo": "nix-darwin", - "type": "github" - } - }, "nixos-hardware": { "locked": { "lastModified": 1714746424, @@ -445,22 +425,6 @@ "type": "indirect" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1710695816, - "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "614b4613980a522ba49f0d194531beddbb7220d3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, "nixvim": { "inputs": { "devshell": "devshell", @@ -469,13 +433,11 @@ "home-manager": [ "home-manager" ], - "nix-darwin": "nix-darwin", + "nix-darwin": [], "nixpkgs": [ "nixpkgs" ], - "pre-commit-hooks": [ - "pre-commit-hooks" - ] + "pre-commit-hooks": "pre-commit-hooks" }, "locked": { "lastModified": 1714730761, @@ -497,9 +459,13 @@ "flake-utils": "flake-utils_3", "gitignore": "gitignore", "nixpkgs": [ + "nixvim", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs-stable": [ + "nixvim", + "nixpkgs" + ] }, "locked": { "lastModified": 1714478972, @@ -524,7 +490,6 @@ "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "nixvim": "nixvim", - "pre-commit-hooks": "pre-commit-hooks", "stylix": "stylix" } }, diff --git a/flake.nix b/flake.nix index 40ea527..af32c8e 100644 --- a/flake.nix +++ b/flake.nix @@ -19,7 +19,8 @@ inputs.nixvim.url = "github:nix-community/nixvim"; inputs.nixvim.inputs.nixpkgs.follows = "nixpkgs"; inputs.nixvim.inputs.home-manager.follows = "home-manager"; - inputs.nixvim.inputs.pre-commit-hooks.follows = "pre-commit-hooks"; + # disable MacOS stuff + inputs.nixvim.inputs.nix-darwin.follows = ""; # WARN: Flakehub is outdated (39 days out of date) # inputs.home-manager.url = "https://flakehub.com/f/nix-community/home-manager/0.1.*.tar.gz"; @@ -31,9 +32,6 @@ inputs.neovim-flake.url = "github:neovim/neovim?dir=contrib"; inputs.neovim-flake.inputs.nixpkgs.follows = "nixpkgs"; - inputs.pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix"; - inputs.pre-commit-hooks.inputs.nixpkgs.follows = "nixpkgs"; - # Flake outputs that other flakes can use outputs = { @@ -42,7 +40,6 @@ stylix, home-manager, nixos-hardware, - pre-commit-hooks, jpassmenu, audiomenu, nixvim, @@ -74,15 +71,8 @@ pkgs = import nixpkgs { inherit system overlays; }; module = ./nvim/nixvim.nix; }; - pre-commit-check = pre-commit-hooks.lib.${system}.run { - src = builtins.path { - path = ./.; - name = "configuration.nix"; - }; - hooks.typos.enable = true; - hooks.nixfmt.enable = true; - hooks.nixfmt.package = pkgs.nixfmt-rfc-style; - }; + # alejandra = {}; + # typos = {}; } ); @@ -202,7 +192,6 @@ { pkgs, system }: { default = pkgs.mkShell { - inherit (self.checks.${system}.pre-commit-check) shellHook; buildInputs = with pkgs; [ just self.packages.${system}.nvim