wip

common/flake.nix

@@ -19,25 +19,13 @@
             lib,
             ...
           }:
-          let
-            ccfg = import ./config.nix;
-            cfg_path = "${ccfg.custom_config_key}";
-            cfg = config.${cfg_path};
-          in
           {
             imports = [
+              ./options.nix
               ./boot
               ./users
               ./general
             ];
-            options.${cfg_path} = {
-              systemName = lib.mkOption {
-                type = lib.types.str;
-                description = "The name of the system.";
-              };
-            };
-            config = {
-            };
           };
       };
     };

common/options.nix

@@ -0,0 +1,18 @@
+{
+  config,
+  lib,
+  ...
+}:
+let
+  ccfg = import ./config.nix;
+  cfg_path = "${ccfg.custom_config_key}";
+  cfg = config.${cfg_path};
+in
+{
+  options.${cfg_path} = {
+    systemName = lib.mkOption {
+      type = lib.types.str;
+      description = "The name of the system.";
+    };
+  };
+}

hosts/oren/flake.nix

@@ -46,31 +46,27 @@
                 { pkgs, ... }:
                 {
                   imports = [
-                    ../../components/nix/lua.nix
                     ../../components/nix/rust-dev.nix
                     ../../components/nix/qflipper.nix
-                    ../../components/nix/qdirstat.nix
                     ../../components/nix/tailscale.nix
                   ];
+
+                  environment.systemPackages = with pkgs; [
+                    lua
+                    qdirstat
+                  ];
+
                   ringofstorms_common = {
-                    boot.systemd.enable = true;
-                  };
-                  mods = {
-                    common = {
                     systemName = configuration_name;
-                      allowUnfree = true;
-                      primaryUser = "josh";
-                      docker = true;
-                      zsh = true;
+                    boot.systemd.enable = true;
+                    users = {
+                      admins = [ "josh" ];
                       users = {
                         josh = {
                           openssh.authorizedKeys.keys = [
                             "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILMzgAe4od9K4EsvH2g7xjNU7hGoJiFJlYcvB0BoDCvn nix2oren"
                           ];
-                          initialPassword = "password1";
-                          isNormalUser = true;
                           extraGroups = [
-                            "wheel"
                             "networkmanager"
                             "video"
                             "input"
@@ -82,10 +78,24 @@
                             discordo
                             discord
                             firefox-esr
+                            spotify
+                            vlc
+                            vaultwarden
+                            bitwarden
                           ];
                         };
                       };
                     };
+                  };
+
+                  mods = {
+                    common = {
+                      systemName = configuration_name;
+                      allowUnfree = true;
+                      primaryUser = "josh";
+                      docker = true;
+                      zsh = true;
+                    };
                     home_manager = {
                       users = {
                         josh = {