feat: add ollama, git-delta, alejandra, broot, trash-cli, texliveFull; extract git.nix
This commit is contained in:
parent
4ab3ecc2d0
commit
23aec94f2a
3 changed files with 43 additions and 2 deletions
|
|
@ -26,6 +26,14 @@
|
||||||
(pass.withExtensions (ext: [ ext.pass-otp ]))
|
(pass.withExtensions (ext: [ ext.pass-otp ]))
|
||||||
gpgme
|
gpgme
|
||||||
gnupg
|
gnupg
|
||||||
|
|
||||||
|
# Extras
|
||||||
|
ollama # CLI для LLM
|
||||||
|
git-delta # красивый git diff
|
||||||
|
alejandra # nix-форматтер
|
||||||
|
broot # tree с превью
|
||||||
|
trash-cli # rm с корзиной
|
||||||
|
texliveFull # LaTeX (~4GB, для математики)
|
||||||
];
|
];
|
||||||
|
|
||||||
# TODO: global npm/pnpm packages not managed by nix for now
|
# TODO: global npm/pnpm packages not managed by nix for now
|
||||||
|
|
|
||||||
|
|
@ -2,13 +2,12 @@
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./cli.nix
|
./cli.nix
|
||||||
|
./git.nix
|
||||||
./zsh.nix
|
./zsh.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
home.stateVersion = "24.11";
|
home.stateVersion = "24.11";
|
||||||
|
|
||||||
programs.git.enable = true;
|
|
||||||
|
|
||||||
home.sessionVariables = {
|
home.sessionVariables = {
|
||||||
SEARXNG_URL = "https://search.iscg.dev";
|
SEARXNG_URL = "https://search.iscg.dev";
|
||||||
PATH = "/etc/profiles/per-user/michaotic/bin:$HOME/.nix-profile/bin:$HOME/bin:$HOME/.local/bin:$HOME/.npm-global/bin:/Users/michaotic/.opencode/bin:/Users/michaotic/.local/share/pi-node/node-v22.23.1-darwin-arm64/bin";
|
PATH = "/etc/profiles/per-user/michaotic/bin:$HOME/.nix-profile/bin:$HOME/bin:$HOME/.local/bin:$HOME/.npm-global/bin:/Users/michaotic/.opencode/bin:/Users/michaotic/.local/share/pi-node/node-v22.23.1-darwin-arm64/bin";
|
||||||
|
|
|
||||||
34
home/git.nix
Normal file
34
home/git.nix
Normal file
|
|
@ -0,0 +1,34 @@
|
||||||
|
{ pkgs, ... }:
|
||||||
|
{
|
||||||
|
programs.git = {
|
||||||
|
enable = true;
|
||||||
|
|
||||||
|
# Use git-delta for pretty diffs
|
||||||
|
delta = {
|
||||||
|
enable = true;
|
||||||
|
options = {
|
||||||
|
navigate = true; # n/N to move between files
|
||||||
|
light = false; # dark mode
|
||||||
|
line-numbers = true;
|
||||||
|
side-by-side = false;
|
||||||
|
syntax-theme = "Catppuccin-mocha";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
# Git user config
|
||||||
|
settings = {
|
||||||
|
user = {
|
||||||
|
name = "michaotic";
|
||||||
|
email = "michaotic@iscg.dev";
|
||||||
|
};
|
||||||
|
init.defaultBranch = "main";
|
||||||
|
pull.rebase = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
# Extra gitignore
|
||||||
|
ignores = [
|
||||||
|
".DS_Store"
|
||||||
|
"*.swp"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
}
|
||||||
Loading…
Reference in a new issue