Dev

TODO.md

@@ -8,7 +8,7 @@
 - 🪵 Server: cedar
 - VMs: [hostname]-vm (fern-vm, oak-vm, cedar-vm)
 
-- [ ] hydenix: some yubikey touch detection for hyprlock and waybar <https://github.com/maximbaz/yubikey-touch-detector>
+- [x] hydenix: some yubikey touch detection for hyprlock and waybar <https://github.com/maximbaz/yubikey-touch-detector>
 - [?] bluemail
 - [x] scalar
 - [x] rust
@@ -20,4 +20,3 @@
 - [ ] Update flake
 - [ ] Test workflows
 - [x] Prisma module
-- [ ] fix printing

flake.nix

@@ -11,11 +11,6 @@
 
     # Hydenix and its nixpkgs - kept separate to avoid conflicts
     hydenix = {
-      # Available inputs:
-      # Main: github:richen604/hydenix
-      # Dev: github:richen604/hydenix/dev
-      # Commit: github:richen604/hydenix/<commit-hash>
-      # Version: github:richen604/hydenix/v1.0.0
       url = "github:richen604/hydenix";
     };
 
@@ -29,12 +24,14 @@
       url = "github:serokell/deploy-rs";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    nix-darwin = {
+      url = "github:nix-darwin/nix-darwin/master";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
-  outputs =
-    {
-      ...
-    }@inputs:
+  outputs = { self, nix-darwin, ... }@inputs:
     let
       vars = {
         user = "mirage";
@@ -54,6 +51,20 @@
           ];
         };
 
+      # Create macOS configuration
+      mkDarwinHost =
+        hostname:
+        nix-darwin.lib.darwinSystem {
+          system = "aarch64-darwin"; # or "x86_64-darwin" for Intel Macs
+          specialArgs = {
+            inherit inputs vars;
+            hostname = hostname;
+          };
+          modules = [
+            ./hosts/darwin/${hostname}
+          ];
+        };
+
       # Create VM variant function
       mkVm =
         hostname:
@@ -77,7 +88,6 @@
       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}";
@@ -95,13 +105,21 @@
       nixosConfigurations = {
         fern = mkHost "fern";
         oak = mkHost "oak";
+        pine = mkHost "pine";
         "fern.local" = mkHost "fern";
         "oak.local" = mkHost "oak";
+        "pine.local" = mkHost "pine";
+      };
+
+      darwinConfigurations = {
+        # Replace "macbook" with your actual hostname (run 'scutil --get LocalHostName' to find it)
+        macbook = mkDarwinHost "macbook";
       };
 
       deploy.nodes = {
         fern = mkDeployNode "fern.local";
         oak = mkDeployNode "oak.local";
+        pine = mkDeployNode "pine.local";
       };
 
       packages.${inputs.hydenix.lib.system} = {
@@ -119,23 +137,28 @@
           ${pkgs.deploy-rs}/bin/deploy --skip-checks .#oak ;;
         "fern")
           ${pkgs.deploy-rs}/bin/deploy --skip-checks .#fern ;;
+        "pine")
+          ${pkgs.deploy-rs}/bin/deploy --skip-checks .#pine ;;
         "all")
           ${pkgs.deploy-rs}/bin/deploy --skip-checks .#oak
           ${pkgs.deploy-rs}/bin/deploy --skip-checks .#fern
+          ${pkgs.deploy-rs}/bin/deploy --skip-checks .#pine
           ;;
-        *) echo "Usage: rb [oak|fern|all]" >&2; exit 1 ;;
+        *) echo "Usage: rb [oak|fern|pine|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;
         };
+        pine-check = inputs.deploy-rs.lib.${system}.deployChecks {
+          nodes.pine = inputs.self.deploy.nodes.pine;
+        };
       };
     };
-}
+}

hosts/oak/default.nix

@@ -15,8 +15,10 @@ let
       (final: prev: {
         userPkgs = import inputs.nixpkgs {
           inherit (inputs.hydenix.lib) system;
-          config.allowUnfree = true;
-          android_sdk.accept_license = true;
+          config = {
+            android_sdk.accept_license = true;
+            allowUnfree = true;
+          };
         };
       })
     ];

hosts/pine/default.nix

