align lambda and mu

hosts/lambdaos/configuration.nix

@@ -46,6 +46,13 @@
     };
   };
 
+  # Allow unfree packages
+  nixpkgs.config = {
+    allowUnfree = true;
+    nvidia.acceptLicense = true;
+    cudaSupport = true;
+  };
+
   nix.settings = {
     trusted-users = [ "noa" ];
     sandbox = true;
@@ -58,13 +65,6 @@
     sandbox-paths = [ "/bin/sh=${pkgs.busybox-sandbox-shell.out}/bin/busybox" ];
   };
 
-  # Allow unfree packages
-  nixpkgs.config = {
-    allowUnfree = true;
-    nvidia.acceptLicense = true;
-    cudaSupport = true;
-  };
-
   networking = {
     hostName = "lambdaOS"; # Define your hostname.
     networkmanager.enable = true;
@@ -147,11 +147,19 @@
   };
 
   environment = {
-    pathsToLink = [ "/share/zsh" ];
     systemPackages = with pkgs; [
       restic
       cudatoolkit
     ];
+    plasma6.excludePackages = with pkgs.kdePackages; [
+      plasma-browser-integration
+      konsole
+      xwaylandvideobridge
+      kate
+      khelpcenter
+      okular
+      elisa
+    ];
   };
 
   # TODO: find list of fonts to install
@@ -161,19 +169,14 @@
     fira-code
     fira-code-symbols
     liberation_ttf
-    maple-mono-NF
+    maple-mono.NF
   ];
 
   xdg.portal = {
     enable = true;
-    configPackages = [ pkgs.niri ];
   };
 
   programs = {
-    nm-applet.enable = true;
-
-    zsh.enable = true;
-
     gnupg.agent = {
       enable = true;
       enableSSHSupport = true;
@@ -184,18 +187,15 @@
       enable = true;
       package = inputs.niri.packages.${pkgs.system}.niri;
     };
-    nix-ld.enable = true;
-
-    nix-ld.libraries = with pkgs; [
-      wayland
-    ];
+    nm-applet.enable = true;
 
+    zsh.enable = true;
     wireshark.enable = true;
   };
 
   modules = {
     games.steam.enable = true;
-    plasma.enable = true;
+    plasma.enable = false;
   };
 
   users.defaultUserShell = pkgs.zsh;
@@ -203,13 +203,16 @@
   security.rtkit.enable = true;
   boot = {
     kernelPackages = pkgs.linuxPackages_latest;
+
     consoleLogLevel = 0;
+
     initrd.verbose = false;
     plymouth = rec {
       enable = true;
       theme = "colorful";
       themePackages = [ (pkgs.adi1090x-plymouth-themes.override { selected_themes = [ theme ]; }) ];
     };
+
     kernelParams = [
       "quiet"
       "splash"
@@ -240,6 +243,13 @@
   };
 
   services = {
+    displayManager = {
+      defaultSession = "niri";
+      sddm = {
+        enable = true;
+        wayland.enable = true;
+      };
+    };
     postgresql = {
       enable = true;
       ensureDatabases = [ "noa" ];
@@ -277,18 +287,15 @@
       settings.PasswordAuthentication = false;
       settings.KbdInteractiveAuthentication = false;
     };
+    thermald.enable = true;
     xserver = {
       enable = false;
       xkb = {
         layout = "us";
-        variant = "intl";
+        variant = "altgr intl";
       };
       videoDrivers = [ "nvidia" ];
     };
-    displayManager.sddm = {
-      enable = true;
-      wayland.enable = true;
-    };
     udev.packages = [ pkgs.yubikey-personalization ];
   };
 
@@ -360,6 +367,7 @@
   };
   security = {
     polkit.enable = true;
+    sudo.execWheelOnly = true;
   };
 
   # Or disable the firewall altogether.

hosts/muos/configuration.nix

@@ -13,11 +13,12 @@
 {
   imports = [
     # Include the results of the hardware scan.
-    ../../modules/games/steam.nix
-    ./disk-config.nix
     ./hardware-configuration.nix
+    ../../modules/games/steam.nix
 
     ../../common
+
+    ./disk-config.nix
   ];
 
   powerManagement.enable = true;
@@ -39,11 +40,31 @@
   nixpkgs.config = {
     allowUnfree = true;
   };
-  nixpkgs.overlays = [ ];
+
+  nix.settings = {
+    trusted-users = [ "noa" ];
+    sandbox = true;
+    show-trace = true;
+    system-features = [
+      "nixos-test"
+      "recursive-nix"
+    ];
+
+    sandbox-paths = [ "/bin/sh=${pkgs.busybox-sandbox-shell.out}/bin/busybox" ];
+  };
 
   networking = {
     hostName = "muOS"; # Define your hostname.
     networkmanager.enable = true;
+    firewall.allowedTCPPorts = [
+      53317 # Localsend
+      22000 # syncthing
+    ];
+    firewall.allowedUDPPorts = [
+      53317
+      22000 # syncthing
+      21027 # syncthing
+    ];
   };
 
   # Set your time zone.
@@ -114,11 +135,13 @@
     fira-code
     fira-code-symbols
     liberation_ttf
-    maple-mono-NF
+    maple-mono.NF
     newcomputermodern
   ];
 
-  xdg.portal.enable = true;
+  xdg.portal = {
+    enable = true;
+  };
 
   programs = {
     gnupg.agent = {
@@ -131,10 +154,6 @@
       enable = true;
       package = inputs.niri.packages.${pkgs.system}.niri;
     };
-    nix-ld.enable = false;
-    nix-ld.libraries = with pkgs; [
-      wayland
-    ];
     nm-applet.enable = true;
 
     wireshark.enable = true;
@@ -281,21 +300,6 @@
     sudo.execWheelOnly = true;
   };
 
-  # Open ports in the firewall.
-  networking.firewall.allowedTCPPorts = [
-    53317 # Localsend
-
-    22000 # syncthing
-  ];
-  networking.firewall.allowedUDPPorts = [
-    53317
-
-    22000 # syncthing
-    21027 # syncthing
-  ];
-  # Or disable the firewall altogether.
-  # networking.firewall.enable = false;
-
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave