rrvsh/pantheon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: merge

Browse source
This commit is contained in:
Mohammad Rafiq 2025-03-26 22:18:53 +08:00
parent 4966956525
commit 8249121529
No known key found for this signature in database
1 changed files with 0 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

15
systems/modules/common.nix
View file

@ -56,21 +56,6 @@
i18n.defaultLocale = "en_SG.UTF-8"; i18n.defaultLocale = "en_SG.UTF-8";
<<<<<<< HEAD
=======
i18n.extraLocaleSettings = {
LC_ADDRESS = "en_SG.UTF-8";
LC_IDENTIFICATION = "en_SG.UTF-8";
LC_MEASUREMENT = "en_SG.UTF-8";
LC_MONETARY = "en_SG.UTF-8";
LC_NAME = "en_SG.UTF-8";
LC_NUMERIC = "en_SG.UTF-8";
LC_PAPER = "en_SG.UTF-8";
LC_TELEPHONE = "en_SG.UTF-8";
LC_TIME = "en_SG.UTF-8";
};
>>>>>>> 5a2d890e70efd93b41d8345439dffd1dabc7f5d3
programs.nix-index-database.comma.enable = true; programs.nix-index-database.comma.enable = true;
networking = { networking = {