chore: merge remote-tracking branch 'refs/remotes/origin/master'

hosts/iris/default.nix

@@ -9,7 +9,7 @@
   imports = [
     ./hardware-configuration.nix
     ./../../modules/core
-    # ./../../modules/home/nfs.nix
+    ./../../modules/home/steam.nix
     ./../../modules/core/virtualization.nix
     ./../../modules/services/tailscale.nix
     ./../../modules/services/mpd.nix

modules/core/default.nix

@@ -3,7 +3,7 @@
   imports =
     [ (import ./docker.nix) ]
     ++ [ (import ./hardware.nix) ]
-    ++ [ (import ./displaylink.nix) ]
+    # ++ [ (import ./displaylink.nix) ]
     # ++ [(import ./printing.nix)]
     ++ [ (import ./xserver.nix) ]
     ++ [ (import ./network.nix) ]

modules/core/default.server.nix

@@ -1,12 +1,13 @@
 { ... }:
 {
   imports =
-       [(import ./hardware.nix)]
+    [ (import ./hardware.nix) ]
-    ++ [(import ./network.nix)]
+    ++ [ (import ./network.nix) ]
-    ++ [(import ./program.nix)]
+    ++ [ (import ./program.nix) ]
-    ++ [(import ./sshd.nix)]
+    ++ [ (import ./sshd.nix) ]
-    ++ [(import ./security.nix)]
+    ++ [ (import ./security.nix) ]
-    ++ [(import ./services.nix)]
+    ++ [ (import ./services.nix) ]
-    ++ [(import ./system.nix)]
+    ++ [ (import ./system.nix) ]
-    ++ [(import ./user.nix)];
+    ++ [ (import ./user.nix) ]
+    ++ [ (import ./virtualization.nix) ];
 }

modules/core/virtualization.nix

@@ -12,6 +12,8 @@
     libvirtd.enable =
       if (host == "violet") then
         true
+      else if (host == "dandelion") then
+        true
       else if (host == "sakura") then
         true
       else if (host == "yoshino") then
@@ -36,7 +38,7 @@
   #    { };
 
   users.groups.libvirtd.members =
-    if (config.virtualisation.waydroid.enable == true) then [ username ] else [ ];
+    if (config.virtualisation.libvirtd.enable == true) then [ username ] else [ ];
 
   # Enable qemu etc
   environment.systemPackages = with pkgs; [

modules/home/steam.nix

@@ -0,0 +1,3 @@
+{
+  programs.steam.enable = true;
+}

roles/desktop.nix

@@ -16,6 +16,7 @@ in
   };
 
   config = mkIf cfg.enable {
+    environment.systemPackages = with pkgs; [ cifs-utils ];
     home-manager = {
       users.${username} = {
         home.packages = with pkgs; [

roles/laptop.nix

@@ -1,13 +1,25 @@
-{ lib, pkgs, config, username, home-manager, ... }:
+{
+  lib,
+  pkgs,
+  config,
+  username,
+  home-manager,
+  ...
+}:
 with lib;
 let
   cfg = config.liv.laptop;
-in {
+in
+{
   options.liv.laptop = {
     enable = mkEnableOption "Enable laptop";
   };
 
   config = mkIf cfg.enable {
+    environment.systemPackages = with pkgs; [
+      cifs-utils
+      powertop
+    ];
     home-manager = {
       users.${username} = {
         home.packages = with pkgs; [
@@ -17,15 +29,18 @@ in {
       };
     };
 
+    # DisplayLink
+    services.xserver.videoDrivers = [
+      "displaylink"
+      "modesetting"
+    ];
+    systemd.services.dlm.wantedBy = [ "multi-user.target" ];
+
     networking.networkmanager.enable = true;
 
-    environment.systemPackages = with pkgs; [
-      # powertop
-    ];
     boot = {
-      kernelModules = ["acpi_call"];
+      kernelModules = [ "acpi_call" ];
-      extraModulePackages = with config.boot.kernelPackages;
+      extraModulePackages = with config.boot.kernelPackages; [
-        [
         acpi_call
       ];
     };
@@ -41,6 +56,6 @@ in {
         criticalPowerAction = "Hibernate";
       };
     };
-    # powerManagement.powertop.enable = true;
+    powerManagement.powertop.enable = true;
   };
 }