From 616de8e6096caedaab3d6860360017b7d6e804e4 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 21 Jun 2023 22:45:58 +0200
Subject: ma x13: move out amdgpu

---
 1systems/x/x13/default.nix | 35 +++++++----------------------------
 1 file changed, 7 insertions(+), 28 deletions(-)

(limited to '1systems')

diff --git a/1systems/x/x13/default.nix b/1systems/x/x13/default.nix
index 32d15df1a..bd812c341 100644
--- a/1systems/x/x13/default.nix
+++ b/1systems/x/x13/default.nix
@@ -3,43 +3,22 @@
 {
   imports = [
     ./input.nix
-    ./disk.nix
+    
+    ((import  ../../../2configs/fs/disko/single-disk-encrypted-zfs.nix ) { disks = ["/dev/nvme0n1" ]; hostId = "f8b8e0a3"; })
     ./battery.nix
-
-    (self + "/2configs/hw/bluetooth.nix")
-    (self + "/2configs/hw/tpm.nix")
-    (self + "/2configs/hw/ssd.nix")
-    # (self + "/2configs/hw/xmm7360.nix")
-
+    ./amdgpu.nix
+    ../../../2configs/hw/bluetooth.nix
+    ../../../2configs/hw/tpm.nix
+    ../../../2configs/hw/ssd.nix
+    # ../../../2configs/hw/xmm7360.nix
     nixos-hardware.nixosModules.lenovo-thinkpad-l14-amd
-
   ];
-  boot.zfs.requestEncryptionCredentials = true;
-  networking.hostId = "f8b8e0a2";
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
 
-  # services.xserver.enable = lib.mkForce false;
-
-  services.xserver.videoDrivers = [ "amdgpu" ];
-  boot.initrd.kernelModules = [ "amdgpu" ];
-  hardware.opengl.driSupport = true;
-  hardware.opengl.extraPackages = [ pkgs.amdvlk pkgs.rocm-opencl-icd pkgs.rocm-opencl-runtime ];
-  # For 32 bit applications
-  hardware.opengl.driSupport32Bit = true;
-  hardware.opengl.extraPackages32 = with pkgs; [ driversi686Linux.amdvlk ];
-  # is required for amd graphics support ( xorg wont boot otherwise )
-  #boot.kernelPackages = pkgs.linuxPackages_latest;
   boot.kernelPackages = lib.mkForce pkgs.linuxPackages;
 
   services.fwupd.enable = true;
-
   programs.light.enable = true;
 
-  users.groups.video = {};
-  users.groups.render = {};
-  users.users.makefu.extraGroups = [ "video" "render" ];
-
   boot.extraModprobeConfig = ''
     options thinkpad_acpi fan_control=1
   '';
-- 
cgit v1.2.3

[cgit] Unable to lock slot /tmp/cgit/f3300000.lock: No such file or directory (2)