flake.lock: Update (#47)

* flake.lock: Update 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: fix eval with unstable * Disable stable CI * Fix deprecations --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Sandro Jäckel <[email protected]>
NuschtOS · Sep 10, 2024 · 0bd3701 · 0bd3701
1 parent 4aae65f
commit 0bd3701
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 30 deletions.
diff --git 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'

diff --git a/flake.lock b/flake.lock
diff --git 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/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
@@ -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
-      sections = {
-        lualine_b = [ {
-          extraConfig.sources = [ "nvim_diagnostic" "nvim_lsp" ];
-        } ];
-        lualine_c = [ {
-          extraConfig.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;