Compare commits
3 Commits
db42c35320
...
e4aa818905
Author | SHA1 | Date | |
---|---|---|---|
e4aa818905 | |||
2bb429c70a | |||
9b28a36c3f |
12
flake.lock
12
flake.lock
@ -23,11 +23,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1688594934,
|
"lastModified": 1690370995,
|
||||||
"narHash": "sha256-3dUo20PsmUd57jVZRx5vgKyIN1tv+v/JQweZsve5q/A=",
|
"narHash": "sha256-9z//23jGegLJrf3ITStLwVf715O39dq5u48Kr/XW14U=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "e11142026e2cef35ea52c9205703823df225c947",
|
"rev": "f3fbbc36b4e179a5985b9ab12624e9dfe7989341",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -39,11 +39,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1688590700,
|
"lastModified": 1690272529,
|
||||||
"narHash": "sha256-ZF055rIUP89cVwiLpG5xkJzx00gEuuGFF60Bs/LM3wc=",
|
"narHash": "sha256-MakzcKXEdv/I4qJUtq/k/eG+rVmyOZLnYNC2w1mB59Y=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "f292b4964cb71f9dfbbd30dc9f511d6165cd109b",
|
"rev": "ef99fa5c5ed624460217c31ac4271cfb5cb2502c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1,6 +0,0 @@
|
|||||||
require("copilot").setup({
|
|
||||||
suggestion = { enabled = false },
|
|
||||||
panel = { enabled = false },
|
|
||||||
})
|
|
||||||
|
|
||||||
require('copilot_cmp').setup({})
|
|
@ -147,10 +147,6 @@ in
|
|||||||
# debugging
|
# debugging
|
||||||
nvim-dap
|
nvim-dap
|
||||||
nvim-dap-ui
|
nvim-dap-ui
|
||||||
|
|
||||||
# copilot
|
|
||||||
copilot-lua
|
|
||||||
copilot-cmp
|
|
||||||
];
|
];
|
||||||
|
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
@ -188,8 +184,6 @@ in
|
|||||||
|
|
||||||
vim.g.gitblame_date_format = "%r"
|
vim.g.gitblame_date_format = "%r"
|
||||||
|
|
||||||
${builtins.readFile ./copilot.lua }
|
|
||||||
|
|
||||||
EOF
|
EOF
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
@ -172,7 +172,7 @@ vim.diagnostic.config({
|
|||||||
})
|
})
|
||||||
|
|
||||||
-- setup diagnostics signs
|
-- setup diagnostics signs
|
||||||
local diagnostics_signs = { Error = "", Want = "", Hint = "", Info = "" }
|
local diagnostics_signs = { Error = "", Warn = "", Hint = "", Info = "" }
|
||||||
for type, icon in pairs(diagnostics_signs) do
|
for type, icon in pairs(diagnostics_signs) do
|
||||||
local hl = "DiagnosticSign" .. type
|
local hl = "DiagnosticSign" .. type
|
||||||
vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = hl })
|
vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = hl })
|
||||||
|
@ -15,7 +15,6 @@ cmp.setup({
|
|||||||
end
|
end
|
||||||
},
|
},
|
||||||
sources = cmp.config.sources({
|
sources = cmp.config.sources({
|
||||||
{ name = "copilot" },
|
|
||||||
{ name = "nvim_lsp" },
|
{ name = "nvim_lsp" },
|
||||||
{ name = "nvim_lsp_signature_help" },
|
{ name = "nvim_lsp_signature_help" },
|
||||||
{ name = "luasnip" },
|
{ name = "luasnip" },
|
||||||
@ -60,7 +59,6 @@ cmp.setup({
|
|||||||
fields = { "menu", "abbr", "kind" },
|
fields = { "menu", "abbr", "kind" },
|
||||||
format = function(entry, item)
|
format = function(entry, item)
|
||||||
local menu_icon = {
|
local menu_icon = {
|
||||||
copilot = "",
|
|
||||||
nvim_lsp = "λ",
|
nvim_lsp = "λ",
|
||||||
luasnip = "⋗",
|
luasnip = "⋗",
|
||||||
buffer = "Ω",
|
buffer = "Ω",
|
||||||
|
Reference in New Issue
Block a user