Apply Prerelease fixes to RA_v1.0.0-rc_encryption_enabled (#61)

* FMO-52: Systemd.networkd and NetworkManager are not able to work together * For netwm we need to disable systemd.networkd dhcp to keep that manageable only with NetworkManager Signed-off-by: Ivan Kuznetsov <jsvapiav@gmail.com> * FMO-50/FMO-51: Fix minor issues - FMO-50: Fix MTU size issues for virtual machines - FMO-51: Fix battery indicator on laptop showing 0% Signed-off-by: Anh Huy Bui <buianhhuy96@gmail.com> * Use installer from main as the version was merged Signed-off-by: Anh Huy Bui <buianhhuy96@gmail.com> --------- Signed-off-by: Ivan Kuznetsov <jsvapiav@gmail.com> Signed-off-by: Anh Huy Bui <buianhhuy96@gmail.com> Co-authored-by: Ivan Kuznetsov <jsvapiav@gmail.com> Co-authored-by: buianhhuy96 <buianhhuy@gmail.com>
tiiuae · Sep 19, 2024 · aedf3d6 · aedf3d6
1 parent 6032e04
commit aedf3d6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/hardware/fmo-os-rugged-laptop-7330.nix b/hardware/fmo-os-rugged-laptop-7330.nix
@@ -66,6 +66,7 @@
         {
           users.users."ghaf".extraGroups = ["networkmanager"];
           networking = {
+            useDHCP = false;
             nat = {
               enable = true;
               internalIPs = [ "192.168.101.0/24" ];
@@ -80,6 +81,7 @@
               ];
             };
           }; # networking
+          systemd.network.links."10-ethint0".extraConfig = "MTUBytes=1460";
 
           services = {
             udev = {
@@ -229,6 +231,7 @@
         extraModules = [
         {
           users.users."ghaf".extraGroups = ["docker" "dialout"];
+          systemd.network.links."10-ethint0".extraConfig = "MTUBytes=1460";
           microvm = {
             mem = 4096;
             vcpu = 2;

diff --git a/hardware/fmo-os-rugged-tablet-7230.nix b/hardware/fmo-os-rugged-tablet-7230.nix
@@ -66,6 +66,7 @@
         {
           users.users."ghaf".extraGroups = ["networkmanager"];
           networking = {
+            useDHCP = false;
             nat = {
               enable = true;
               internalIPs = [ "192.168.101.0/24" ];
@@ -80,6 +81,7 @@
               ];
             };
           }; # networking
+          systemd.network.links."10-ethint0".extraConfig = "MTUBytes=1460";
 
           services = {
             udev = {
@@ -209,6 +211,7 @@
         extraModules = [
         {
           users.users."ghaf".extraGroups = ["docker" "dialout"];
+          systemd.network.links."10-ethint0".extraConfig = "MTUBytes=1460";
           microvm = {
             mem = 4096;
             vcpu = 2;

diff --git a/modules/graphics/sway/nwg-panel/default.nix b/modules/graphics/sway/nwg-panel/default.nix
@@ -113,6 +113,7 @@
 in {
 
   config =  lib.mkIf cfg.enable {
+    services.upower.enable = true;
     environment.etc."xdg/nwg-panel/config" = {
       text = panelConfig;
       # The UNIX file mode bits

diff --git a/modules/pterm-installer/default.nix b/modules/pterm-installer/default.nix
@@ -75,8 +75,8 @@ in
         name = "ghaf-installer";
         src = builtins.fetchGit {
           url = "https://github.com/tiiuae/FMO-OS-Installer.git";
-          rev = "1a9a721ee31968d1a7b6a09c92253e1525d9aec9";
-          ref = "refs/heads/create_symlink_custom_script";
+          rev = "a7db48bd46841b1c94babc80946626f4cc8416f7";
+          ref = "refs/heads/main";
         };
         vendorSha256 = "sha256-MKMsvIP8wMV86dh9Y5CWhgTQD0iRpzxk7+0diHkYBUo=";
         proxyVendor=true;