chore: update readme
This commit is contained in:
parent
1882092a6a
commit
42895cce33
2 changed files with 32 additions and 10 deletions
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
## Why?
|
||||
|
||||
- A single repository that manages all my machines: Framework13, Steam Deck, other potential servers
|
||||
- A single repository that manages all my machines: Framework13, and Steam Deck
|
||||
- Must be able to:
|
||||
- apply configuration to any machine from my main Framework13 laptop
|
||||
- encrypt and store secrets I might need here
|
||||
|
|
@ -28,15 +28,14 @@ Shell: [fish](https://fishshell.com/)
|
|||
- sane scripting
|
||||
- user friendly
|
||||
|
||||
Text Editor: [neovim](https://neovim.io/)
|
||||
- vi-movements
|
||||
- great community, loads of completions
|
||||
Text Editor: [helix](https://helix-editor.com/)
|
||||
- better movements
|
||||
- batteries included (LSP, Treesitter, ...)
|
||||
|
||||
Secrets Management: [sops-nix](https://github.com/Mic92/sops-nix)
|
||||
- easy to manage AGE keys
|
||||
- easy to integrate into my git repository (RIP me when we get quantum chips breaking encryption)
|
||||
|
||||
Code Completion & Language Servers: Neovim LSP & [Mason](https://github.com/williamboman/mason.nvim)
|
||||
Colorscheme: [Rosé Pine](https://rosepinetheme.com/)
|
||||
|
||||
## Rice 米
|
||||
|
|
|
|||
|
|
@ -1,4 +1,9 @@
|
|||
{ config, lib, pkgs, inputs, ... }:
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
inputs,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
# Interactive TUI (log browsing, describe, squash, rebase) — the
|
||||
|
|
@ -29,7 +34,10 @@
|
|||
|
||||
ui = {
|
||||
# Use delta for diffs (consistent with git delta integration)
|
||||
diff-formatter = [ "delta" "--color-only" ];
|
||||
diff-formatter = [
|
||||
"delta"
|
||||
"--color-only"
|
||||
];
|
||||
pager = "delta";
|
||||
default-command = "log";
|
||||
};
|
||||
|
|
@ -61,14 +69,29 @@
|
|||
# the first read of a large agent-generated diff, delta the close read.
|
||||
merge-tools.difft = {
|
||||
program = lib.getExe pkgs.difftastic;
|
||||
diff-args = [ "--color=always" "$left" "$right" ];
|
||||
diff-args = [
|
||||
"--color=always"
|
||||
"$left"
|
||||
"$right"
|
||||
];
|
||||
};
|
||||
|
||||
aliases = {
|
||||
# Drag the nearest bookmark up to the parent of @ — the standard
|
||||
# "point my branch at what I just finished" move before jj git push.
|
||||
tug = [ "bookmark" "move" "--from" "closest_bookmark(@-)" "--to" "@-" ];
|
||||
dt = [ "diff" "--tool" "difft" ];
|
||||
tug = [
|
||||
"bookmark"
|
||||
"move"
|
||||
"--from"
|
||||
"closest_bookmark(@-)"
|
||||
"--to"
|
||||
"@-"
|
||||
];
|
||||
dt = [
|
||||
"diff"
|
||||
"--tool"
|
||||
"difft"
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue