23.10.1.3-t2

t2linux · Oct 23, 2023 · 9be0ad6 · 9be0ad6
1 parent 19bce10
commit 9be0ad6
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 34 deletions.
diff --git a/data/eos/modules/bootloader.conf b/data/eos/modules/bootloader.conf
@@ -19,10 +19,10 @@ loaderEntries:
   - "reboot-for-bitlocker 1"
 
 # systemd-boot and refind support custom kernel params
-kernelParams: [ "nvme_load=YES","nowatchdog" ]
+kernelParams: [ "nvme_load=YES","nowatchdog","intel_iommu=on","iommu=pt","pcie_ports=compat" ]
 
 # A list of kernel names that refind should accept as kernels
-refindKernelList: [ "linux","linux-lts","linux-zen","linux-hardened" ]
+refindKernelList: [ "linux-t2","linux-lts-t2","linux-xanmod-t2","linux-xanmod-lts-t2" ]
 
 # grub settings
 efiBootloaderId: "endeavouros"

diff --git a/data/eos/modules/grubcfg.conf b/data/eos/modules/grubcfg.conf
@@ -16,6 +16,9 @@ keep_distributor: false
 kernel_params:
   - "nowatchdog"
   - "nvme_load=YES"
+  - "intel_iommu=on"
+  - "iommu=pt"
+  - "pcie_ports=compat"
 
 # Default entries to write to /etc/default/grub if it does not exist yet or if
 # we are overwriting it.
@@ -27,4 +30,4 @@ defaults:
     GRUB_DISABLE_RECOVERY: true
     GRUB_BACKGROUND: "/usr/share/endeavouros/splash.png"
 
-always_use_defaults: true
+always_use_defaults: true
diff --git a/data/eos/modules/netinstall.yaml b/data/eos/modules/netinstall.yaml
@@ -22,13 +22,10 @@
       selected: true
       packages:
         - xf86-video-amdgpu
-        - xf86-video-ati
     - name: Network
       description: "Network apps drivers and tools"
       selected: true
       packages:
-        - b43-fwcutter
-        - broadcom-wl-dkms
         - dhclient
         - dnsmasq
         - dnsutils
@@ -132,12 +129,11 @@
         - power-profiles-daemon
         - upower
     - name: "CPU specific microcode update packages"
-      description: "Microcode update image for AMD and Intel CPUs"
+      description: "Microcode update image for Intel CPU"
       hidden: false
       selected: true
       critical: false
       packages:
-        - amd-ucode
         - intel-ucode
 - name: "EndeavourOS applications"
   description: "EndeavourOS tools and applications"
@@ -196,8 +192,26 @@
   expanded: false
   critical: false
   packages:
-    - linux-lts
-    - linux-lts-headers
+    - linux-lts-t2
+    - linux-lts-t2-headers
+- name: "Xanmod Kernel in addition"
+  description: "Adding Xanmod Kernel in addition to main one"
+  hidden: false
+  selected: false
+  expanded: false
+  critical: false
+  packages:
+    - linux-xanmod-t2
+    - linux-xanmod-t2-headers
+- name: "Xanmod LTS Kernel in addition"
+  description: "Adding Xanmod LTS Kernel in addition to main one"
+  hidden: false
+  selected: false
+  expanded: false
+  critical: false
+  packages:
+    - linux-xanmod-lts-t2
+    - linux-xanmod-lts-t2-headers
 - name: "Printing support"
   description: "Support for printing (Cups)"
   hidden: false

diff --git a/data/eos/modules/pacstrap.conf b/data/eos/modules/pacstrap.conf
@@ -11,8 +11,11 @@
 # basePackages is an array of package names to pass to pacstrap
 #
 basePackages:
+  - apple-bcm-firmware
+  - apple-t2-audio-config
   - base
   - base-devel
+  - bolt
   - btrfs-progs
   - cryptsetup
   - device-mapper
@@ -30,9 +33,9 @@ basePackages:
   - inetutils
   - jfsutils
   - less
-  - linux
+  - linux-t2
   - linux-firmware
-  - linux-headers
+  - linux-t2-headers
   - logrotate
   - lsb-release
   - lvm2
@@ -49,7 +52,9 @@ basePackages:
   - sudo
   - sysfsutils
   - systemd-sysvcompat
+  - t2fand
   - texinfo
+  - touchbard
   - usbutils
   - which
   - xfsprogs

diff --git a/data/eos/modules/services-systemd.conf b/data/eos/modules/services-systemd.conf
@@ -6,37 +6,41 @@
 
  units:
    - name: "NetworkManager.service"
-     action: "enable" 
+     action: "enable"
    - name: "cups.service"
-     action: "enable" 
+     action: "enable"
    - name: "avahi-daemon.service"
-     action: "enable" 
+     action: "enable"
    - name: "systemd-timesyncd.service"
-     action: "enable" 
+     action: "enable"
    - name: "power-profiles-daemon.service"
-     action: "enable" 
+     action: "enable"
    - name: "gdm.service"
-     action: "enable" 
+     action: "enable"
    - name: "lightdm.service"
-     action: "enable" 
+     action: "enable"
    - name: "sddm.service"
-     action: "enable" 
+     action: "enable"
    - name: "lxdm.service"
-     action: "enable" 
+     action: "enable"
    - name: "ly.service"
      action: "enable"
    - name: "greetd.service"
      action: "enable"
    - name: "vboxservice.service"
-     action: "enable" 
+     action: "enable"
    - name: "vmtoolsd.service"
-     action: "enable" 
+     action: "enable"
    - name: "vmware-vmblock-fuse.service"
-     action: "enable" 
+     action: "enable"
    - name: "firewalld.service"
-     action: "enable" 
+     action: "enable"
    - name: "fstrim.timer"
-     action: "enable" 
+     action: "enable"
+   - name: "t2fand.service"
+     action: "enable"
+   - name: "touchbard.service"
+     action: "enable"
    - name:  "pacman-init"
      action: "disable"
    - name:  "bluetooth.service"

diff --git a/data/eos/scripts/chrooted_cleaner_script.sh b/data/eos/scripts/chrooted_cleaner_script.sh
@@ -419,7 +419,6 @@ _clean_up(){
     _remove_other_graphics_drivers
 
     # remove broadcom-wl-dkms if it is not needed
-    _remove_broadcom_wifi_driver
 
     _install_extra_drivers_to_target
     _install_more_firmware

diff --git a/data/eos/scripts/remove-ucode b/data/eos/scripts/remove-ucode
@@ -1,11 +1,5 @@
 #!/usr/bin/env bash
 
-# Remove the "wrong" microcode.
-case "$(grep -w "^vendor_id" /proc/cpuinfo | head -n 1 | awk '{print $3}')" in
-    GenuineIntel)       pkgname=amd-ucode ;;
-    AuthenticAMD | *)   pkgname=intel-ucode ;;
-esac
-
-[[ $(pacman -Q "${pkgname}"  2>/dev/null) ]] && pacman -R --noconfirm "${pkgname}"
+# It's always intel-ucode for Macs
 
 exit 0