Dev

flake.nix

@@ -2,7 +2,7 @@
   description = "template for hydenix";
 
   inputs = {
-    chaotic.url = "github:chaotic-cx/nyx/18c577a2a160453f4a6b4050fb0eac7d28b92ead";
+    chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
 
     # User's nixpkgs - for user packages
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
@@ -24,6 +24,11 @@
       url = "github:nix-community/nix-index-database";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    deploy-rs = {
+      url = "github:serokell/deploy-rs";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs =
@@ -61,20 +66,76 @@
         hydenix-inputs = inputs.hydenix.inputs // inputs.hydenix.lib // inputs.hydenix;
         flake = inputs.self.outPath;
       };
+
+      # All below is for deploy-rs
+      system = inputs.hydenix.lib.system;
+      pkgs = import inputs.nixpkgs {
+        inherit system;
+        overlays = [ inputs.deploy-rs.overlays.default ];
+      };
+
+      mkDeployNode = hostname: {
+        hostname = hostname;
+        profiles.system = {
+          # Change from root to your user
+          user = "${vars.user}";
+          path = inputs.deploy-rs.lib.${system}.activate.nixos inputs.self.nixosConfigurations.${hostname};
+          sshUser = "${vars.user}";
+          interactiveSudo = true;
+          sshOpts = [
+            "-p"
+            "22"
+          ];
+          magicRollback = true;
+          confirmTimeout = 300;
+        };
+      };
     in
     {
       nixosConfigurations = {
         fern = mkHost "fern";
         oak = mkHost "oak";
-        # TODO: temp host for rebuild iso
-        nixos = mkHost "oak";
+        "fern.local" = mkHost "fern";
+        "oak.local" = mkHost "oak";
+      };
+
+      deploy.nodes = {
+        fern = mkDeployNode "fern.local";
+        oak = mkDeployNode "oak.local";
       };
 
       packages.${inputs.hydenix.lib.system} = {
         fern-vm = mkVm "fern";
         oak-vm = mkVm "oak";
+
         build-iso = isoConfig.build-iso;
         burn-iso = isoConfig.burn-iso;
+
+        rb = pkgs.writeShellScriptBin "rb" ''
+          set -euo pipefail
+          host=$1
+          case "$host" in
+        "oak")
+          ${pkgs.deploy-rs}/bin/deploy --skip-checks .#oak ;;
+        "fern")
+          ${pkgs.deploy-rs}/bin/deploy --skip-checks .#fern ;;
+        "all")
+          ${pkgs.deploy-rs}/bin/deploy --skip-checks .#oak
+          ${pkgs.deploy-rs}/bin/deploy --skip-checks .#fern
+          ;;
+        *) echo "Usage: rb [oak|fern|all]" >&2; exit 1 ;;
+          esac
+        '';
+      };
+
+      # Only check the specific deployment node
+      checks.${system} = {
+        oak-check = inputs.deploy-rs.lib.${system}.deployChecks {
+          nodes.oak = inputs.self.deploy.nodes.oak;
+        };
+        fern-check = inputs.deploy-rs.lib.${system}.deployChecks {
+          nodes.fern = inputs.self.deploy.nodes.fern;
+        };
       };
     };
 }

hosts/fern/default.nix

@@ -42,7 +42,7 @@ in
       {
         # hm import
         imports = [
-          ../../modules/hm/desktops
+          ../../modules/hm/desktops/hydenix.nix
         ];
 
         desktops.hydenix = {
@@ -69,4 +69,6 @@ in
     ];
     shell = pkgs.zsh;
   };
+
+  system.stateVersion = "25.05";
 }

hosts/oak/default.nix

@@ -59,7 +59,7 @@ in
       {
         # hm import
         imports = [
-          ../../modules/hm/desktops
+          ../../modules/hm/desktops/hydenix.nix
           ../../modules/hm/hosts/oak
         ];
 
@@ -89,11 +89,4 @@ in
     ];
     shell = pkgs.zsh;
   };
-
-  services = {
-    printing = {                            # CUPS
-      enable = true;
-      drivers = [ pkgs.cnijfilter2 ];
-    };
-  };
 }

modules/hm/common/browser/default.nix

