From 9ed5a3545a016af172704d4097f980a5ed484bf6 Mon Sep 17 00:00:00 2001 From: Erik Reinert <4638629+erikreinert@users.noreply.github.com> Date: Mon, 1 Jul 2024 10:07:57 -0700 Subject: [PATCH] chore: update flake.lock and remove unused language servers - Updated `flake.lock` with new revisions and hashes for `flake-parts` and `nixpkgs`. - Removed `dhall-lsp-server`, `gleam`, and `sourcekit-lsp` from `lib/default.nix`. - Removed configurations for `dhall_lsp_server`, `gleam`, and `sourcekit` from `languages.lua`. - Added `foldexpr` and `foldmethod` settings to `vim.lua`. --- flake.lock | 12 ++++++------ lib/default.nix | 3 --- lua/TheAltF4Stream/languages.lua | 3 --- lua/TheAltF4Stream/vim.lua | 2 ++ 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index ab6456b..4b375db 100644 --- a/flake.lock +++ b/flake.lock @@ -22,11 +22,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1717285511, - "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", + "lastModified": 1719745305, + "narHash": "sha256-xwgjVUpqSviudEkpQnioeez1Uo2wzrsMaJKJClh+Bls=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", + "rev": "c3c5ecc05edc7dafba779c6c1a61cd08ac6583e9", "type": "github" }, "original": { @@ -37,11 +37,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1719254875, - "narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=", + "lastModified": 1719690277, + "narHash": "sha256-0xSej1g7eP2kaUF+JQp8jdyNmpmCJKRpO12mKl/36Kc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60", + "rev": "2741b4b489b55df32afac57bc4bfd220e8bf617e", "type": "github" }, "original": { diff --git a/lib/default.nix b/lib/default.nix index 4725181..d4c6ac6 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -95,8 +95,6 @@ in rec { ocamlPackages.ocaml-lsp ocamlPackages.ocamlformat pkgs.cuelsp - pkgs.dhall-lsp-server - pkgs.gleam pkgs.gopls pkgs.haskell-language-server pkgs.jsonnet-language-server @@ -107,7 +105,6 @@ in rec { pkgs.postgres-lsp pkgs.pyright pkgs.rust-analyzer - pkgs.sourcekit-lsp pkgs.terraform-ls pkgs.zls diff --git a/lua/TheAltF4Stream/languages.lua b/lua/TheAltF4Stream/languages.lua index b0413e6..91b4aed 100644 --- a/lua/TheAltF4Stream/languages.lua +++ b/lua/TheAltF4Stream/languages.lua @@ -105,9 +105,7 @@ local function init() }, } }, - dhall_lsp_server = {}, dockerls = {}, - gleam = {}, gopls = { settings = { gopls = { @@ -164,7 +162,6 @@ local function init() }, }, }, - sourcekit = {}, terraformls = {}, tsserver = {}, yamlls = { diff --git a/lua/TheAltF4Stream/vim.lua b/lua/TheAltF4Stream/vim.lua index 79c1953..dec0641 100644 --- a/lua/TheAltF4Stream/vim.lua +++ b/lua/TheAltF4Stream/vim.lua @@ -23,6 +23,8 @@ end local function set_vim_wo() local settings = { + foldexpr = 'nvim_treesitter#foldexpr()', + foldmethod = 'expr', number = true, relativenumber = true, wrap = false,