fix(waydroid): use package that won’t error out

flake.lock

@@ -411,22 +411,6 @@
         "url": "https://labs.phundrak.com/phundrak/jj-cz"
       }
     },
-    "mobile-nixos": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1772289954,
-        "narHash": "sha256-iDdtwk/dFb6AsXMtcOpZixxXl6C1HNUPe6cglxxHO7M=",
-        "owner": "mobile-nixos",
-        "repo": "mobile-nixos",
-        "rev": "1a9e0af79dc7b5e29ed772f1a8a76fcbd9d45fdf",
-        "type": "github"
-      },
-      "original": {
-        "owner": "mobile-nixos",
-        "repo": "mobile-nixos",
-        "type": "github"
-      }
-    },
     "nix": {
       "inputs": {
         "flake-compat": [
@@ -609,7 +593,6 @@
         "flake-utils": "flake-utils_2",
         "home-manager": "home-manager",
         "jj-cz": "jj-cz",
-        "mobile-nixos": "mobile-nixos",
         "nix-index-database": "nix-index-database",
         "nixpkgs": "nixpkgs",
         "opencode": "opencode",

flake.nix

@@ -30,11 +30,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    mobile-nixos = {
-      url = "github:mobile-nixos/mobile-nixos";
-      flake = false; # It is not as a flake
-    };
-
     opencode = {
       url = "github:anomalyco/opencode/v1.3.15";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -91,7 +86,6 @@
     nixpkgs,
     flake-utils,
     home-manager,
-    mobile-nixos,
     srvos,
     ...
   } @ inputs:
@@ -183,14 +177,6 @@
                 ./hosts/naromk3/configuration.nix
               ];
             };
-            pumo = nixpkgs.lib.nixosSystem {
-              system = "aarch64-linux";
-              inherit specialArgs;
-              modules = withSystemModules [
-                (import "${mobile-nixos}/lib/configuration.nix" {device = "oneplus-enchilada";})
-                ./hosts/pumo
-              ];
-            };
             tilo = nixpkgs.lib.nixosSystem {
               inherit specialArgs;
               modules = withSystemModules ./hosts/tilo/configuration.nix;

hosts/pumo/default.nix

@@ -1,91 +0,0 @@
-# Minimal configuration for OnePlus 6 (enchilada) NixOS Mobile
-# Focus on essentials: SSH, wireless, and basic tools
-{
-  pkgs,
-  inputs,
-  ...
-}: {
-  imports = [
-    inputs.sops-nix.nixosModules.sops
-    ../../system
-  ];
-
-  nixpkgs.config.permittedInsecurePackages = ["olm-3.2.16"];
-
-  mySystem = {
-    desktop = {
-      hyprland.enable = true;
-      niri.enable = true;
-      waydroid.enable = true;
-      xserver = {
-        enable = true;
-        de = "gnome";
-      };
-    };
-    dev.docker = {
-      enable = true;
-      podman.enable = true;
-      autoprune.enable = true;
-    };
-    hardware = {
-      bluetooth.enable = true;
-      sound = {
-        enable = true;
-        usePulseaudio = true;
-      };
-    };
-    i18n.input.enable = true;
-    misc = {
-      keymap = "fr-bepo";
-      mobile = true;
-    };
-    networking = {
-      hostname = "pumo";
-      id = "93595b88";
-    };
-    packages = {
-      appimage.enable = true;
-      flatpak.enable = true;
-      nix.nix-ld.enable = true;
-    };
-    services = {
-      languagetool.enable = true;
-      printing.enable = true;
-      ssh.enable = true;
-    };
-    users = {
-      root.disablePassword = true;
-      phundrak = {
-        enable = true;
-        trusted = true;
-        extraGroups = ["feedbackd"];
-      };
-    };
-  };
-
-  programs = {
-    dconf.enable = true;
-    calls.enable = true;
-    zsh.enable = true;
-  };
-
-
-  hardware.sensor.iio.enable = true;
-
-  # Minimal essential packages
-  environment.systemPackages = with pkgs; [
-    chatty # IM and SMS
-    epiphany
-    nixd
-    git
-    vim
-    emacs
-    wget
-    curl
-    jujutsu
-    firefox
-    kitty
-  ];
-
-  system.stateVersion = "25.11";
-}

system/boot/boot.nix

@@ -54,7 +54,7 @@ in {
     };
   };
 
-  config.boot = mkIf (! config.mySystem.misc.mobile) {
+  config.boot = {
     initrd.kernelModules = lib.lists.singleton (
       if config.mySystem.hardware.amdgpu.enable
       then "amdgpu"

system/default.nix

@@ -30,7 +30,6 @@ in {
       example = "fr-bepo";
       description = "Keymap to use in the TTY console";
     };
-    mobile = mkEnableOption "Enable if using Mobile NixOS";
   };
 
   config = {

system/desktop/waydroid.nix

@@ -9,7 +9,10 @@ with lib; let
 in {
   options.mySystem.desktop.waydroid.enable = mkEnableOption "Enables Waydroid";
   config = mkIf cfg.enable {
-    virtualisation.waydroid.enable = cfg.enable;
+    virtualisation.waydroid = {
+      enable = cfg.enable;
+      package = pkgs.waydroid-nftables;
+    };
     environment.systemPackages = [pkgs.waydroid-helper];
   };
 }

system/desktop/xserver.nix

@@ -30,7 +30,6 @@ in {
       games.enable = false;
       gnome-remote-desktop.enable = true;
       gnome-online-accounts.enable = true;
-      gnome-keyring.enable = true;
       sushi.enable = true;
     };
 

system/hardware/sound.nix

@@ -8,8 +8,7 @@ with lib; let
   cfg = config.mySystem.hardware.sound;
 in {
   options.mySystem.hardware.sound = {
-    enable = mkEnableOption "Whether to enable sounds";
+    enable = mkEnableOption "Whether to enable sounds with Pipewire";
-    usePulseaudio = mkEnableOption "Activate sound support with pulseaudio";
     scarlett.enable = mkEnableOption "Activate support for Scarlett sound card";
     alsa = mkOption {
       type = types.bool;
@@ -33,14 +32,13 @@ in {
 
   config = {
     environment.systemPackages = mkIf cfg.scarlett.enable [pkgs.alsa-scarlett-gui];
-    services = {
+    services.pipewire = mkIf cfg.enable {
-      pipewire.enable = mkForce (cfg.enable && ! cfg.usePulseaudio);
+      enable = true;
-      pipewire.alsa = {
+      alsa = mkIf cfg.alsa {
         enable = mkDefault true;
         support32Bit = mkDefault true;
       };
-      pipewire.jack.enable = cfg.jack;
+      jack.enable = mkDefault cfg.jack;
-      pulseaudio.enable = cfg.usePulseaudio;
     };
     programs.noisetorch = mkIf cfg.enable {
       inherit (cfg) enable;

system/packages/flatpak.nix

@@ -1,4 +1,5 @@
 {
+  pkgs,
   lib,
   config,
   ...
@@ -10,7 +11,12 @@ in {
     enable = mkEnableOption "Enable Flatpak support";
     builder.enable = mkEnableOption "Enable Flatpak builder";
   };
-  config.services.flatpak = mkIf cfg.enable {
+  config = {
+    services.flatpak = mkIf cfg.enable {
       inherit (cfg) enable;
     };
+    environment.systemPackages = mkIf cfg.builder.enable [
+      pkgs.flatpak-buildR
+    ];
+  };
 }

system/users/phundrak.nix

@@ -10,18 +10,13 @@ in {
   options.mySystem.users.phundrak = {
     enable = mkEnableOption "Enables user phundrak";
     trusted = mkEnableOption "Mark the user as trusted by Nix";
-    extraGroups = mkOption {
-      type = types.listOf types.str;
-      default = [];
-      example = ["feedbackd"];
-    };
   };
 
   config = {
     users.users.phundrak = mkIf cfg.enable {
       isNormalUser = true;
       description = "Lucien Cartier-Tilet";
-      extraGroups = ["networkmanager" "wheel" "docker" "dialout" "podman" "plugdev" "games" "audio" "input"] ++ cfg.extraGroups;
+      extraGroups = ["networkmanager" "wheel" "docker" "dialout" "podman" "plugdev" "games" "audio" "input"];
       shell = pkgs.zsh;
       openssh.authorizedKeys.keyFiles = lib.filesystem.listFilesRecursive ../../users/phundrak/keys;
     };

users/phundrak/packages.nix

@@ -41,7 +41,6 @@ in {
     # Misc
     # gplates
     qgis
-    kicad
     handy
     libnotify
     nextcloud-client