Merge branch 'main' of github.com:bloxx12/nichts

hosts/default.nix

@@ -4,11 +4,11 @@ let
   inherit (self) lib;
 in {
   # Vali
-  vali = lib.nixosSystem {
+  mars = lib.nixosSystem {
     system = "x86_64-linux";
     specialArgs = { inherit lib inputs self; };
     modules = [
-        ./vali
+        ./vali/mars
         ../modules
         inputs.home-manager.nixosModules.home-manager
         inputs.agenix.nixosModules.default

hosts/vali/mars/configuration.nix

@@ -9,8 +9,9 @@
   myOptions = {
       other = {
           system = {
-              hostname = "nixos";
+              hostname = "mars";
               username = "vali";
+              gitPath = "/home/vali/Git/nichts";
           };
           home-manager = {
               enable = true;

hosts/vali/mars/i3.nix

@@ -7,7 +7,7 @@ in {
   config = mkIf cfg.enable {
     services.xserver = {
       enable = true;
-      layout =  "de";
+      xkb.layout =  "de";
       windowManager = {
           bspwm.enable = true;
           i3.enable = true;

hosts/vali/mars/profile.nix

@@ -0,0 +1,11 @@
+_: {
+    imports = [
+        ../../../options/boot/grub-boot.nix
+        ../../../options/desktop/fonts.nix
+        ../../../options/common/networking.nix
+        ../../../options/common/gpu/nvidia.nix
+#        ../../options/common/pin-registry.nix
+#        ../../options/common/preserve-system.nix
+        #../../options/
+    ];
+}

hosts/vali/profile.nix

@@ -1,11 +0,0 @@
-_: {
-    imports = [
-        ../../options/boot/grub-boot.nix
-        ../../options/desktop/fonts.nix
-        ../../options/common/networking.nix
-        ../../options/common/gpu/nvidia.nix
-#        ../../options/common/pin-registry.nix
-#        ../../options/common/preserve-system.nix
-        #../../options/
-    ];
-}