@@ -0,0 +1,88 @@
+{
+  inputs,
+  vars,
+  ...
+}:
+let
+  pkgs = import inputs.hydenix.inputs.hydenix-nixpkgs {
+    inherit (inputs.hydenix.lib) system;
+    config = {
+      allowUnfree = true;
+    };
+    overlays = [
+      inputs.hydenix.lib.overlays
+      (final: prev: {
+        userPkgs = import inputs.nixpkgs {
+          inherit (inputs.hydenix.lib) system;
+          config.allowUnfree = true;
+        };
+      })
+    ];
+  };
+in
+{
+  nixpkgs.pkgs = pkgs;
+
+  imports = [
+    inputs.hydenix.inputs.home-manager.nixosModules.home-manager
+    inputs.hydenix.lib.nixOsModules
+    ./hardware-configuration.nix
+    ../../modules/system/hosts/pine
+
+
+    # === GPU-specific configurations ===
+
+    /*
+      For drivers, we are leveraging nixos-hardware
+      Most common drivers are below, but you can see more options here: https://github.com/NixOS/nixos-hardware
+    */
+
+    #! EDIT THIS SECTION
+    # === Other common modules ===
+    inputs.hydenix.inputs.nixos-hardware.nixosModules.common-pc
+    inputs.hydenix.inputs.nixos-hardware.nixosModules.common-pc-ssd
+  ];
+
+  boot.kernelParams = [ "video=HDMI-A-1:e" ];
+
+  home-manager = {
+    useGlobalPkgs = true;
+    useUserPackages = true;
+    extraSpecialArgs = {
+      inherit inputs;
+    };
+    users."${vars.user}" =
+      { ... }:
+      {
+        # hm import
+        imports = [
+          ../../modules/hm/hosts/pine
+        ];
+
+        desktops.hydenix = {
+          enable = true;
+          hostname = "pine";
+        };
+      };
+  };
+
+  hydenix = {
+    enable = true;
+    hostname = "pine";
+    timezone = "Europe/Paris";
+    locale = "fr_FR.UTF-8";
+  };
+
+  users.users.${vars.user} = {
+    isNormalUser = true;
+    #initialPassword = "${vars.user}";
+    extraGroups = [
+      "wheel"
+      "networkmanager"
+      "video"
+      "lp"
+      "scanner"
+    ];
+    shell = pkgs.zsh;
+  };
+}

modules/hm/common/browser/default.nix

@@ -1,12 +1,43 @@
 { pkgs, lib, config, ... }:
 
 let
-  cfg = config.modules.common.browser;
+  cfg = config.modules.hm.browser;
+
+  # Map browsers to their packages (using pkgs.)
+  browserToPackage = with pkgs; {
+    chromium = [ chromium ];
+    chrome   = [ google-chrome ];
+    firefox  = [ firefox ];
+    brave    = [ brave ];
+    vivaldi  = [ vivaldi ];
+    edge     = [ microsoft-edge ];
+  };
+
+  # Map browsers to their drivers (using pkgs.)
+  browserToDriver = with pkgs; {
+    chromium = chromedriver;
+    chrome   = chromedriver;
+    vivaldi  = chromedriver;
+    brave    = chromedriver;
+    firefox  = geckodriver;
+    edge     = msedgedriver;
+  };
+
+  # Get packages for enabled browsers
+  browserPackages = lib.concatMap (browser: browserToPackage.${browser} or []) cfg.clients;
+
+  # Get drivers for enabled browsers (if driver.enable is true)
+  drivers = lib.optionals cfg.driver.enable (
+    lib.unique (lib.filter (drv: drv != null) (
+      map (browser: browserToDriver.${browser} or null) cfg.clients
+    ))
+  );
+
 in
 {
-  options.modules.common.browser = {
-    emulators = lib.mkOption {
-      type = lib.types.listOf (lib.types.enum ["chromium" "chrome" "firefox" "brave" "vivaldi" "edge"]);
+  options.modules.hm.browser = {
+    clients = lib.mkOption {
+      type = lib.types.listOf (lib.types.enum (lib.attrNames browserToDriver));
       default = [];
     };
 
@@ -18,21 +49,6 @@ in
   };
 
   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])
-      );
+    home.packages = lib.unique (browserPackages ++ drivers);
   };
 }

modules/hm/common/communication/discord.nix

@@ -0,0 +1,57 @@
+{ pkgs, lib, config, ... }:
+
+let
+  cfg = config.modules.hm.communication.discord;
+
+  # Map Discord clients to their packages
+  clientsToPackage = with pkgs; {
+    discord = discord;
+    discordo = discordo;
+    discord-sh = discord-sh;
+    discord-ptb = discord-ptb;
+    discord-canary = discord-canary;
+    discord-development = discord-development;
+    cordless = cordless;
+  };
+
+  # Map overlay names to their packages
+  overlaysToPackage = with pkgs; {
+    "discover-overlay" = discover-overlay;
+    overlayed = overlayed;
+  };
+
+  # Get packages for enabled clients
+  clientPackages = map (client: clientsToPackage.${client}) cfg.clients;
+
+  # Get overlay packages
+  overlayPackages = map (overlay: overlaysToPackage.${overlay}) cfg.overlays;
+
+  # RPC package
+  rpcPackage = lib.optional cfg.rpc.enable pkgs.discord-rpc;
+
+in
+{
+  options.modules.hm.communication.discord = {
+    clients = lib.mkOption {
+      type = lib.types.listOf (lib.types.enum (lib.attrNames clientsToPackage));
+      default = [];
+      description = "List of Discord clients to install";
+    };
+
+    overlays = lib.mkOption {
+      type = lib.types.listOf (lib.types.enum (lib.attrNames overlaysToPackage));
+      default = [];
+      description = "List of Discord overlays to install";
+    };
+
+    rpc.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = "Whether to enable Discord Rich Presence support";
+    };
+  };
+
+  config = lib.mkIf (cfg.clients != [] || cfg.overlays != [] || cfg.rpc.enable) {
+    home.packages = clientPackages ++ overlayPackages ++ rpcPackage;
+  };
+}