things

common/boot/grub.nix

@@ -1,15 +1,15 @@
 {
-  custom_config_key,
   config,
   lib,
   ...
 }:
 let
-  cfg = config."${custom_config_key}".boot.grub;
+  ccfg = import ../config.nix;
+  cfg = config.${ccfg.custom_config_key}.boot.grub;
 in
 with lib;
 {
-  options."${custom_config_key}".boot.grub = {
+  options.${ccfg.custom_config_key}.boot.grub = {
     enable = mkEnableOption "Grub bootloader";
     device = mkOption {
       type = types.str;

common/boot/systemd.nix

@@ -1,16 +1,16 @@
 {
-  custom_config_key,
   config,
   lib,
   ...
 }:
 let
-  cfg_path = "${custom_config_key}".boot.systemd;
+  # ccfg = import ../config.nix;
-  cfg = config.${cfg_path};
+  # cfg_path = "${custom_config_key}".boot.systemd;
+  cfg = config.ringofstorms_common.boot.systemd;
 in
 with lib;
 {
-  options.${cfg_path} = {
+  options.ringofstorms_common.boot.systemd = {
     enable = mkEnableOption "Systemd bootloader";
   };
   config = mkIf cfg.enable {

common/flake.nix

@@ -13,35 +13,20 @@
 
   outputs =
     {
-      ros-neovim,
+      ros_neovim,
       ...
     }:
     {
       nixosModules = {
         default =
           {
-            config,
-            lib,
-            pkgs,
             ...
           }:
-          let
-            custom_config_key = "ringofstorms_common";
-          in
           {
-            options = {
-            };
-
             imports = [
-              ./boot/grub.nix
+              # ./boot/grub.nix
               ./boot/systemd.nix
             ];
-
-            config = {
-              specialArgs = {
-                inherit custom_config_key;
-              };
-            };
           };
       };
     };

hosts/oren/flake.nix

@@ -2,10 +2,15 @@
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
 
+    # Use relative to get current version for testing
+    common.url = "path:../../common";
+    # Pin to specific version
+    # common.url = "git+https://git.joshuabell.xyz/dotfiles?rev=88f2d95e6a871f084dccfc4f45ad9d2b31720998";
+
     ros_neovim.url = "git+https://git.joshuabell.xyz/nvim";
     mod_common.url = "git+https://git.joshuabell.xyz/dotfiles?ref=mod_common";
     mod_secrets.url = "git+https://git.joshuabell.xyz/dotfiles?ref=mod_secrets";
-    mod_boot_systemd.url = "git+https://git.joshuabell.xyz/dotfiles?ref=mod_boot_systemd";
+    # mod_boot_systemd.url = "git+https://git.joshuabell.xyz/dotfiles?ref=mod_boot_systemd";
     mod_de_gnome.url = "git+https://git.joshuabell.xyz/dotfiles?ref=mod_de_gnome";
     mod_home-manager.url = "git+https://git.joshuabell.xyz/dotfiles?ref=mod_home_manager";
     mod_home-manager.inputs.home-manager.url = "github:rycee/home-manager/release-24.11";
@@ -47,6 +52,9 @@
                     ../../components/nix/qdirstat.nix
                     ../../components/nix/tailscale.nix
                   ];
+                  ringofstorms_common = {
+                    boot.systemd.enable = true;
+                  };
                   mods = {
                     common = {
                       systemName = configuration_name;