Compare commits

...

4 Commits

Author SHA1 Message Date
19ad1a7f59 Add codecompanion.nvim 2026-03-01 22:26:40 -05:00
3c4a637235 force X11 with zeditor to avoid shift+v capture 2026-03-01 21:32:49 -05:00
78d9960594 Cleanup zed-editor config 2026-03-01 20:59:35 -05:00
a7bd9c8813 nix flake update: 2026-03-01 04:38:11 UTC
• Updated input 'home-manager':
    'github:nix-community/home-manager/36e38ca0d9afe4c55405fdf22179a5212243eecc?narHash=sha256-aqBl3GNpCadMoJ/hVkWTijM1Aeilc278MjM%2BLA3jK6g%3D' (2026-02-25)
  → 'github:nix-community/home-manager/9b9142b5fe214c2adabe86257c33e022372b7c96?narHash=sha256-TL3%2BckbOTILXrR0qSK3dJj2BJ0S5yz/YSsUF1oEgd9g%3D' (2026-02-28)
• Updated input 'nixpkgs-unstable':
    'github:NixOS/nixpkgs/2fc6539b481e1d2569f25f8799236694180c0993?narHash=sha256-0MAd%2B0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU%3D' (2026-02-23)
  → 'github:NixOS/nixpkgs/dd9b079222d43e1943b6ebd802f04fd959dc8e61?narHash=sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE%3D' (2026-02-27)
• Updated input 'vpngate':
    'github:davegallant/vpngate/e2a3d5ab73ad8a0f052556c0f9d4be2c51058917?narHash=sha256-cKtETtnZvBGV3Jn8/KczzselLepwH%2Bt3vJg24O7wn9c%3D' (2026-02-21)
  → 'github:davegallant/vpngate/184ea2acf2ade5dff27bad958233c6d88c761f5c?narHash=sha256-BWyEll/XLzC8HATyf2EJzWIKT8aJcjtAb2dokfIPInM%3D' (2026-02-28)
2026-02-28 23:38:11 -05:00
2 changed files with 32 additions and 16 deletions

18
flake.lock generated
View File

@@ -101,11 +101,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1772020340,
"narHash": "sha256-aqBl3GNpCadMoJ/hVkWTijM1Aeilc278MjM+LA3jK6g=",
"lastModified": 1772302941,
"narHash": "sha256-TL3+ckbOTILXrR0qSK3dJj2BJ0S5yz/YSsUF1oEgd9g=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "36e38ca0d9afe4c55405fdf22179a5212243eecc",
"rev": "9b9142b5fe214c2adabe86257c33e022372b7c96",
"type": "github"
},
"original": {
@@ -176,11 +176,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1771848320,
"narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=",
"lastModified": 1772198003,
"narHash": "sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2fc6539b481e1d2569f25f8799236694180c0993",
"rev": "dd9b079222d43e1943b6ebd802f04fd959dc8e61",
"type": "github"
},
"original": {
@@ -347,11 +347,11 @@
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1771695802,
"narHash": "sha256-cKtETtnZvBGV3Jn8/KczzselLepwH+t3vJg24O7wn9c=",
"lastModified": 1772279709,
"narHash": "sha256-BWyEll/XLzC8HATyf2EJzWIKT8aJcjtAb2dokfIPInM=",
"owner": "davegallant",
"repo": "vpngate",
"rev": "e2a3d5ab73ad8a0f052556c0f9d4be2c51058917",
"rev": "184ea2acf2ade5dff27bad958233c6d88c761f5c",
"type": "github"
},
"original": {

View File

@@ -171,7 +171,7 @@ in
v = "nvim";
}
// lib.optionalAttrs stdenv.isLinux {
zed = "zeditor";
zed = "env WAYLAND_DISPLAY='' zeditor"; # BUG: zed captures shift+v and g space on wayland
};
};
@@ -265,6 +265,19 @@ in
cmp-path.enable = true;
cmp-treesitter.enable = true;
commentary.enable = true;
codecompanion = {
enable = true;
settings = {
interactions = {
chat = {
adapter = "copilot";
};
inline = {
adapter = "copilot";
};
};
};
};
diffview.enable = true;
gitblame.enable = true;
gitsigns.enable = true;
@@ -409,7 +422,6 @@ in
package = unstable.zed-editor;
extensions = [
"ansible"
"color-highlight"
"dockerfile"
"html"
"make"
@@ -420,17 +432,14 @@ in
];
userSettings = {
icon_theme = "Material Icon Theme";
features = {
edit_prediction_provider = "copilot";
};
vim_mode = true;
vim = {
use_system_clipboard = "on_yank";
};
autosave = "on_focus_change";
format_on_save = "off";
ui_font_size = lib.mkForce 18;
buffer_font_size = lib.mkForce 16;
ui_font_size = 18;
buffer_font_size = 16;
};
userKeymaps = [
{
@@ -442,6 +451,13 @@ in
"ctrl-z" = "editor::Undo";
};
}
{
context = "vim_mode == normal";
bindings = {
"g space" = "editor::OpenExcerpts";
"shift-v" = "vim::ToggleVisualLine";
};
}
];
};