From 498b0492508c1dc19fc0d8502400cf0fa5cc4c46 Mon Sep 17 00:00:00 2001 From: pegasust Date: Mon, 7 Nov 2022 18:36:01 +0000 Subject: [PATCH] mend --- home-nix/flake.nix | 44 ++++++++++++++++++++++++++++++++------------ neovim/init.lua | 2 +- 2 files changed, 33 insertions(+), 13 deletions(-) diff --git a/home-nix/flake.nix b/home-nix/flake.nix index 83d24bd..63c4f32 100644 --- a/home-nix/flake.nix +++ b/home-nix/flake.nix @@ -9,27 +9,47 @@ flake-utils.url = "github:numtide/flake-utils"; }; - outputs = {nixpkgs, home-manager, ...}: - let system = "x86_64-linux"; + outputs = { nixpkgs, home-manager, ... }: + let + system = "x86_64-linux"; pkgs = nixpkgs.legacyPackages.${system}; - in { + in + { homeConfigurations.nixos = home-manager.lib.homeManagerConfiguration { inherit pkgs; - username = "nixos"; - homeDirectory = "/home/nixos"; - modules = [./home.nix]; + modules = [ + ./home.nix + { + home = { + username = "nixos"; + homeDirectory = "/home/nixos"; + }; + } + ]; }; homeConfigurations.ubuntu_admin = home-manager.lib.homeManagerConfiguration { inherit pkgs; - username = "ubuntu_admin"; - homeDirectory = "/home/ubuntu_admin"; - modules = [./home.nix]; + modules = [ + ./home.nix + { + home = { + username = "ubuntu_admin"; + homeDirectory = "/home/ubuntu_admin"; + }; + } + ]; }; homeConfigurations.hwtr = home-manager.lib.homeManagerConfiguration { inherit pkgs; - username = "hwtr"; - homeDirectory = "/home/hwtr"; - modules = [./home.nix]; + modules = [ + ./home.nix + { + home = { + username = "hwtr"; + homeDirectory = "/home/hwtr"; + }; + } + ]; }; }; } diff --git a/neovim/init.lua b/neovim/init.lua index 14a01e3..494aba2 100644 --- a/neovim/init.lua +++ b/neovim/init.lua @@ -415,7 +415,7 @@ local on_attach = function(_client, bufnr) end -- nvim-cmp supports additional completion capabilities -local capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities()) +local capabilities = require('cmp_nvim_lsp').default_capabilities(vim.lsp.protocol.make_client_capabilities()) -- local tabnine = require('cmp_tabnine.config') -- tabnine.setup({ -- max_lines = 1000,