Compare commits

..

6 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
d6dbb86a41 Add flatpak 2026-02-28 18:28:16 -05:00
70c5a30fc0 Use unstable.lutris 2026-02-28 18:23:46 -05:00
4 changed files with 35 additions and 18 deletions

18
flake.lock generated
View File

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

View File

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

View File

@@ -239,6 +239,8 @@
}; };
}; };
services.flatpak.enable = true;
services.avahi = { services.avahi = {
enable = true; enable = true;
nssmdns4 = true; nssmdns4 = true;

View File

@@ -116,11 +116,10 @@ in
# gaming # gaming
heroic heroic
ludusavi ludusavi
lutris
mupen64plus mupen64plus
protonup-qt protonup-qt
unstable.mcpelauncher-ui-qt
unstable.ryubing unstable.ryubing
unstable.lutris
wine wine
# kde # kde