diff --git a/config/lsp/lsp.nix b/config/lsp/lsp.nix index 8febc37..abd79b1 100644 --- a/config/lsp/lsp.nix +++ b/config/lsp/lsp.nix @@ -9,7 +9,7 @@ marksman.enable = pkgs.lib.mkDefault true; nil-ls.enable = pkgs.lib.mkDefault true; pyright.enable = pkgs.lib.mkDefault true; - tsserver.enable = pkgs.lib.mkDefault true; + ts-ls.enable = pkgs.lib.mkDefault true; lua-ls.enable = pkgs.lib.mkDefault true; rust-analyzer = { enable = pkgs.lib.mkDefault true; @@ -17,7 +17,7 @@ installRustc = pkgs.lib.mkDefault false; }; tailwindcss.enable = pkgs.lib.mkDefault true; - # typst-lsp.enable = pkgs.lib.mkDefault true; # broken + typst-lsp.enable = pkgs.lib.mkDefault true; cssls.enable = pkgs.lib.mkDefault true; html.enable = pkgs.lib.mkDefault true; htmx.enable = pkgs.lib.mkDefault true; diff --git a/config/lualine.nix b/config/lualine.nix index f231d46..45bcf8b 100644 --- a/config/lualine.nix +++ b/config/lualine.nix @@ -1,15 +1,17 @@ {pkgs, ...}: { plugins.lualine = { enable = pkgs.lib.mkDefault true; - globalstatus = pkgs.lib.mkDefault true; - theme = pkgs.lib.mkDefault "kanagawa"; - disabledFiletypes.statusline = [ - "alpha" - ]; - sections = { - lualine_x = [ - "filetype" + settings = { + globalstatus = pkgs.lib.mkDefault true; + theme = pkgs.lib.mkDefault "kanagawa"; + disabledFiletypes.statusline = [ + "alpha" ]; + sections = { + lualine_x = [ + "filetype" + ]; + }; }; }; } diff --git a/config/plugins/plugins.nix b/config/plugins/plugins.nix index 0c926a7..c96eb49 100644 --- a/config/plugins/plugins.nix +++ b/config/plugins/plugins.nix @@ -42,8 +42,10 @@ }; navic = { enable = pkgs.lib.mkDefault true; - highlight = pkgs.lib.mkDefault true; - lsp.autoAttach = pkgs.lib.mkDefault true; + settings = { + highlight = pkgs.lib.mkDefault true; + lsp.autoAttach = pkgs.lib.mkDefault true; + }; }; nvim-colorizer.enable = pkgs.lib.mkDefault true; marks.enable = pkgs.lib.mkDefault true; diff --git a/config/ui/specs.nix b/config/ui/specs.nix index 16fa975..c578d72 100644 --- a/config/ui/specs.nix +++ b/config/ui/specs.nix @@ -1,16 +1,6 @@ {pkgs, ...}: { plugins.specs = { enable = pkgs.lib.mkDefault true; - # nvim 0.10-related bugfix: https://github.com/edluffy/specs.nvim/issues/31 - package = pkgs.vimUtils.buildVimPlugin { - name = "specs.nvim"; - src = pkgs.fetchFromGitHub { - owner = "cxwx"; - repo = "specs.nvim"; - rev = "dd82496f538b688cedf98429f89fef47ecb0625e"; - hash = "sha256-GmiJP4pxDdcnG6muNlJEkvUlhrLh6+Ft8iIOHk13RxA="; - }; - }; settings = { min_jump = 10; increment = 10; diff --git a/flake.lock b/flake.lock index 2b495cd..126a028 100644 --- a/flake.lock +++ b/flake.lock @@ -40,11 +40,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1722555600, - "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", + "lastModified": 1726153070, + "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", + "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", "type": "github" }, "original": { @@ -61,11 +61,11 @@ ] }, "locked": { - "lastModified": 1722555600, - "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", + "lastModified": 1726153070, + "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", + "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", "type": "github" }, "original": { @@ -109,11 +109,11 @@ ] }, "locked": { - "lastModified": 1724227338, - "narHash": "sha256-TuSaYdhOxeaaE9885mFO1lZHHax33GD5A9dczJrGUjw=", + "lastModified": 1725513492, + "narHash": "sha256-tyMUA6NgJSvvQuzB7A1Sf8+0XCHyfSPRx/b00o6K0uo=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "6cedaa7c1b4f82a266e5d30f212273e60d62cb0d", + "rev": "7570de7b9b504cfe92025dd1be797bf546f66528", "type": "github" }, "original": { @@ -152,11 +152,11 @@ ] }, "locked": { - "lastModified": 1723986931, - "narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=", + "lastModified": 1726357542, + "narHash": "sha256-p4OrJL2weh0TRtaeu1fmNYP6+TOp/W2qdaIJxxQay4c=", "owner": "nix-community", "repo": "home-manager", - "rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671", + "rev": "e524c57b1fa55d6ca9d8354c6ce1e538d2a1f47f", "type": "github" }, "original": { @@ -173,11 +173,11 @@ ] }, "locked": { - "lastModified": 1724299755, - "narHash": "sha256-P5zMA17kD9tqiqMuNXwupkM7buM3gMNtoZ1VuJTRDE4=", + "lastModified": 1726188813, + "narHash": "sha256-Vop/VRi6uCiScg/Ic+YlwsdIrLabWUJc57dNczp0eBc=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "a8968d88e5a537b0491f68ce910749cd870bdbef", + "rev": "21fe31f26473c180390cfa81e3ea81aca0204c80", "type": "github" }, "original": { @@ -188,11 +188,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1724224976, - "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=", + "lastModified": 1726243404, + "narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c374d94f1536013ca8e92341b540eba4c22f9c62", + "rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059", "type": "github" }, "original": { @@ -204,23 +204,23 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1722555339, - "narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=", + "lastModified": 1725233747, + "narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" } }, "nixpkgs_2": { "locked": { - "lastModified": 1724224976, - "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=", + "lastModified": 1726243404, + "narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c374d94f1536013ca8e92341b540eba4c22f9c62", + "rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059", "type": "github" }, "original": { @@ -243,11 +243,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1724460949, - "narHash": "sha256-s0c45Uf6cxJ2gzSrktC+DHrjpYBTC7I3SGMRVgC5qOk=", + "lastModified": 1726502324, + "narHash": "sha256-I/WFSIBeIjlY3CgSJ6IRYxP2aEJ6b42Y1HAeATlBh48=", "owner": "nix-community", "repo": "nixvim", - "rev": "1181535e34e433775ec3dbe962e50b1ebf85d44e", + "rev": "2e3083e42509c399b224239f6d7fa17976b18536", "type": "github" }, "original": { @@ -265,11 +265,11 @@ ] }, "locked": { - "lastModified": 1723969429, - "narHash": "sha256-BuewfNEXEf11MIkJY+uvWsdLu1dIvgJqntWChvNdALg=", + "lastModified": 1726392886, + "narHash": "sha256-9RtOuG7V8KG8IU8nZje5EQ1WSM/inr7+zb3tAgTiHDM=", "owner": "NuschtOS", "repo": "search", - "rev": "a05d1805f2a2bc47d230e5e92aecbf69f784f3d0", + "rev": "97d34b70deed4878fcb2449ac89dab717d72efa1", "type": "github" }, "original": { @@ -308,11 +308,11 @@ ] }, "locked": { - "lastModified": 1723808491, - "narHash": "sha256-rhis3qNuGmJmYC/okT7Dkc4M8CeUuRCSvW6kC2f3hBc=", + "lastModified": 1725271838, + "narHash": "sha256-VcqxWT0O/gMaeWTTjf1r4MOyG49NaNxW4GHTO3xuThE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "1d07739554fdc4f8481068f1b11d6ab4c1a4167a", + "rev": "9fb342d14b69aefdf46187f6bb80a4a0d97007cd", "type": "github" }, "original": {