v/infrastructure
1
0
Fork 0
Code Issues 13 Pull requests 1 Projects Releases Packages Activity Actions

update nvim config

Browse source
This commit is contained in:
Vivian 2023-12-15 17:35:14 +01:00
parent 567a6e86bc
commit 95a641d679
3 changed files with 49 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
flake.lock generated
View file

@ -664,11 +664,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1702203126, "lastModified": 1702538064,
"narHash": "sha256-4BhN2Vji19MzRC7SUfPZGmtZ2WZydQeUk/ogfRBIZMs=", "narHash": "sha256-At5GwJPu2tzvS9dllhBoZmqK6lkkh/sOp2YefWRlaL8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "defbb9c5857e157703e8fc7cf3c2ceb01cb95883", "rev": "0e2e443ff24f9d75925e91b89d1da44b863734af",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -875,11 +875,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1702336390, "lastModified": 1702453208,
"narHash": "sha256-BRO8J8QbmyuS0XMh4UfY11akgTGZj1YhkqNvR83JrsI=", "narHash": "sha256-0wRi9SposfE2wHqjuKt8WO2izKB/ASDOV91URunIqgo=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "fef05bf9c8e818f4ca1425ef4c18e6680becd072", "rev": "7763c6fd1f299cb9361ff2abf755ed9619ef01d6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1066,11 +1066,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1702310776, "lastModified": 1702483393,
"narHash": "sha256-T2KJpsNjAytMsP6+xrhXfAb2KTG6Yt2D4hTTugpsJFo=", "narHash": "sha256-xdZ+69I2z5ywVtJHW3+BQ99rKFDPkyaPNznstw+gfS8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "120a26f8ce32ac2bdc0e49a9fed830b7446416b4", "rev": "224b3a5ad9a960e4a6e3cd59233c1616164c5ef5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1081,11 +1081,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1701436327, "lastModified": 1702312524,
"narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=", "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "91050ea1e57e50388fa87a3302ba12d188ef723a", "rev": "a9bf124c46ef298113270b1f84a164865987a91c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1161,11 +1161,11 @@
}, },
"nixpkgs_stable": { "nixpkgs_stable": {
"locked": { "locked": {
"lastModified": 1702221085, "lastModified": 1702350026,
"narHash": "sha256-Br3GCSkkvkmw46cT6wCz6ro2H1WgDMWbKE0qctbdtL0=", "narHash": "sha256-A+GNZFZdfl4JdDphYKBJ5Ef1HOiFsP18vQe9mqjmUis=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c2786e7084cbad90b4f9472d5b5e35ecb57958af", "rev": "9463103069725474698139ab10f17a9d125da859",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1181,11 +1181,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1702334607, "lastModified": 1702508038,
"narHash": "sha256-C5UavWJC9xN2uFbn0G6Vc6t5GTwZCiQTwV/SUFR4ru4=", "narHash": "sha256-m/Oo1A9fjd9WroX9Ta/K01qjN3Vz2M7VRnS1qCxE/pU=",
"owner": "pta2002", "owner": "pta2002",
"repo": "nixvim", "repo": "nixvim",
"rev": "c9149122a8930b370678bf59b7b3226a2a6ee76a", "rev": "41f5b167e7cfe2fe1ef90f7007708916bd65565d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1196,11 +1196,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1702363946, "lastModified": 1702543472,
"narHash": "sha256-cWP/nn2XugnuHVuFRVQhK2v4ZaDm8PgXO6hNN8zZ2q8=", "narHash": "sha256-4qX7qaSoabwR+kK0tcPMhafjVyYJnHroRNlWAVG7sVU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "1f0b35155592748d8fe4fc31eaf36942b97120b4", "rev": "e45bc50d0fb04e748cf890062023da461c2476ad",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1238,11 +1238,11 @@
"nixpkgs-stable": "nixpkgs-stable_3" "nixpkgs-stable": "nixpkgs-stable_3"
}, },
"locked": { "locked": {
"lastModified": 1700922917, "lastModified": 1702456155,
"narHash": "sha256-ej2fch/T584b5K9sk1UhmZF7W6wEfDHuoUYpFN8dtvM=", "narHash": "sha256-I2XhXGAecdGlqi6hPWYT83AQtMgL+aa3ulA85RAEgOk=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "e5ee5c5f3844550c01d2131096c7271cec5e9b78", "rev": "007a45d064c1c32d04e1b8a0de5ef00984c419bc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1601,11 +1601,11 @@
"utils": "utils_3" "utils": "utils_3"
}, },
"locked": { "locked": {
"lastModified": 1699433213, "lastModified": 1702405114,
"narHash": "sha256-NbYXC4jjAuxbw1mL7w5LqYd3jBKnwxk36jTQA8rnERM=", "narHash": "sha256-a4tIqZsu7eCkxfFR9zrQmOAiJnEoz7i1jH9wVzQUF5E=",
"owner": "serokell", "owner": "serokell",
"repo": "vault-secrets", "repo": "vault-secrets",
"rev": "7686f5d6f0411040407435e4361663b7fabaf171", "rev": "0fbb2cada27ee335997799d340092d171ab296a3",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
nixos/common/desktop/default.nix
View file

@ -14,6 +14,8 @@
}; };
}; };
programs.nix-ld.enable = true;
hardware.keyboard.qmk.enable = true; hardware.keyboard.qmk.enable = true;
home-manager = { home-manager = {
useGlobalPkgs = true; useGlobalPkgs = true;

37
nixos/common/hm-modules/nvim.nix
View file

@ -1,17 +1,6 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
with lib; let cfg = config.programs.v.nvim;
let in with lib; {
cfg = config.programs.v.nvim;
cmp-vimtex = pkgs.vimUtils.buildVimPlugin {
name = "cmp-vimtex";
src = pkgs.fetchFromGitHub {
owner = "micangl";
repo = "cmp-vimtex";
rev = "2b5089a79b29418e6afcdc7804d2b9f2f002946b";
hash = "sha256-IcXjCNXfiV8WMP4S41uy3C9OsKUi3zJnvg5MJVu3Khw=";
};
};
in {
options.programs.v.nvim = { enable = mkEnableOption "nvim"; }; options.programs.v.nvim = { enable = mkEnableOption "nvim"; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
programs.nixvim = { programs.nixvim = {
@ -50,6 +39,10 @@ in {
key = "<C-_>"; key = "<C-_>";
action = '' action = ''
function() function()
local esc = vim.api.nvim_replace_termcodes(
'<ESC>', true, false, true
)
vim.api.nvim_feedkeys(esc, 'nx', false)
require('Comment.api').toggle.linewise(vim.fn.visualmode()) require('Comment.api').toggle.linewise(vim.fn.visualmode())
end end
''; '';
@ -61,11 +54,21 @@ in {
action = "vim.lsp.buf.format"; action = "vim.lsp.buf.format";
lua = true; lua = true;
} }
{
mode = "n";
key = "t";
action = ":FloatermToggle myfloat<CR>";
}
{
mode = "t";
key = "<ESC>";
action = "function() vim.cmd(':FloatermToggle myfloat') end";
lua = true;
}
]; ];
extraPlugins = with pkgs.vimPlugins; [ extraPlugins = with pkgs.vimPlugins; [
FixCursorHold-nvim FixCursorHold-nvim
cmp-vimtex
luasnip luasnip
plenary-nvim plenary-nvim
neotest neotest
@ -142,15 +145,13 @@ in {
vimtex.enable = true; vimtex.enable = true;
floaterm.enable = true;
nvim-cmp = { nvim-cmp = {
enable = true; enable = true;
autoEnableSources = true; autoEnableSources = true;
sources = [ sources = [
{ name = "nvim_lsp"; } { name = "nvim_lsp"; }
{
name = "vimtex";
}
# { name = "cmp-latex-symbols"; }
{ {
name = "luasnip"; name = "luasnip";
option = { show_autosnippets = true; }; option = { show_autosnippets = true; };