fix stormd

hosts/oren/flake.nix

@@ -14,6 +14,8 @@
     mods_de_cosmic.url = "../../modules/de_cosmic";
     mods_de_cosmic.inputs.nixpkgs-stable.follows = "nixpkgs";
     mods_de_cosmic.inputs.nixpkgs.follows = "nixpkgs";
+    mods_ros_neovim.url = "../../modules/neovim";
+    mods_row_stormd.url = "../../modules/stormd";
   };
 
   outputs =
@@ -55,6 +57,7 @@
                       systemName = configuration_name;
                       allowUnfree = true;
                       primaryUser = "josh";
+                      docker = true;
                     };
                   };
                 }

hosts_old/oren/configuration.nix

@@ -13,12 +13,12 @@
   mods = {
     boot_systemd.enable = true; # new
     shell_common.enable = true; # new
-    de_cosmic.enable = true;
-    neovim.enable = true;
-    tty_caps_esc.enable = true;
-    docker.enable = true;
-    fonts.enable = true;
-    stormd.enable = true;
+    de_cosmic.enable = true; # new
+    neovim.enable = true; # new
+    tty_caps_esc.enable = true; # new
+    docker.enable = true; # new
+    fonts.enable = true; # new
+    stormd.enable = true; # 
     nebula.enable = true;
     ssh.enable = true; # new
     # rustdesk.enable = true;

modules/common/docker.nix

@@ -0,0 +1,20 @@
+{
+  config,
+  lib,
+  ...
+}:
+with lib;
+let
+  cfg = config.mods.common;
+in
+{
+  config = mkIf cfg.docker {
+    virtualisation.docker.enable = true;
+    users.extraGroups.docker.members = [ config.mods.common.primaryUser ];
+    environment.shellAliases = {
+      dockerv = "docker volume";
+      dockeri = "docker image";
+      dockerc = "docker container";
+    };
+  };
+}

modules/common/flake.nix

@@ -46,7 +46,7 @@
                 default = true;
                 description = "Open the ssh port.";
               };
-              # users = mkOption {
+              docker = mkEnableOption (lib.mdDoc "Enable docker");
             };
 
             imports = [
@@ -56,6 +56,9 @@
               ./ssh.nix
               ./ragenix.nix
               ./shell/common.nix
+              ./tty_caps_esc.nix
+              ./docker.nix
+              ./fonts.nix
             ];
             config = {
               _module.args = {

modules/common/fonts.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  config = {
+    fonts.packages = with pkgs; [
+      (nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
+    ];
+  };
+}

modules/common/tty_caps_esc.nix

@@ -0,0 +1,16 @@
+{
+  lib,
+  pkgs,
+  ...
+}:
+with lib;
+{
+  config = {
+    services.xserver.xkb.options = "caps:escape";
+    console = {
+      earlySetup = true;
+      packages = with pkgs; [ terminus_font ];
+      useXkbConfig = true; # use xkb.options in tty. (caps -> escape)
+    };
+  };
+}

modules/neovim/flake.nix

@@ -0,0 +1,25 @@
+{
+  inputs = {
+    ringofstorms-nvim.url = "git+https://git.joshuabell.xyz/nvim";
+  };
+
+  outputs =
+    {
+      ringofstorms-nvim,
+      ...
+    }:
+    {
+      nixosModules = {
+        default =
+          {
+            pkgs,
+            ...
+          }:
+          {
+            environment.systemPackages = [
+              ringofstorms-nvim.packages.${pkgs.system}.neovim
+            ];
+          };
+      };
+    };
+}

modules/stormd/flake.nix

@@ -0,0 +1,42 @@
+{
+  inputs = {
+    ringofstorms-stormd.url = "git+ssh://git.joshuabell.xyz:3032/stormd";
+    # Local path usage for testing changes locally
+    # ringofstorms-nvim.url = "path:/home/josh/projects/stormd";
+  };
+
+  outputs =
+    {
+      ringofstorms-stormd,
+      ...
+    }:
+    {
+      nixosModules = {
+        default =
+          {
+            config,
+            pkgs,
+            lib,
+            ...
+          }:
+          with lib;
+          {
+            options.mods.ros-stormd = {
+              debug = mkOption {
+                type = types.bool;
+                default = false;
+                description = lib.mdDoc "Whether to enable debug logging for stormd daemon.";
+              };
+            };
+            imports = [ ringofstorms-stormd.nixosModules.default ];
+            config = {
+              services.stormd = {
+                enable = true;
+                nebulaPackage = pkgs.nebula;
+                extraOptions = mkIf config.mods.ros-stormd.debug [ "-v" ];
+              };
+            };
+          };
+      };
+    };
+}