fixed merge conflicts

2024-04-13 15:35:13 +02:00 · 2024-04-13 15:35:13 +02:00 · 62d0e0591b
commit 62d0e0591b
parent d01d0541da 20beb4df31
49 changed files with 814 additions and 92 deletions
--- a/hosts/vali/mars/configuration.nix
+++ b/hosts/vali/mars/configuration.nix
@ -34,7 +34,7 @@
          }       
      '';
  };
-  myOptions = {
+  modules = {
      other = {
          system = {
              hostname = "mars";