Upgrade inputs, fix deprecations and errors (#108)

jisantuc · Dec 23, 2024 · eb07c24 · eb07c24
1 parent 5ebd774
commit eb07c24
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 72 deletions.
diff --git a/dotfiles/neovim/lua/custom-lsp-config.lua b/dotfiles/neovim/lua/custom-lsp-config.lua
@@ -69,7 +69,7 @@ require("lspconfig").lua_ls.setup {
 require("lspconfig").purescriptls.setup {}
 
 -- activate typescript ls
-require("lspconfig").tsserver.setup {}
+require("lspconfig").ts_ls.setup {}
 
 -- activate hls
 require('haskell-tools')

diff --git a/dotfiles/neovim/lua/custom-rest-nvim.lua b/dotfiles/neovim/lua/custom-rest-nvim.lua
@@ -1,64 +1,13 @@
-require("rest-nvim").setup({
+vim.g.rest_nvim = {
         -- Skip SSL verification, useful for unknown certificates
         skip_ssl_verification = false,
         -- Encode URL before making request
         encode_url = true,
         -- Highlight request on run
         highlight = {
                 timeout = 150,
-        },
-        result = {
-                split = {
-                        horizontal = false,
-                        in_place = false,
-                        stay_in_current_window_after_split = true,
-                },
-                behavior = {
-                        decode_url = true,
-                        show_info = {
-                                url = true,
-                                headers = true,
-                                http_info = true,
-                                curl_command = true,
-                        },
-                        statistics = {
-                                enable = true,
-                                ---@see https://curl.se/libcurl/c/curl_easy_getinfo.html
-                                stats = {
-                                        { "total_time",      title = "Time taken:" },
-                                        { "size_download_t", title = "Download size:" },
-                                },
-                        },
-                        formatters = {
-                                json = "jq",
-                                html = function(body)
-                                        if vim.fn.executable("tidy") == 0 then
-                                                return body, { found = false, name = "tidy" }
-                                        end
-                                        local fmt_body = vim.fn.system({
-                                                "tidy",
-                                                "-i",
-                                                "-q",
-                                                "--tidy-mark", "no",
-                                                "--show-body-only", "auto",
-                                                "--show-errors", "0",
-                                                "--show-warnings", "0",
-                                                "-",
-                                        }, body):gsub("\n$", "")
-
-                                        return fmt_body, { found = true, name = "tidy" }
-                                end,
-                        },
-                },
-                keybinds = {
-                        buffer_local = true,
-                        prev = "H",
-                        next = "L",
-                },
-        },
-        env_file = '.env',
-        custom_dynamic_variables = {},
-})
+        }
+}
 
 -- set files with .http extension to "http" filetype
 vim.filetype.add({

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -2,9 +2,9 @@
   description = "@jisantuc home manager flake";
 
   inputs = {
-    nixpkgs.url = "nixpkgs/nixos-24.05";
+    nixpkgs.url = "nixpkgs/nixos-24.11";
 
-    home-manager.url = "github:nix-community/home-manager/release-24.05";
+    home-manager.url = "github:nix-community/home-manager/release-24.11";
 
     flake-utils.url = "github:numtide/flake-utils";
   };