From 0ab8e55ebe39fd98501ddd11093583ddb7f67a35 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 8 Sep 2024 01:25:54 +0000 Subject: [PATCH 1/4] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/c2cd2a52e02f1dfa1c88f95abeb89298d46023be?narHash=sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM%3D' (2024-08-23) → 'github:nix-community/home-manager/aaebdea769a5c10f1c6e50ebdf5924c1a13f0cda?narHash=sha256-%2BHsjshXpqNiJHLaJaK0JnIicJ/a1NquKcfn4YZ3ILgg%3D' (2024-09-07) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/71e91c409d1e654808b2621f28a327acfdad8dc2?narHash=sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w%3D' (2024-08-28) → 'github:NixOS/nixpkgs/574d1eac1c200690e27b8eb4e24887f8df7ac27c?narHash=sha256-v3rIhsJBOMLR8e/RNWxr828tB%2BWywYIoajrZKFM%2B0Gg%3D' (2024-09-06) • Updated input 'nixvim': 'github:nix-community/nixvim/caefb266bee301922a4cf4d4564b1b000a0a21c3?narHash=sha256-tjMrSaxGXC7JQkENchdPPxWv4gPbelPwSoPs5A5e0vU%3D' (2024-08-31) → 'github:nix-community/nixvim/810eacf5163b16b666ca70b6617c6a85ce412e0a?narHash=sha256-bzJ5iUPaEjSt24fIoQihBGN%2BQ7mye73hd/jbubHhyZA%3D' (2024-09-07) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index e313d2c..58b7460 100644 --- a/flake.lock +++ b/flake.lock @@ -151,11 +151,11 @@ ] }, "locked": { - "lastModified": 1724435763, - "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", + "lastModified": 1725694918, + "narHash": "sha256-+HsjshXpqNiJHLaJaK0JnIicJ/a1NquKcfn4YZ3ILgg=", "owner": "nix-community", "repo": "home-manager", - "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", + "rev": "aaebdea769a5c10f1c6e50ebdf5924c1a13f0cda", "type": "github" }, "original": { @@ -187,11 +187,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1724819573, - "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", + "lastModified": 1725634671, + "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", + "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", "type": "github" }, "original": { @@ -218,11 +218,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1725139609, - "narHash": "sha256-tjMrSaxGXC7JQkENchdPPxWv4gPbelPwSoPs5A5e0vU=", + "lastModified": 1725744583, + "narHash": "sha256-bzJ5iUPaEjSt24fIoQihBGN+Q7mye73hd/jbubHhyZA=", "owner": "nix-community", "repo": "nixvim", - "rev": "caefb266bee301922a4cf4d4564b1b000a0a21c3", + "rev": "810eacf5163b16b666ca70b6617c6a85ce412e0a", "type": "github" }, "original": { From 5c87e94234100ef4df1fe4820f4fc5eae4f4659c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 9 Sep 2024 17:06:42 +0200 Subject: [PATCH 2/4] flake: fix eval with unstable --- flake.nix | 12 +++++++++--- modules/default.nix | 6 +++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index de648f4..8a29f5a 100644 --- a/flake.nix +++ b/flake.nix @@ -25,7 +25,13 @@ package = pkgs.callPackage ./pkgs/angular-language-server { }; }; - mkLsp = import "${nixvim.outPath}/plugins/lsp/language-servers/_mk-lsp.nix"; + mkLsp = args: import "${nixvim.outPath}/plugins/lsp/language-servers/_mk-lsp.nix" (args // { + package = nixpkgs.lib.mkOption { + default = args.package; + type = with nixpkgs.lib.types; nullOr package; + description = "Which package to use for ${args.name}."; + }; + }); mkModules = { config, lib, pkgs }: [ ./modules/nixos.nix @@ -41,7 +47,7 @@ }; config.programs.nixvim = lib.mkMerge [ - (mkLsp { inherit config lib pkgs; } (angularLsp { inherit pkgs; })) + (mkLsp (angularLsp { inherit pkgs; })) { # this unfortunately needs to be here as we cannot access the nixos options inside of nixvim extraPackages = map (let @@ -82,7 +88,7 @@ nixvimWithOptions = { pkgs, options ? { } } : nixvim.legacyPackages.${system}.makeNixvimWithModule { module = { config, lib, pkgs, ... }: { imports = [ - (mkLsp { inherit config lib pkgs; } (angularLsp { inherit pkgs; })) + (mkLsp (angularLsp { inherit pkgs; })) ./modules options ]; diff --git a/modules/default.nix b/modules/default.nix index 570965d..420fc1d 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -80,12 +80,12 @@ enable = true; globalstatus = true; # https://github.com/nvim-lualine/lualine.nvim?tab=readme-ov-file#filename-component-options - sections = { + settings.sections = { lualine_b = [ { - extraConfig.sources = [ "nvim_diagnostic" "nvim_lsp" ]; + sources = [ "nvim_diagnostic" "nvim_lsp" ]; } ]; lualine_c = [ { - extraConfig.path = 1; + path = 1; } ]; }; theme = "onedark"; From e32b6a3ae6a909c35a94d706f28aaa6392d60241 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 10 Sep 2024 01:37:52 +0200 Subject: [PATCH 3/4] Disable stable CI --- .github/workflows/flake-build.yaml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/flake-build.yaml b/.github/workflows/flake-build.yaml index 95a4ffd..eca9d99 100644 --- a/.github/workflows/flake-build.yaml +++ b/.github/workflows/flake-build.yaml @@ -20,13 +20,14 @@ jobs: - uses: cachix/install-nix-action@V27 - - name: build stable - if: matrix.target == 'stable' - run: | - nix build -L \ - --override-input nixpkgs github:NixOS/nixpkgs/nixos-24.05 \ - --override-input home-manager github:nix-community/home-manager/release-24.05 \ - --override-input nixvim github:nix-community/nixvim/nixos-24.05 + # TODO: bring back with 24.11 + # - name: build stable + # if: matrix.target == 'stable' + # run: | + # nix build -L \ + # --override-input nixpkgs github:NixOS/nixpkgs/nixos-24.05 \ + # --override-input home-manager github:nix-community/home-manager/release-24.05 \ + # --override-input nixvim github:nix-community/nixvim/nixos-24.05 - name: build unstable if: matrix.target != 'stable' From 5cbc69aca6458f01e30b59bb6d704a175a4d594a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 10 Sep 2024 01:41:37 +0200 Subject: [PATCH 4/4] Fix deprecations --- modules/cmp.nix | 2 +- modules/default.nix | 24 ++++++++++++++---------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/modules/cmp.nix b/modules/cmp.nix index 7b64cb8..ed70785 100644 --- a/modules/cmp.nix +++ b/modules/cmp.nix @@ -157,7 +157,7 @@ in luasnip = { enable = true; - extraConfig = { + settings = { region_check_events = "CursorHold,InsertLeave"; # those are for removing deleted snippets, also a common problem delete_check_events = "TextChanged,InsertEnter"; diff --git a/modules/default.nix b/modules/default.nix index 420fc1d..bd8ddd9 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -78,17 +78,21 @@ lastplace.enable = true; lualine = { enable = true; - globalstatus = true; - # https://github.com/nvim-lualine/lualine.nvim?tab=readme-ov-file#filename-component-options - settings.sections = { - lualine_b = [ { - sources = [ "nvim_diagnostic" "nvim_lsp" ]; - } ]; - lualine_c = [ { - path = 1; - } ]; + settings = { + options = { + globalstatus = true; + theme = "onedark"; + }; + # https://github.com/nvim-lualine/lualine.nvim?tab=readme-ov-file#filename-component-options + sections = { + lualine_b = [ { + sources = [ "nvim_diagnostic" "nvim_lsp" ]; + } ]; + lualine_c = [ { + path = 1; + } ]; + }; }; - theme = "onedark"; }; nvim-autopairs.enable = true; # brackets, html, ... nvim-colorizer.enable = true;