diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 640c35a..849a68b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,4 +14,4 @@ jobs: - uses: actions/checkout@v4 - uses: DeterminateSystems/nix-installer-action@main - uses: DeterminateSystems/magic-nix-cache-action@main - - run: nix flake check + - run: nix flake check --no-write-lock-file diff --git a/Makefile b/Makefile index 3eb2aca..4c7795a 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,11 @@ build: - nix run nixpkgs#nix-output-monitor -- build + nix run nixpkgs#nix-output-monitor -- build --no-write-lock-file check: - nix flake check + nix flake check --no-write-lock-file format: nix fmt + +update: + nix flake update && nix run github:fzakaria/nix-auto-follow -- -i diff --git a/config/plugins/treesitter.nix b/config/plugins/treesitter.nix index f70be70..921acf1 100644 --- a/config/plugins/treesitter.nix +++ b/config/plugins/treesitter.nix @@ -91,7 +91,7 @@ # indent based on ast indent.enable = true; highlight.enable = true; - # this is SO useful + # this is SO useful incremental_selection = { enable = true; keymaps = { diff --git a/flake.lock b/flake.lock index 7bfa83b..caabf1f 100644 --- a/flake.lock +++ b/flake.lock @@ -69,9 +69,25 @@ }, "flake-parts": { "inputs": { - "nixpkgs-lib": [ - "nixpkgs" - ] + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" }, "locked": { "lastModified": 1733312601, @@ -243,19 +259,43 @@ "type": "github" } }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1733096140, + "narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1735291276, + "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "634fd46801442d760e09493a794c4f15db2d0cbb", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "devshell": "devshell", "flake-compat": "flake-compat", - "flake-parts": [ - "flake-parts" - ], + "flake-parts": "flake-parts_2", "git-hooks": "git-hooks", "home-manager": "home-manager", "nix-darwin": "nix-darwin", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs_2", "nuschtosSearch": "nuschtosSearch", "treefmt-nix": "treefmt-nix" }, @@ -397,11 +437,11 @@ "schemastore-nvim": { "flake": false, "locked": { - "lastModified": 1735318841, - "narHash": "sha256-k4ovDNlEQ6v9/14UeqvKlgbtTSVHSauhnAyCAOo/z48=", + "lastModified": 1735452041, + "narHash": "sha256-C0wqql9KmrhyzmOY55WBxkEmeIqo1uZRuLl/WFDgsSk=", "owner": "b0o", "repo": "SchemaStore.nvim", - "rev": "562681847dd904485caddd42395db2bb9d6e694a", + "rev": "e43f3e47991bc9f6cbc1d8b4d0f6a0d8d6c29284", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c244a88..3e8577e 100644 --- a/flake.nix +++ b/flake.nix @@ -3,17 +3,9 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - flake-parts.url = "github:hercules-ci/flake-parts"; - flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs"; - - # neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay"; - # neovim-nightly-overlay.inputs.nixpkgs.follows = "nixpkgs"; - # neovim-nightly-overlay.inputs.flake-parts.follows = "flake-parts"; - nixvim.url = "github:nix-community/nixvim"; - nixvim.inputs.nixpkgs.follows = "nixpkgs"; - nixvim.inputs.flake-parts.follows = "flake-parts"; + # neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay"; # vendored coq-lsp.url = "github:tomtomjhj/coq-lsp.nvim"; @@ -89,6 +81,7 @@ checks = { # Run `nix flake check .` to verify that your config is not broken default = nixvimLib.check.mkTestDerivationFromNixvimModule nixvimModule; + # TODO: add `nix run github:fzakaria/nix-auto-follow -- -c` }; formatter = pkgs.nixfmt-rfc-style;