This commit is contained in:
Nikos Papadakis 2023-10-06 23:46:37 +03:00
parent d86e7d732a
commit 297da93a1e
Signed by untrusted user who does not match committer: nikos
GPG key ID: 78871F9905ADFF02
5 changed files with 19 additions and 38 deletions

View file

@ -82,7 +82,9 @@
"nil": { "nil": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs", "nixpkgs": [
"nixpkgs"
],
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
@ -100,22 +102,6 @@
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": {
"lastModified": 1690441914,
"narHash": "sha256-Ac+kJQ5z9MDAMyzSc0i0zJDx2i3qi9NjlW5Lz285G/I=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "db8672b8d0a2593c2405aed0c1dfa64b2a2f428f",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1695360818, "lastModified": 1695360818,
"narHash": "sha256-JlkN3R/SSoMTa+CasbxS1gq+GpGxXQlNZRUh9+LIy/0=", "narHash": "sha256-JlkN3R/SSoMTa+CasbxS1gq+GpGxXQlNZRUh9+LIy/0=",
@ -136,7 +122,7 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"neovim": "neovim", "neovim": "neovim",
"nil": "nil", "nil": "nil",
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs"
} }
}, },
"rust-overlay": { "rust-overlay": {

View file

@ -3,21 +3,27 @@
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
neovim = { neovim = {
url = "github:neovim/neovim?dir=contrib"; url = "github:neovim/neovim?dir=contrib";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nil.url = "github:oxalica/nil";
nil = {
url = "github:oxalica/nil";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = { nixpkgs, home-manager, neovim, ... }: outputs = { nixpkgs, home-manager, neovim, ... }:
let let
system = "x86_64-linux"; # change your system type here system = "x86_64-linux"; # change your system type here
user = "nikos"; # change your user here user = "nikos"; # change your user here
dotfilesHome = "/home/nikos/.dotfiles"; # specify your dotfiles path dotfilesHome = "/home/nikos/.dotfiles"; # specify your dotfiles path
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
in in

View file

@ -59,6 +59,11 @@
); );
}; };
programs.direnv = {
enable = true;
nix-direnv.enable = true;
};
# Let Home Manager install and manage itself. # Let Home Manager install and manage itself.
programs.home-manager.enable = true; programs.home-manager.enable = true;
} }

View file

@ -12,21 +12,7 @@ for dir in vim.fs.parents(vim.api.nvim_buf_get_name(0)) do
end end
end end
local border = { vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, { border = "single" })
{ "", "FloatBorder" },
{ "", "FloatBorder" },
{ "", "FloatBorder" },
{ "", "FloatBorder" },
{ "", "FloatBorder" },
{ "", "FloatBorder" },
{ "", "FloatBorder" },
{ "", "FloatBorder" },
}
local handlers = {
["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, { border = border }),
["textDocument/signatureHelp"] = vim.lsp.with(vim.lsp.handlers.signature_help, { border = border }),
}
local capabilities = {} local capabilities = {}
@ -195,6 +181,5 @@ for lsp, settings in pairs(servers) do
lspconfig[lsp].setup(vim.tbl_extend("force", { lspconfig[lsp].setup(vim.tbl_extend("force", {
on_attach = on_attach, on_attach = on_attach,
capabilities = capabilities, capabilities = capabilities,
handlers = handlers,
}, settings)) }, settings))
end end

View file

@ -6,6 +6,5 @@ pkgs: with pkgs; [
zoxide # "z" command zoxide # "z" command
nil # Nix LSP nil # Nix LSP
nixpkgs-fmt # Nix formatter nixpkgs-fmt # Nix formatter
direnv # Sources .envrc files
(nerdfonts.override { fonts = [ "JetBrainsMono" ]; }) # nerdfonts jetbrains mono (nerdfonts.override { fonts = [ "JetBrainsMono" ]; }) # nerdfonts jetbrains mono
] ]