anders/my-ostree-OS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Compare commits

base: anders:main
Branches Tags
anders:main
anders:test
anders:xlibre-beta
anders:elrepo-kernel
anders:default-kernel
anders:virtualbox
anders:waydroid-test
anders:podman
anders:buildah
..
compare: anders:elrepo-kernel
Branches Tags
anders:main
anders:test
anders:xlibre-beta
anders:elrepo-kernel
anders:default-kernel
anders:virtualbox
anders:waydroid-test
anders:podman
anders:buildah

No commits in common. "main" and "elrepo-kernel" have entirely different histories.
main ... elrepo-ker

5 changed files with 23 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

39
Dockerfile
View file

@ -1,10 +1,8 @@
FROM quay.io/almalinuxorg/atomic-desktop-kde:10
ARG KERNEL=kernel-cachyos
ARG KERNEL=kernel-ml
ENV KERNEL=${KERNEL}
RUN rpm -e --nodeps gpsd-libs
RUN dnf upgrade -y
COPY bin/set_next_version.sh /tmp
@ -15,15 +13,16 @@ RUN dnf config-manager --add-repo=https://negativo17.org/repos/epel-nvidia.repo
RUN dnf install --nogpgcheck -y https://mirrors.rpmfusion.org/free/el/rpmfusion-free-release-$(rpm -E %rhel).noarch.rpm https://mirrors.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-$(rpm -E %rhel).noarch.rpm
RUN dnf config-manager --add-repo https://copr.fedorainfracloud.org/coprs/g/SonicDE/SonicDE-EL10/repo/rhel+epel-10/group_SonicDE-SonicDE-EL10-rhel+epel-10.repo -y
RUN dnf config-manager --add-repo https://copr.fedorainfracloud.org/coprs/andersrh/sonicDE/repo/rhel+epel-10/andersrh-sonicDE-rhel+epel-10.repo -y
RUN dnf config-manager --add-repo https://copr.fedorainfracloud.org/coprs/g/xlibre/xlibre-xserver/repo/rhel+epel-10/group_xlibre-xlibre-xserver-rhel+epel-10.repo -y
RUN dnf config-manager --add-repo https://pc-rytteren.dk/forge/api/packages/anders/rpm.repo -y
# This may be necessary for the speakers and internal microphone
RUN dnf install -y alsa-sof-firmware
RUN dnf install xorg-x11-xinit xkbcomp xinput xlibre-xserver-Xorg xlibre-xserver-common xlibre-xf86-input-libinput cage weston redshift xrandr -y
RUN dnf install --allowerasing -y \
RUN rpm -e --nodeps plasma-workspace-libs plasma-workspace libplasma \
kwin kwin-common kwin-libs kscreenlocker plasma-desktop sddm-wayland-plasma && \
dnf install --allowerasing --nogpgcheck -y \
sonic-workspace \
sonic-workspace-libs \
sonic-workspace-common \
@ -32,10 +31,10 @@ RUN dnf install --allowerasing -y \
sonic-desktop-interface \
sonic-interface-libraries
RUN dnf install --allowerasing -y sonic-keybind-daemon sonic-frameworks-windowsystem sonic-system-info sonic-screen sonic-screen-library sonic-sysguard-library
RUN dnf install --allowerasing --nogpgcheck -y sonic-keybind-daemon sonic-frameworks-windowsystem sonic-system-info sonic-screen sonic-screen-library sonic-sysguard-library
RUN dnf remove -y sddm && \
dnf install --allowerasing -y sonic-login-manager
dnf install --allowerasing --nogpgcheck -y sonic-login-manager
RUN dnf install -y fish distrobox nvtop intel-media-driver libva-intel-driver htop
RUN dnf install -y https://github.com/TheAssassin/AppImageLauncher/releases/download/v3.0.0-beta-3/appimagelauncher_3.0.0-beta-2-gha287.96cb937_x86_64.rpm
@ -43,23 +42,20 @@ RUN dnf install -y https://github.com/TheAssassin/AppImageLauncher/releases/down
# Enable CachyOS addons EL10 fork repo
RUN dnf copr enable andersrh/kernel-cachyos-addons-el10 -y
# Enable CachyOS repositories
RUN dnf copr enable bieszczaders/kernel-cachyos -y
RUN rpm --import https://www.elrepo.org/RPM-GPG-KEY-v2-elrepo.org
RUN dnf install https://www.elrepo.org/elrepo-release-10.el10.elrepo.noarch.rpm -y
RUN dnf install -y ${KERNEL}
RUN dnf install --enablerepo=elrepo-kernel -y ${KERNEL}
RUN rpm -e --nodeps kernel kernel-core kernel-modules kernel-modules-core kernel-modules-extra
RUN dnf install -y ${KERNEL}-devel ${KERNEL}-devel-matched
RUN dnf install --enablerepo=elrepo-kernel -y ${KERNEL}-devel
# Install Negativo17 Nvidia driver
RUN dnf install -y dkms-nvidia nvidia-driver nvidia-persistenced opencl-filesystem libva-nvidia-driver
RUN dkms install nvidia/$(ls /usr/src/ | grep nvidia- | cut -d- -f2-) -k $(rpm -q --queryformat "%{VERSION}-%{RELEASE}.%{ARCH}\n" ${KERNEL})
# Install Nvidia X11 driver
RUN dnf install xorg-x11-nvidia --enablerepo=fc-nvidia -y
RUN dnf install -y waydroid scx-scheds
RUN dnf install -y waydroid
# Remove plocate to avoid updatedb going crazy with scanning the file system once a day
RUN dnf remove -y plocate
@ -92,8 +88,10 @@ RUN dnf install firefox thunderbird -y
RUN rm -f /usr/lib64/libopenh264.so.2.4.1 /usr/lib64/libopenh264.so.7
RUN rpm -Uvh --nodeps https://codecs.fedoraproject.org/openh264/42/x86_64/Packages/o/openh264-2.5.1-1.fc42.x86_64.rpm https://codecs.fedoraproject.org/openh264/42/x86_64/Packages/m/mozilla-openh264-2.5.1-1.fc42.x86_64.rpm
RUN dnf install xorg-x11-xinit xkbcomp xinput xlibre-xserver-Xorg xlibre-xf86-input-libinput cage weston redshift -y
RUN dnf install ananicy-cpp cachyos-ananicy-rules cachyos-settings -y \
&& systemctl disable ananicy-cpp
&& systemctl enable ananicy-cpp
# Install VLC
RUN dnf install vlc vlc-plugins-freeworld vlc-plugin-pipewire -y
@ -108,15 +106,10 @@ RUN dnf install https://github.com/trapexit/mergerfs/releases/download/2.41.1/me
RUN dnf install -y virt-manager
RUN dnf install -y https://github.com/balena-io/etcher/releases/download/v2.1.6/balena-etcher-2.1.6-1.x86_64.rpm
RUN dnf install -y keepassxc
RUN systemctl enable docker
RUN echo 'kargs = ["mem_sleep_default=deep"]' > /usr/lib/bootc/kargs.d/10-mem-sleep.toml
RUN echo 'kargs = ["rd.driver.blacklist=nouveau", "nouveau.modeset=0"]' > /usr/lib/bootc/kargs.d/20-blacklist-nouveau.toml
RUN echo 'kargs = ["zswap.enabled=1", "zswap.shrinker_enabled=0", "zswap.compressor=zstd", "zswap.zpool=zsmalloc"]' > /usr/lib/bootc/kargs.d/30-zswap.toml
RUN printf '[connection]\nwifi.powersave=2\n' > /usr/lib/NetworkManager/conf.d/disable-wifi-powersave.conf
COPY etc /etc

