Compare commits

...

4 commits

Author SHA1 Message Date
cy
67048909a9
flake update
Signed-off-by: cy <cy@cy7.sh>
2025-01-29 16:49:19 -05:00
cy
b07c255869
nix fmt and some cleanup
Signed-off-by: cy <cy@cy7.sh>
2025-01-29 16:48:28 -05:00
cy
069a65d4c7
nixvim: add copilot stuff 2025-01-29 16:23:33 -05:00
cy
b2a6740256
vscode goodies
Signed-off-by: cy <cy@cy7.sh>
2025-01-29 15:24:42 -05:00
7 changed files with 101 additions and 40 deletions

52
flake.lock generated
View file

@ -120,11 +120,11 @@
"rocksdb": "rocksdb" "rocksdb": "rocksdb"
}, },
"locked": { "locked": {
"lastModified": 1737945015, "lastModified": 1738132650,
"narHash": "sha256-VCa7UAWqP14IC+fmT4P3rxGhkugDlU/4FZqqPyFUs9s=", "narHash": "sha256-ryebu2VoopIpr5+DuHIs2/x60u+3EzRJexYRWVJn2AE=",
"owner": "girlbossceo", "owner": "girlbossceo",
"repo": "conduwuit", "repo": "conduwuit",
"rev": "71a3855af61b0071832c23085f76a8711e32b49c", "rev": "eb7d893c8675f955fa770c8ae6f1c32a2394284c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -562,11 +562,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737968762, "lastModified": 1738178313,
"narHash": "sha256-xiPARGKwocaMtv+U/rgi+h2g56CZZEmrcl7ldRaslq8=", "narHash": "sha256-/8TLf6LkXGRGERzcWMNDeXjYaHSbexmfV+ofheo7K6k=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "e1ae908bcc30af792b0bb0a52e53b03d2577255e", "rev": "420a0d9506b5dac4d86a68b9ef8e763624ad86c6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -683,11 +683,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1738097047, "lastModified": 1738174211,
"narHash": "sha256-GcgcCYhAkxU9BtzsUImFRIEFK0WqgjKrMqMySImGLK4=", "narHash": "sha256-eYmp1mKM4kULV1W+EBtCPk6LmKWl2REivaYfGRl+AWo=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "3a41bf32a78550f7373b51d39c07a4bb91bb9f2e", "rev": "64e33a7e09a0d1faacf2fd3f6ebd647fe4d8346a",
"revCount": 16702, "revCount": 17329,
"type": "git", "type": "git",
"url": "https://git.lix.systems/lix-project/lix" "url": "https://git.lix.systems/lix-project/lix"
}, },
@ -710,11 +710,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738009885, "lastModified": 1738176840,
"narHash": "sha256-zPch36LSTs8dZJZlIiufXuY7wut06xp4CMdf/oqXoq0=", "narHash": "sha256-NG3IRvRs3u3btVCN861FqHvgOwqcNT/Oy6PBG86F5/E=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "cf43eeb6b376cc36f70b0632bc39dc949b9f3b59", "rev": "621aae0f3cceaffa6d73a4fb0f89c08d338d729e",
"revCount": 132, "revCount": 133,
"type": "git", "type": "git",
"url": "https://git.lix.systems/lix-project/nixos-module" "url": "https://git.lix.systems/lix-project/nixos-module"
}, },
@ -737,11 +737,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1737961005, "lastModified": 1738156024,
"narHash": "sha256-b4hqJNgyx8lnngz7NFcJ1W+59xQnMQYF0EK5g0IOy7c=", "narHash": "sha256-D3cox2cbtFauXz1skDTkJwSU0272wY6wRwiFNm5TV/c=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "e98ae62893568dd31e7a7e4e75e1dbbf23f759a0", "rev": "541920ede8b5d48f110c94d858a1ddf283eac3b9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -770,11 +770,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1737956052, "lastModified": 1738148186,
"narHash": "sha256-Gr+tkCSuhQ5NT04hv/PoHExCgbuqRA/GZQv+le40LNY=", "narHash": "sha256-Yd2xKbZ8S4LC5sxPleuutlX0RbKnI93LhciVhneNBHQ=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "9b4d73f13a6906537faf01b5c5e5e2fee9dd602e", "rev": "1d3820a064f1f3b686eb6e8a1aab155681a96457",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1045,11 +1045,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1738090407, "lastModified": 1738178544,
"narHash": "sha256-X6BvM495ef4Rk+7WFhvYFwJoKteQYgvSaRERLGofZ+s=", "narHash": "sha256-UbM+zJFlze877N5j2YMLKYFX7t05VvmuNX2M0vJ7RfI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2c00621e9692affa61da62f82e76648c5a07e6a0", "rev": "975ac0ab33ee7fea64842047a96f5d679d90913c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1082,11 +1082,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738106190, "lastModified": 1738184667,
"narHash": "sha256-woDlUpfK4n1znQfGREKDLMVOQ4JZo7L6YY/sTPZGw0g=", "narHash": "sha256-+pG3UJVAdVCF3nGRpy5n/tbCzGa64DCWOC8hAxnssD0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "eeafe2a7153197982ccd6ad6678192bca1df446e", "rev": "2f5374c3dcd06c750c36798bce6bccdf8a25bc89",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -126,9 +126,6 @@
... ...
}: }:
{ {
# make pkgs available to `perSystem`
_module.args.pkgs = inputs'.nixpkgs.legacyPackages;
treefmt = { treefmt = {
projectRootFile = "flake.nix"; projectRootFile = "flake.nix";
programs.nixfmt.enable = true; programs.nixfmt.enable = true;

View file

@ -58,6 +58,7 @@
"ctrl+f2" = "detach_tab"; "ctrl+f2" = "detach_tab";
# hints # hints
# > basically means the preceding key is a prefix (think tmux)
"kitty_mod+o>o" = "open_url_with_hints"; "kitty_mod+o>o" = "open_url_with_hints";
"kitty_mod+o>p" = "kitten hints --type path --program -"; "kitty_mod+o>p" = "kitten hints --type path --program -";
"kitty_mod+o>n" = "kitten hints --type line --program -"; "kitty_mod+o>n" = "kitten hints --type line --program -";

View file

@ -73,10 +73,6 @@ in
window-rules = [ window-rules = [
{ {
matches = [ matches = [
{
app-id = "anki";
title = "Add";
}
{ app-id = "mpv"; } { app-id = "mpv"; }
{ app-id = "Bitwarden"; } { app-id = "Bitwarden"; }
{ {
@ -88,7 +84,12 @@ in
open-floating = true; open-floating = true;
} }
{ {
matches = [ { app-id = "anki"; } ]; matches = [
{
app-id = "anki";
title = "Add";
}
];
default-column-width.proportion = .25; default-column-width.proportion = .25;
} }
{ {

View file

@ -24,7 +24,7 @@
extraPlugins = [ extraPlugins = [
(pkgs.vimUtils.buildVimPlugin { (pkgs.vimUtils.buildVimPlugin {
name = "gitub-theme"; name = "github-theme";
src = inputs.nvim-github-theme; src = inputs.nvim-github-theme;
}) })
]; ];
@ -71,6 +71,41 @@
key = "<C-e>"; key = "<C-e>";
mode = "i"; mode = "i";
} }
# quick chat with copilot
{
key = "<leader>ccq";
action.__raw = ''
function()
local input = vim.fn.input("Quick chat: ")
if input ~= "" then
require("CopilotChat").ask(input, { selection = require("CopilotChat.select").buffer })
end
end
'';
mode = [
"n"
"v"
];
}
# ask perplexity a quick question
{
key = "<leader>ccs";
action.__raw = ''
function()
local input = vim.fn.input("Perplexity: ")
if input ~= "" then
require("CopilotChat").ask(input, {
agent = "perplexityai",
selection = false,
})
end
end
'';
mode = [
"n"
"v"
];
}
]; ];
plugins.cmp = { plugins.cmp = {
@ -197,6 +232,13 @@
settings.current_line_blame = true; settings.current_line_blame = true;
}; };
plugins.copilot-chat = {
enable = true;
settings = {
model = "claude-3.5-sonnet";
};
};
plugins.cmp-buffer.enable = true; plugins.cmp-buffer.enable = true;
plugins.cmp-emoji.enable = true; plugins.cmp-emoji.enable = true;
plugins.cmp-nvim-lsp.enable = true; plugins.cmp-nvim-lsp.enable = true;

View file

@ -8,11 +8,30 @@
mutableExtensionsDir = false; mutableExtensionsDir = false;
extensions = with pkgs.vscode-extensions; [ extensions = with pkgs.vscode-extensions; [
vscodevim.vim vscodevim.vim
jnoortheen.nix-ide # nix language support jnoortheen.nix-ide
editorconfig.editorconfig # editorconfig editorconfig.editorconfig
dracula-theme.theme-dracula # color scheme github.github-vscode-theme
tomoki1207.pdf # pdf viewer ];
yzhang.markdown-all-in-one # markdown tools userSettings = {
"workbench.colorTheme" = "GitHub Dark Default";
"files.autoSave" = "afterDelay";
"nix.enableLanguageServer" = true;
"nix.serverPath" = "nixd";
"editor.fontFamily" = "IBM Plex Mono";
"editor.fontSize" = 15;
"editor.wordWrap" = "on";
# vim mode
"vim.handleKeys" = {
"<C-b>" = false; # file tree toggle
};
"vim.normalModeKeyBindings" = [
{
"before" = [ ";" ];
"after" = [ ":" ];
"silent" = true;
}
]; ];
}; };
};
} }

View file

@ -9,6 +9,7 @@
../niri ../niri
../irssi.nix ../irssi.nix
../kitty.nix ../kitty.nix
../vscode.nix
]; ];
home = { home = {
username = "yt"; username = "yt";