Skip to content

Commit

Permalink
FMO-81: Merge fmo-os images into fmo-os-x86_64
Browse files Browse the repository at this point in the history
- Create device-info.nix for all pci devices
- Create systemd service to write pci device paths into config file for microvm
- Map touch device in sway via a script
- Clean up tablet and laptop config file, now combined into fmo-os-x86_64

Signed-off-by: Anh Huy Bui <[email protected]>
  • Loading branch information
buianhhuy96 committed Dec 5, 2024
1 parent 2274087 commit 807cd3a
Show file tree
Hide file tree
Showing 15 changed files with 146 additions and 424 deletions.
3 changes: 2 additions & 1 deletion config-processor-hardware.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
}: sysconf:
let
inherit (import ./utils {inherit lib self ghafOS;})
updateAttrs updateHostConfig addCustomLaunchers addSystemPackages importvm generateFMOToolConfig;
updateAttrs updateHostConfig addHardwareInfo addCustomLaunchers addSystemPackages importvm generateFMOToolConfig;

targetconf = sysconf;
name = targetconf.name;
Expand Down Expand Up @@ -43,6 +43,7 @@ let
];
}
]
++ (addHardwareInfo targetconf.deviceFile)
++ (addCustomLaunchers targetconf.launchers)
++ (addSystemPackages targetconf.systemPackages)
++ (importvm targetconf.vms)
Expand Down
6 changes: 2 additions & 4 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,8 @@
});

hwConfigs = [
(import ./hardware/fmo-os-rugged-laptop-7330.nix)
(import ./hardware/fmo-os-rugged-laptop-7330-public.nix)
(import ./hardware/fmo-os-rugged-tablet-7230.nix)
(import ./hardware/fmo-os-rugged-tablet-7230-public.nix)
(import ./hardware/fmo-os-x86_64.nix)
(import ./hardware/fmo-os-x86_64-public.nix)
];
instConfigs = [
(import ./installers/fmo-os-installer.nix)
Expand Down
31 changes: 31 additions & 0 deletions hardware/device-info.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
# Device information of Dell Rugged Tablet 7230
"0BB7 Latitude 7230 Rugged Extreme Tablet" = {
touchDevices = [
"3823:49156:EETI8082:00_0EEF:C004"
];
pciDevices = {
netvm = [
"0000:00:14.3"
];
dockervm = [];
};
};
# Device information of Dell Rugged Laptop 7330
"0A9E Latitude 7330 Rugged Extreme" = {
touchDevices = [
"3823:49155:CUST0000:00_0EEF:C003"
];
pciDevices = {
netvm = [
"0000:72:00.0"
"0000:00:1f.0"
"0000:00:1f.3"
"0000:00:1f.4"
"0000:00:1f.5"
"0000:00:1f.6"
];
dockervm = [];
};
};
}
30 changes: 0 additions & 30 deletions hardware/fmo-os-rugged-laptop-7330-public.nix

This file was deleted.

Loading

0 comments on commit 807cd3a

Please sign in to comment.