diff options
| -rw-r--r-- | nixos/games/minecraft.nix | 12 | ||||
| -rw-r--r-- | nvim/lua/configs/lspconfig.lua | 136 |
2 files changed, 78 insertions, 70 deletions
diff --git a/nixos/games/minecraft.nix b/nixos/games/minecraft.nix index 6507764..c6ca772 100644 --- a/nixos/games/minecraft.nix +++ b/nixos/games/minecraft.nix @@ -1,8 +1,16 @@ -{ config, pkgs, ... }: +{ config, pkgs, opt, ... }: { environment.systemPackages = with pkgs; [ prismlauncher - ]; + ] ++ (if opt.nvidia then [ + (writeShellScriptBin "prismlauncher-nvidia" '' + exec env \ + __NV_PRIME_RENDER_OFFLOAD=1 \ + __GLX_VENDOR_LIBRARY_NAME=nvidia \ + __VK_LAYER_NV_optimus=NVIDIA_only \ + ${pkgs.prismlauncher}/bin/prismlauncher "$@" + '') + ] else []); # you do need to enable all of the ports because minecraft LAN uses a fucking # random one diff --git a/nvim/lua/configs/lspconfig.lua b/nvim/lua/configs/lspconfig.lua index f5de9ba..0a5520d 100644 --- a/nvim/lua/configs/lspconfig.lua +++ b/nvim/lua/configs/lspconfig.lua @@ -3,75 +3,75 @@ require("nvchad.configs.lspconfig").defaults() local servers = { "html", "cssls", "rust_analyzer", "zls" } vim.lsp.enable(servers) -local lspconfig = require("lspconfig") +local lspconfig = vim.lsp.config--require("lspconfig") -- Zig -lspconfig.zls.setup{ - cmd = { "zls" }, - filetypes = { "zig", "zir" }, - root_dir = lspconfig.util.root_pattern("build.zig", "zls.json", ".git") -} +-- lspconfig.zls.setup{ +-- cmd = { "zls" }, +-- filetypes = { "zig", "zir" }, + -- root_dir = lspconfig.util.root_pattern("build.zig", "zls.json", ".git") +-- } -- TS/JS -lspconfig.ts_ls.setup { - cmd = { "typescript-language-server", "--stdio" }, - filetypes = { - "javascript", "javascriptreact", - "typescript", "typescriptreact", - "javascript.jsx", "typescript.tsx" - }, - root_dir = lspconfig.util.root_pattern("package.json", "tsconfig.json", ".git") -} - --- Python -lspconfig.pylsp.setup { - cmd = { "pylsp" }, - filetypes = { "python" }, - settings = { - pylsp = { - plugins = { - black = { enabled = true }, - ruff = { enabled = true }, - flake8 = { enabled = true }, - isort = { enabled = true } - } - } - } -} - --- Elixir -lspconfig.elixirls.setup { - cmd = { "elixir-ls" }, - filetypes = { "elixir" }, -} - --- Erlang -lspconfig.erlangls.setup { - cmd = { "erlang-ls" }, - filetypes = { "erlang" }, -} - --- C/C++ -lspconfig.clangd.setup { - cmd = { "clangd" }, - filetypes = { "c", "cpp" } -} - --- Gopls -lspconfig.gopls.setup { - cmd = { "gopls" }, - filetype = { "go" } -} - --- Dart / Flutter -lspconfig.dartls.setup({ - cmd = { "dart", "language-server", "--protocol=lsp" }, - filetypes = { "dart" }, - root_dir = lspconfig.util.root_pattern("pubspec.yaml"), - settings = { - dart = { - completeFunctionCalls = true, - showTodos = true, - }, - }, -}) +-- lspconfig.ts_ls.setup { +-- cmd = { "typescript-language-server", "--stdio" }, +-- filetypes = { +-- "javascript", "javascriptreact", +-- "typescript", "typescriptreact", +-- "javascript.jsx", "typescript.tsx" +-- }, +-- -- root_dir = lspconfig.util.root_pattern("package.json", "tsconfig.json", ".git") +-- } +-- +-- -- Python +-- lspconfig.pylsp.setup { +-- cmd = { "pylsp" }, +-- filetypes = { "python" }, +-- settings = { +-- pylsp = { +-- plugins = { +-- black = { enabled = true }, +-- ruff = { enabled = true }, +-- flake8 = { enabled = true }, +-- isort = { enabled = true } +-- } +-- } +-- } +-- } +-- +-- -- Elixir +-- lspconfig.elixirls.setup { +-- cmd = { "elixir-ls" }, +-- filetypes = { "elixir" }, +-- } +-- +-- -- Erlang +-- lspconfig.erlangls.setup { +-- cmd = { "erlang-ls" }, +-- filetypes = { "erlang" }, +-- } +-- +-- -- C/C++ +-- lspconfig.clangd.setup { +-- cmd = { "clangd" }, +-- filetypes = { "c", "cpp" } +-- } +-- +-- -- Gopls +-- lspconfig.gopls.setup { +-- cmd = { "gopls" }, +-- filetype = { "go" } +-- } +-- +-- -- Dart / Flutter +-- lspconfig.dartls.setup({ +-- cmd = { "dart", "language-server", "--protocol=lsp" }, +-- filetypes = { "dart" }, +-- -- root_dir = lspconfig.util.root_pattern("pubspec.yaml"), +-- settings = { +-- dart = { +-- completeFunctionCalls = true, +-- showTodos = true, +-- }, +-- }, +-- }) |