@@ -0,0 +1,38 @@
+{ pkgs, lib, config, ... }:
+
+let
+  cfg = config.modules.common.browser;
+in
+{
+  options.modules.common.browser = {
+    emulators = lib.mkOption {
+      type = lib.types.listOf (lib.types.enum ["chromium" "chrome" "firefox" "brave" "vivaldi" "edge"]);
+      default = [];
+    };
+
+    driver.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = true;
+      description = "Enable browser drivers for automation (e.g., Selenium, Puppeteer)";
+    };
+  };
+
+  config = {
+    home.packages = with pkgs;
+      lib.unique (
+        (lib.optionals (lib.elem "chromium" cfg.emulators) [chromium]) ++
+        (lib.optionals (lib.elem "chrome" cfg.emulators) [google-chrome]) ++
+        (lib.optionals (lib.elem "firefox" cfg.emulators) [firefox]) ++
+        (lib.optionals (lib.elem "brave" cfg.emulators) [brave]) ++
+        (lib.optionals (lib.elem "vivaldi" cfg.emulators) [vivaldi]) ++
+        (lib.optionals (lib.elem "edge" cfg.emulators) [microsoft-edge]) ++
+        (lib.optionals
+          (cfg.driver.enable &&
+            (lib.any (browser: lib.elem browser cfg.emulators)
+                     [ "chromium" "chrome" "vivaldi" "brave" ]))
+          [chromedriver]) ++
+        (lib.optionals (cfg.driver.enable && lib.elem "firefox" cfg.emulators) [geckodriver]) ++
+        (lib.optionals (cfg.driver.enable && lib.elem "edge" cfg.emulators) [msedgedriver])
+      );
+  };
+}

modules/hm/common/communication/mail/default.nix

@@ -17,16 +17,14 @@ let
 in
 {
   options.modules.common.communication.mail = {
-    enable = lib.mkEnableOption "Enable mail communication tools";
-
     services = lib.mkOption {
       type = lib.types.listOf (lib.types.enum ["thunderbird" "bluemail"]);
-      default = ["thunderbird"];
+      default = [];
       description = "List of mail services to enable";
     };
   };
 
-  config = lib.mkIf cfg.enable {
+  config = {
     home.packages = packagesToInstall;
   };
 }

modules/hm/common/default.nix

@@ -3,6 +3,8 @@
 }:
 {
   imports = [
+    ./browser
+
     ./communication/mail
     ./communication/teams.nix
 
@@ -12,24 +14,20 @@
     ./dev/editor/android-studio.nix
     ./dev/global-tools/act-github.nix
     ./dev/global-tools/nix.nix
-    ./dev/node/graphite.nix
+    ./dev/global-tools/cli.nix
     ./dev/node/node.nix
     ./dev/node/pm2.nix
     ./dev/node/prisma.nix
-    ./dev/node/vercel.nix
     ./dev/dotnet.nix
     ./dev/python.nix
     ./dev/rust.nix
 
     ./documentation/obsidian.nix
-    ./documentation/okular.nix
-    ./documentation/onlyoffice.nix
-
-    ./driver/chrome.nix
+    ./documentation
 
     ./emulator
 
-    ./engine/engine.nix
+    ./engine
 
     #./extra/ignore-file-retriever.nix
 
@@ -40,7 +38,6 @@
     ./games/star-citizen.nix
     ./games/northstar.nix
 
-    ./multimedia/easyeffects.nix
     ./multimedia/gimp.nix
     ./multimedia/mpv.nix
     ./multimedia/obs.nix
@@ -58,7 +55,7 @@
     ./shell/tools.nix
 
     ./utilities/filezilla.nix
-    ./utilities/gitkraken.nix
+    ./utilities/kde-connect.nix
     ./utilities/scalar.nix
     ./utilities/stacer.nix
   ];

modules/hm/common/dev/global-tools/cli.nix

@@ -0,0 +1,22 @@
+{ pkgs, lib, config, ... }:
+
+let
+  cfg = config.modules.common.dev.global-tools.cli;
+in
+{
+  options.modules.common.dev.global-tools.cli = {
+
+    elements = lib.mkOption {
+      type = lib.types.listOf (lib.types.enum ["vercel" "graphite"]);
+      default = [];
+      description = "List of CLI tools to install";
+    };
+  };
+
+  config = {
+    home.packages = (with pkgs;
+      lib.optional (lib.elem "vercel" cfg.elements) nodePackages.vercel ++
+      lib.optional (lib.elem "graphite" cfg.elements) graphite-cli
+    );
+  };
+}