7
etc/X11/xorg.conf.d/20-modesetting.conf Normal file
View file

@ -0,0 +1,7 @@
Section "Device"
Identifier "Intel Graphics"
Driver "modesetting"
Option "ShadowFB" "false" # you don't need on recent hardware
Option "Atomic" "true" #only effective on Xlibre, or Xorg-git with a special patch
Option "TearFree" "false" # Compositor is being used so TearFree is not needed
EndSection

31
etc/X11/xorg.conf.d/20-nvidia.conf
View file

@ -1,31 +0,0 @@
Section "ServerLayout"
Identifier "layout"
Screen 0 "intel"
Inactive "nvidia"
Option "AllowNVIDIAGPUScreens"
EndSection
Section "Device"
Identifier "nvidia"
Driver "nvidia"
BusID "PCI:1:0:0"
EndSection
Section "Screen"
Identifier "nvidia"
Device "nvidia"
EndSection
Section "Device"
Identifier "intel"
Driver "modesetting"
BusID "PCI:0:2:0"
Option "ShadowFB" "false" # you don't need on recent hardware
Option "Atomic" "true" #only effective on Xlibre, or Xorg-git with a special patch
Option "TearFree" "false" # Compositor is being used so TearFree is not needed
EndSection
Section "Screen"
Identifier "intel"
Device "intel"
EndSection

35
repo/fc-nvidia.repo
View file

@ -1,35 +0,0 @@
[fc-nvidia]
name=negativo17 - Nvidia
baseurl=https://negativo17.org/repos/nvidia/fedora-44/$basearch/
enabled=0
skip_if_unavailable=1
gpgcheck=1
gpgkey=https://negativo17.org/repos/RPM-GPG-KEY-slaanesh
enabled_metadata=1
metadata_expire=6h
type=rpm-md
repo_gpgcheck=0
[fc-nvidia-source]
name=negativo17 - Nvidia - Source
baseurl=https://negativo17.org/repos/nvidia/fedora-44/SRPMS
enabled=0
skip_if_unavailable=1
gpgcheck=1
gpgkey=https://negativo17.org/repos/RPM-GPG-KEY-slaanesh
enabled_metadata=1
metadata_expire=6h
type=rpm-md
repo_gpgcheck=0
[fc-nvidia-debug]
name=negativo17 - Nvidia - Debug
baseurl=https://negativo17.org/repos/nvidia/fedora-44/$basearch.debug/
enabled=0
skip_if_unavailable=1
gpgcheck=1
gpgkey=https://negativo17.org/repos/RPM-GPG-KEY-slaanesh
enabled_metadata=1
metadata_expire=6h
type=rpm-md
repo_gpgcheck=0

12
usr/bin/zswapinfo
View file

@ -1,12 +0,0 @@
#!/bin/sh
echo "--- ZSWAP STATUS IN RAM & DISK ---"
pages=$(sudo cat /sys/kernel/debug/zswap/stored_pages)
pool=$(sudo cat /sys/kernel/debug/zswap/pool_total_size)
wb_pages=$(sudo cat /sys/kernel/debug/zswap/written_back_pages)
inc_pages=$(sudo cat /sys/kernel/debug/zswap/stored_incompressible_pages)
echo "Data opsnappet i RAM (før komprimering): $((pages * 4 / 1024)) MB"
echo "Fysisk RAM brugt (efter komprimering): $((pool / 1024 / 1024)) MB"
echo "Skubbet fra RAM til disk (pool fuld): $((wb_pages * 4 / 1024)) MB"
echo "Sendt direkte til disk (ikke-komprimerbar): $((inc_pages * 4 / 1024)) MB"