test

config.nix

@@ -1,81 +1,63 @@
 {
-  hostname = "hakase";
-  username = "kenji";
-  timezone = "America/Chicago";
+  myConfig = {
+    general = {
+      Hostname = "nixos";
+      Timezone = "America/Chicago";
+      Username = "kenji";
 
-  vpn = {
-    vpnEnable = false;
-    vpnSecretFile = "/home/kenji/Wireguard/secret";
-  };
-
-  gitProfile = {
-    user = "biscuit";
-    email = "biscuit@sakamoto.dev";
-    defaultBranch = "master";
-  };
-
-  terminal = {
-    termFont = "JetBrainsMono Nerd Font"; # e.g., JetBrainsMono Nerd Font
-    termSize = "18";
-    termShell = "fish";
-    shellAliases = {
-      ls = "ls --color=auto";
-      update = ''
-        sh -c '
-          if [ "$(uname)" = "Darwin" ]; then
-            sudo darwin-rebuild switch --flake ~/.config/nixos#macos
-          else
-            sudo nixos-rebuild switch --flake ~/.config/nixos#desktop --impure && home-manager switch --flake ~/.config/nixos#desktop --impure
-          fi
-        '
-      '';
-      agu = "pkill gjs & ags run ~/.config/nixos/pkgs/ags/biscuit/app.ts & disown (jobs -p) &";
+      Terminal = {
+        font = "JetBrainsMono Nerd Font";
+        size = "12";
+        shell = "fish"; # or zsh
+        aliases = {
+          ls = "ls --color=auto";
+        };
+      };
+      Git = {
+        user = "";
+        email = "";
+        defaultBranch = "master";
+      };
+    };
+    linux = {
+      Boot = {
+        mode = "grub"; # systemd or grub
+      };
+      Gaming = {
+        enable = true;
+      };
+      Apps = {
+        packages = pkgs:
+          with pkgs; [
+            jellyfin-media-player
+          ];
+      };
+      Hyprland = {
+        monitors = [];
+      };
+    };
+    optionals = {
+      Builds = {
+        trustedUsers = [
+          "@groups"
+        ];
+        buildMachines = [
+          {
+            hostName = "";
+            sshUser = "";
+            sshKey = "";
+            system = "";
+            supportedFeatures = ["big-parallel" "kvm" "nixos-test"];
+          }
+        ];
+      };
+      Ssh = {
+        extraConfig = ''
+          Host macair
+            User biscuit
+            HostName 192.168.68.81
+        '';
+      };
     };
   };
-
-  allowUnfree = true; # allows installation of commercial apps.
-  touchpadSupport = false;
-
-  logitech-hardware = {
-    enable = true;
-  };
-
-  # Custom Applications
-  linux-apps = {
-    gamingDesktop = true; # adds steam
-    my-apps = pkgs:
-      with pkgs; [
-        jellyfin-media-player
-      ];
-  };
-
-  hyprconf = {
-    monitor = [
-      "DP-1,highres@165,0x1080,auto"
-      "HDMI-A-4,highres@highrr,0x0,auto"
-    ];
-  };
-
-  sshExtraConfig = ''
-    Host macair
-      User biscuit
-      HostName 192.168.68.81
-  '';
-
-  # BUILD (optional), you can remove these blocks.
-  builder = {
-    trustedUsers = [
-      "@groups"
-      "biscuit"
-    ];
-    buildMachines = [
-      {
-        hostName = "192.168.68.81";
-        sshUser = "biscuit";
-        sshKey = "/home/biscuit/.ssh/id_rsa.pub";
-        system = "x86_64-linux";
-        supportedFeatures = ["big-parallel" "kvm" "nixos-test"];
-      }
-    ];
-  };
 }