Resolved conflicts

This commit is contained in:
2024-05-10 19:36:46 +02:00
7 changed files with 59 additions and 1 deletions

View File

@@ -10,6 +10,7 @@
../../modules/system/programs/syncthing.nix
../../modules/system/programs/thunar.nix
../../modules/system/programs/virtualization.nix
../../modules/system/programs/waydroid.nix
../../modules/system/utils/common.nix
../../modules/system/utils/docker.nix
../../modules/system/utils/fprint.nix

View File

@@ -7,6 +7,7 @@
../../modules/home/programs/common.nix
../../modules/home/programs/firefox.nix
../../modules/home/programs/git.nix
../../modules/home/programs/joplin.nix
../../modules/home/programs/kitty.nix
# ../../modules/home/programs/modrinth.nix
../../modules/home/programs/neovim