From 8f1213793919736b2d76f98b81192e5dc5e0567d Mon Sep 17 00:00:00 2001 From: Yan Lin Date: Thu, 23 Oct 2025 23:06:10 +0200 Subject: [PATCH] remove container support from thinkpad --- hosts/nixos/thinkpad/containers.nix | 14 -------------- hosts/nixos/thinkpad/system.nix | 8 ++------ 2 files changed, 2 insertions(+), 20 deletions(-) delete mode 100644 hosts/nixos/thinkpad/containers.nix diff --git a/hosts/nixos/thinkpad/containers.nix b/hosts/nixos/thinkpad/containers.nix deleted file mode 100644 index 5594b49..0000000 --- a/hosts/nixos/thinkpad/containers.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ config, pkgs, lib, ... }: - -let - # Universal container configuration - commonUID = "1000"; - commonGID = "100"; - systemTZ = config.time.timeZone; -in -{ - # Container definitions for thinkpad host - virtualisation.oci-containers.containers = { - # Add container definitions here as needed - }; -} diff --git a/hosts/nixos/thinkpad/system.nix b/hosts/nixos/thinkpad/system.nix index 6d45ba0..cd616b3 100644 --- a/hosts/nixos/thinkpad/system.nix +++ b/hosts/nixos/thinkpad/system.nix @@ -3,10 +3,8 @@ { imports = [ ./hardware-configuration.nix - ./containers.nix # Host-specific container definitions ../system-default.nix # Common NixOS system configuration ../../../modules/wireguard.nix - ../../../modules/podman.nix ../../../modules/login-display.nix ]; @@ -45,7 +43,6 @@ # Graphics configuration graphics = { enable = true; - enable32Bit = true; extraPackages = with pkgs; [ intel-media-driver # LIBVA_DRIVER_NAME=iHD vaapiIntel # LIBVA_DRIVER_NAME=i965 (older but sometimes works better) @@ -85,7 +82,6 @@ alsa.enable = true; alsa.support32Bit = true; pulse.enable = true; - jack.enable = true; }; # GNOME Desktop Environment @@ -186,8 +182,8 @@ # Suspend behavior configuration services.logind.settings = { Login = { - HandleLidSwitch = "suspend"; # Suspend on lid close (battery only) - HandleLidSwitchDocked = "ignore"; + HandleLidSwitch = "suspend"; # Suspend on lid close (all power modes) + HandleLidSwitchDocked = "ignore"; # Don't suspend when docked HandleLidSwitchExternalPower = "suspend"; HandlePowerKey = "suspend"; # Suspend on power button press HandleSuspendKey = "suspend"; # Allow manual suspend from GNOME menu