diff --git a/home/irl.nix b/home/irl.nix index dde5137..0b301ea 100644 --- a/home/irl.nix +++ b/home/irl.nix @@ -19,15 +19,12 @@ in home.packages = with pkgs; [ fish neofetch - rust-analyzer starship tree ]; home.shellAliases = { hms = - "home-manager switch --flake ~/.config/nix-configs#irl" - + (if cfg.gui-packages then "-gui" else "") - + "-${pkgs.system}"; + "home-manager switch --flake ~/.config/nix-configs#irl" + (if cfg.gui-packages then "-gui" else ""); }; programs.bash = { enable = true; @@ -94,47 +91,8 @@ in vimdiffAlias = true; plugins = with pkgs.vimPlugins; [ bufferline-nvim - nvim-lspconfig nvim-treesitter.withAllGrammars ]; - extraLuaConfig = '' - vim.lsp.config('rust_analyzer', { - settings = { - ['rust-analyzer'] = {}, - }, - }) - vim.api.nvim_create_autocmd('LspAttach', { - group = vim.api.nvim_create_augroup('my.lsp', {}), - callback = function(args) - local client = assert(vim.lsp.get_client_by_id(args.data.client_id)) - if client:supports_method('textDocument/implementation') then - -- Create a keymap for vim.lsp.buf.implementation ... - end - - -- Enable auto-completion. Note: Use CTRL-Y to select an item. |complete_CTRL-Y| - if client:supports_method('textDocument/completion') then - -- Optional: trigger autocompletion on EVERY keypress. May be slow! - -- local chars = {}; for i = 32, 126 do table.insert(chars, string.char(i)) end - -- client.server_capabilities.completionProvider.triggerCharacters = chars - - vim.lsp.completion.enable(true, client.id, args.buf, {autotrigger = true}) - end - - -- Auto-format ("lint") on save. - -- Usually not needed if server supports "textDocument/willSaveWaitUntil". - if not client:supports_method('textDocument/willSaveWaitUntil') - and client:supports_method('textDocument/formatting') then - vim.api.nvim_create_autocmd('BufWritePre', { - group = vim.api.nvim_create_augroup('my.lsp', {clear=false}), - buffer = args.buf, - callback = function() - vim.lsp.buf.format({ bufnr = args.buf, id = client.id, timeout_ms = 1000 }) - end, - }) - end - end, - }) - ''; }; programs.starship = { enable = true;