Natsu Kagami 73764de6f4 Set diff conflictStyle to zdiff3 ... https://github.blog/open-source/git/highlights-from-git-2-35/ https://git-scm.com/docs/git-config#Documentation/git-config.txt-mergeconflictStyle		2025-01-16 18:57:29 +01:00
..
fish	Enhance nx and nsh to support unstable and git nixpkgs	2024-10-10 16:59:52 +02:00
images	New wallpapaaa	2023-07-05 09:54:39 +02:00
kakoune	Switch typst-lsp to tinymist	2025-01-13 11:11:53 +01:00
modules	Add associations for telegram	2025-01-16 18:57:28 +01:00
common-linux.nix	Disable easyeffects	2024-11-12 22:04:22 +01:00
common.nix	Set diff conflictStyle to zdiff3	2025-01-16 18:57:29 +01:00
config.nix	Remove NUR	2024-08-19 17:28:08 +02:00
kagami-pc-home.nix	Typo on home settings	2024-11-16 00:31:35 +01:00
mac-home.nix	Set up formatting	2022-05-31 17:01:35 +00:00
macbook-home.nix	Move some packages around on Mac	2023-03-14 09:54:12 +01:00
macbook-nixos.nix	Minimal changes to make 24.05 compile on framework	2024-05-27 11:03:15 +02:00
nki-framework.nix	Update to address home-manager config changes	2024-08-02 18:35:31 +02:00
nki-x1c1.nix	Use zen as browser on yoga	2024-11-15 14:13:44 +01:00
osu.nix	Update osu	2025-01-05 14:17:56 +01:00