Resolved conflicts
This commit is contained in:
@@ -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
|
||||
|
@@ -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
|
||||
|
Reference in New Issue
Block a user