Compare commits

..

8 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
3791e87bc2 Add peon-ping 2026-02-28 16:25:01 -05:00
5edb0c9831 nix flake update: 2026-02-27 22:20:03 UTC
• Updated input 'darwin':
    'github:lnl7/nix-darwin/08585aacc3d6d6c280a02da195fdbd4b9cf083c2?narHash=sha256-owcSz2ICqTSvhBbhPP%2B1eWzi88e54rRZtfCNE5E/wwg%3D' (2026-01-05)
  → 'github:lnl7/nix-darwin/ebec37af18215214173c98cf6356d0aca24a2585?narHash=sha256-Utk0zd8STPsUJPyjabhzPc5BpPodLTXrwkpXBHYnpeg%3D' (2026-02-26)
• Updated input 'home-manager':
    'github:nix-community/home-manager/cb6c151f5c9db4df0b69d06894dc8484de1f16a0?narHash=sha256-EDLi%2BYAsEEAmMeZe1v6GccuGRbCkpSZp/%2BA6g%2BpivR8%3D' (2026-02-22)
  → 'github:nix-community/home-manager/36e38ca0d9afe4c55405fdf22179a5212243eecc?narHash=sha256-aqBl3GNpCadMoJ/hVkWTijM1Aeilc278MjM%2BLA3jK6g%3D' (2026-02-25)
• Updated input 'home-manager/nixpkgs':
    'github:NixOS/nixpkgs/c217913993d6c6f6805c3b1a3bda5e639adfde6d?narHash=sha256-D1PA3xQv/s4W3lnR9yJFSld8UOLr0a/cBWMQMXS%2B1Qg%3D' (2026-02-20)
  → 'github:NixOS/nixpkgs/e764fc9a405871f1f6ca3d1394fb422e0a0c3951?narHash=sha256-sdaqdnsQCv3iifzxwB22tUwN/fSHoN7j2myFW5EIkGk%3D' (2026-02-24)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/e764fc9a405871f1f6ca3d1394fb422e0a0c3951?narHash=sha256-sdaqdnsQCv3iifzxwB22tUwN/fSHoN7j2myFW5EIkGk%3D' (2026-02-24)
  → 'github:NixOS/nixpkgs/1267bb4920d0fc06ea916734c11b0bf004bbe17e?narHash=sha256-7DaQVv4R97cii/Qdfy4tmDZMB2xxtyIvNGSwXBBhSmo%3D' (2026-02-25)
• Updated input 'weathr':
    'github:Veirt/weathr/7e3d7cd909fa61c36a6cf99ea84980199c3a9f63?narHash=sha256-PXr/5eKV/oPvjsas5AIkRS88gFnFskr6%2BeXWdeR8Yo8%3D' (2026-02-24)
  → 'github:Veirt/weathr/56aa86fe83cb42f96f497087bd19c8e073f7ee1e?narHash=sha256-n/fjjbfBtzmd7QV7jInnb%2Bk5tC3g8sXzoI2rka8scwI%3D' (2026-02-27)
2026-02-27 17:20:03 -05:00
5 changed files with 49 additions and 30 deletions

42
flake.lock generated
View File

@@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1767634391, "lastModified": 1772129556,
"narHash": "sha256-owcSz2ICqTSvhBbhPP+1eWzi88e54rRZtfCNE5E/wwg=", "narHash": "sha256-Utk0zd8STPsUJPyjabhzPc5BpPodLTXrwkpXBHYnpeg=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "08585aacc3d6d6c280a02da195fdbd4b9cf083c2", "rev": "ebec37af18215214173c98cf6356d0aca24a2585",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -101,11 +101,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1771744638, "lastModified": 1772302941,
"narHash": "sha256-EDLi+YAsEEAmMeZe1v6GccuGRbCkpSZp/+A6g+pivR8=", "narHash": "sha256-TL3+ckbOTILXrR0qSK3dJj2BJ0S5yz/YSsUF1oEgd9g=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "cb6c151f5c9db4df0b69d06894dc8484de1f16a0", "rev": "9b9142b5fe214c2adabe86257c33e022372b7c96",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -145,11 +145,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1771574726, "lastModified": 1771903837,
"narHash": "sha256-D1PA3xQv/s4W3lnR9yJFSld8UOLr0a/cBWMQMXS+1Qg=", "narHash": "sha256-sdaqdnsQCv3iifzxwB22tUwN/fSHoN7j2myFW5EIkGk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c217913993d6c6f6805c3b1a3bda5e639adfde6d", "rev": "e764fc9a405871f1f6ca3d1394fb422e0a0c3951",
"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": {
@@ -192,11 +192,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1771903837, "lastModified": 1772047000,
"narHash": "sha256-sdaqdnsQCv3iifzxwB22tUwN/fSHoN7j2myFW5EIkGk=", "narHash": "sha256-7DaQVv4R97cii/Qdfy4tmDZMB2xxtyIvNGSwXBBhSmo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e764fc9a405871f1f6ca3d1394fb422e0a0c3951", "rev": "1267bb4920d0fc06ea916734c11b0bf004bbe17e",
"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": {
@@ -366,11 +366,11 @@
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1771953414, "lastModified": 1772212496,
"narHash": "sha256-PXr/5eKV/oPvjsas5AIkRS88gFnFskr6+eXWdeR8Yo8=", "narHash": "sha256-n/fjjbfBtzmd7QV7jInnb+k5tC3g8sXzoI2rka8scwI=",
"owner": "Veirt", "owner": "Veirt",
"repo": "weathr", "repo": "weathr",
"rev": "7e3d7cd909fa61c36a6cf99ea84980199c3a9f63", "rev": "56aa86fe83cb42f96f497087bd19c8e073f7ee1e",
"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

@@ -80,6 +80,7 @@
"k6" "k6"
"node" "node"
"oras" "oras"
"peon-ping"
"vault" "vault"
]; ];
@@ -113,6 +114,7 @@
taps = [ taps = [
"hashicorp/tap" "hashicorp/tap"
"PeonPing/tap"
]; ];
}; };

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