mirror of
https://github.com/davegallant/nix-config
synced 2026-03-03 08:36:36 +00:00
Compare commits
6 Commits
3791e87bc2
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 19ad1a7f59 | |||
| 3c4a637235 | |||
| 78d9960594 | |||
| a7bd9c8813 | |||
| d6dbb86a41 | |||
| 70c5a30fc0 |
18
flake.lock
generated
18
flake.lock
generated
@@ -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": {
|
||||
|
||||
30
home.nix
30
home.nix
@@ -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";
|
||||
};
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
|
||||
@@ -239,6 +239,8 @@
|
||||
};
|
||||
};
|
||||
|
||||
services.flatpak.enable = true;
|
||||
|
||||
services.avahi = {
|
||||
enable = true;
|
||||
nssmdns4 = true;
|
||||
|
||||
@@ -116,11 +116,10 @@ in
|
||||
# gaming
|
||||
heroic
|
||||
ludusavi
|
||||
lutris
|
||||
mupen64plus
|
||||
protonup-qt
|
||||
unstable.mcpelauncher-ui-qt
|
||||
unstable.ryubing
|
||||
unstable.lutris
|
||||
wine
|
||||
|
||||
# kde
|
||||
|
||||
Reference in New Issue
Block a user