nixowos/defaults
electria 934a07640e
git: unset conflictStyle
diff3 adds a lot of lines to do the conflict,
which can make it harder to understand in full sometimes.

especially when the lsp is just filling it with errors
2026-06-26 07:42:05 -07:00
..
browsers.nix feat(defaults/browsers): add to firefox 2026-04-08 13:12:05 -07:00
default.nix fix(defaults/jp): remove due to inconsistent application 2026-04-06 10:23:50 -07:00
git.nix git: unset conflictStyle 2026-06-26 07:42:05 -07:00
lix.nix fix: avoid hardcoding lix version 2026-05-26 11:44:33 -07:00
luks.nix system: move all to defaults 2026-03-23 21:06:39 -07:00
nix.nix feat(treewide): trim down packages 2026-06-24 10:19:33 -07:00
plasma.nix feat(treewide): trim down packages 2026-06-24 10:19:33 -07:00
shell.nix feat(treewide): trim down packages 2026-06-24 10:19:33 -07:00
system.nix feat(system): remove sshfs 2026-05-01 14:45:21 -07:00
tmux.nix defaults: cleanup 2026-03-23 21:00:42 -07:00