diff --git a/Dockerfile b/Dockerfile index 1e61e87..f3579a0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,16 +9,14 @@ COPY bin/set_next_version.sh /tmp RUN /tmp/set_next_version.sh COPY repo/*.repo /etc/yum.repos.d/ -RUN dnf config-manager --add-repo=https://negativo17.org/repos/epel-nvidia.repo -y +RUN dnf config-manager --add-repo=https://negativo17.org/repos/epel-nvidia-580.repo -y 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/andersrh/sonicDE/repo/rhel+epel-10/andersrh-sonicDE-rhel+epel-10.repo -y +RUN dnf copr enable yselkowitz/xfce-epel -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 -# This may be necessary for the speakers and internal microphone -RUN dnf install -y alsa-sof-firmware - RUN dnf install sonic-workspace-x11 sonic-win sonic-interface-libraries sonic-workspace --allowerasing -y RUN dnf install -y fish distrobox nvtop intel-media-driver libva-intel-driver htop @@ -72,18 +70,43 @@ 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 +# Install Thorium +RUN dnf install -y https://github.com/Alex313031/thorium/releases/download/M138.0.7204.303/thorium-browser_138.0.7204.303_AVX2.rpm + +RUN dnf install xlibre-xserver-Xorg xlibre-xserver-devel xinput meson gcc cmake libX11-devel libXext-devel libXft-devel libXinerama-devel xorg-x11-proto-devel libxshmfence-devel libxkbfile-devel libbsd-devel libXfont2-devel xkbcomp libfontenc-devel libXres-devel libXdmcp-devel dbus-devel systemd-devel libudev-devel libxcvt-devel libdrm-devel libXv-devel libseat-devel libXv-devel xkbcomp xkeyboard-config-devel mesa-libGL-devel mesa-libEGL-devel libepoxy-devel mesa-libgbm-devel libdrm-devel xcb-util-devel xcb-util-image-devel xcb-util-keysyms-devel xcb-util-wm-devel xcb-util-renderutil-devel openssl-devel libXau-devel libXdmcp-devel libSM-devel libICE-devel startup-notification-devel libgtop2-devel libepoxy-devel libgudev-devel libwnck3-devel.x86_64 libdisplay-info-devel.x86_64 libnotify-devel.x86_64 upower-devel.x86_64 iceauth libICE-devel libSM-devel libXpresent-devel libyaml-devel vte291-devel gtk3-devel xorg-x11-xinit xlibre-xf86-input-libinput-devel xlibre-xf86-input-libinput \ + libXScrnSaver-devel libxklavier-devel pam-devel gcc-c++ dbus-glib-devel libtool gettext-devel gstreamer1-devel sqlite-devel pavucontrol pulseaudio-libs-devel weston cage network-manager-applet redshift blueman -y + +RUN mkdir /tmp/xfce +WORKDIR /tmp/xfce + +ADD https://archive.xfce.org/xfce/4.20/fat_tarballs/xfce-4.20.tar.bz2 ./ + +RUN tar -xjf xfce-4.20.tar.bz2 + +WORKDIR /tmp/xfce/src + +COPY buildinstallxfce.sh ./ +RUN chmod +x buildinstallxfce.sh && ./buildinstallxfce.sh + +ADD https://archive.xfce.org/src/apps/xfce4-mixer/4.20/xfce4-mixer-4.20.0.tar.xz ./ +ADD https://archive.xfce.org/src/apps/xfce4-notifyd/0.9/xfce4-notifyd-0.9.7.tar.bz2 ./ +ADD https://archive.xfce.org/src/panel-plugins/xfce4-clipman-plugin/1.7/xfce4-clipman-plugin-1.7.0.tar.xz ./ +ADD https://archive.xfce.org/src/panel-plugins/xfce4-pulseaudio-plugin/0.5/xfce4-pulseaudio-plugin-0.5.1.tar.xz ./ +ADD https://archive.xfce.org/src/panel-plugins/xfce4-whiskermenu-plugin/2.10/xfce4-whiskermenu-plugin-2.10.0.tar.xz ./ +ADD https://archive.xfce.org/src/panel-plugins/xfce4-stopwatch-plugin/0.6/xfce4-stopwatch-plugin-0.6.0.tar.xz ./ +ADD https://archive.xfce.org/src/apps/xfce4-screensaver/4.20/xfce4-screensaver-4.20.1.tar.xz ./ + +COPY buildinstallxfceaddons.sh ./ +RUN chmod +x buildinstallxfceaddons.sh && ./buildinstallxfceaddons.sh RUN dnf install ananicy-cpp cachyos-ananicy-rules cachyos-settings -y \ && systemctl enable ananicy-cpp +RUN dnf install xscreensaver -y + # Install VLC RUN dnf install vlc vlc-plugins-freeworld vlc-plugin-pipewire -y -# Install Brave browser -RUN dnf config-manager --add-repo https://brave-browser-rpm-release.s3.brave.com/brave-browser.repo -y -RUN dnf install brave-browser -y - RUN systemctl enable docker RUN systemctl enable scx_loader diff --git a/buildinstallxfce.sh b/buildinstallxfce.sh new file mode 100644 index 0000000..7defc22 --- /dev/null +++ b/buildinstallxfce.sh @@ -0,0 +1,57 @@ +#!/bin/sh + +export PKG_CONFIG_PATH="/usr/lib/pkgconfig:$PKG_CONFIG_PATH" + +for f in *.tar.bz2; do tar -xjf "$f"; done + +cd xfce4-dev-tools-4.20.0 +./configure --prefix=/usr && make && make install + +cd ../libxfce4util-4.20.0/ +./configure --prefix=/usr && make && make install + +cd ../xfconf-4.20.0 +./configure --prefix=/usr && make && make install + +cd ../libxfce4ui-4.20.0/ +./configure --prefix=/usr && make && make install + +cd ../exo-4.20.0/ +./configure --prefix=/usr && make && make install + +cd ../garcon-4.20.0/ +./configure --prefix=/usr && make && make install + +cd ../libxfce4windowing-4.20.0 +./configure --prefix=/usr && make && make install + +cd ../xfce4-panel-4.20.0 +./configure --prefix=/usr && make && make install + +cd ../xfce4-appfinder-4.20.0 +./configure --prefix=/usr && make && make install + +cd ../xfce4-session-4.20.0 +./configure --prefix=/usr && make && make install + +cd ../xfce4-settings-4.20.0 +./configure --prefix=/usr && make && make install + +cd ../xfwm4-4.20.0/ +./configure --prefix=/usr && make && make install + +cd ../xfdesktop-4.20.0 +./configure --prefix=/usr && make && make install + +cd ../xfce4-power-manager-4.20.0 +./configure --prefix=/usr && make && make install + +cd ../thunar-4.20.0 +./configure --prefix=/usr && make && make install + +cd ../tumbler-4.20.0 +./configure --prefix=/usr && make && make install + +cd ../thunar-volman-4.20.0 +./configure --prefix=/usr && make && make install + diff --git a/buildinstallxfceaddons.sh b/buildinstallxfceaddons.sh new file mode 100644 index 0000000..bb4be28 --- /dev/null +++ b/buildinstallxfceaddons.sh @@ -0,0 +1,47 @@ +#!/bin/sh + +export PKG_CONFIG_PATH="/usr/lib/pkgconfig:$PKG_CONFIG_PATH" + +#tar -xf xfce4-screensaver-4.20.1.tar.xz +#cd xfce4-screensaver-4.20.1 +#meson setup build +#meson compile -C build +#meson install -C build + +#cd ../ + +tar -xf xfce4-stopwatch-plugin-0.6.0.tar.xz +cd xfce4-stopwatch-plugin-0.6.0 +./autogen.sh --prefix=/usr && make && make install + +cd ../ + +tar -xf xfce4-whiskermenu-plugin-2.10.0.tar.xz +cd xfce4-whiskermenu-plugin-2.10.0 +meson setup build +meson compile -C build +meson install -C build + +cd ../ + +tar -xf xfce4-pulseaudio-plugin-0.5.1.tar.xz +cd xfce4-pulseaudio-plugin-0.5.1 +./autogen.sh --prefix=/usr && make && make install + +cd ../ + +tar -xf xfce4-mixer-4.20.0.tar.xz +cd xfce4-mixer-4.20.0 +./autogen.sh --prefix=/usr && make && make install + +cd ../ + +tar -xjf xfce4-notifyd-0.9.7.tar.bz2 +cd xfce4-notifyd-0.9.7 +./configure --prefix=/usr && make && make install + +cd ../ + +tar -xf xfce4-clipman-plugin-1.7.0.tar.xz +cd xfce4-clipman-plugin-1.7.0 +./autogen.sh --prefix=/usr && make && make install \ No newline at end of file diff --git a/etc/X11/xorg.conf.d/00-keyboard.conf b/etc/X11/xorg.conf.d/00-keyboard.conf deleted file mode 100644 index 146d931..0000000 --- a/etc/X11/xorg.conf.d/00-keyboard.conf +++ /dev/null @@ -1,10 +0,0 @@ -# Written by systemd-localed(8), read by systemd-localed and Xorg. It's -# probably wise not to edit this file manually. Use localectl(1) to -# update this file. -Section "InputClass" - Identifier "system-keyboard" - MatchIsKeyboard "on" - Option "XkbLayout" "dk" - Option "XkbModel" "pc105" - Option "XkbOptions" "terminate:ctrl_alt_bksp" -EndSection diff --git a/etc/X11/xorg.conf.d/20-modesetting.conf b/etc/X11/xorg.conf.d/20-modesetting.conf deleted file mode 100644 index 96ed85d..0000000 --- a/etc/X11/xorg.conf.d/20-modesetting.conf +++ /dev/null @@ -1,7 +0,0 @@ -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" -EndSection diff --git a/etc/X11/xorg.conf.d/90-touchpad-scaling.conf b/etc/X11/xorg.conf.d/90-touchpad-scaling.conf deleted file mode 100644 index 55467d0..0000000 --- a/etc/X11/xorg.conf.d/90-touchpad-scaling.conf +++ /dev/null @@ -1,18 +0,0 @@ -Section "InputClass" - Identifier "Touchpad Scaling" - # Matcher alle touchpads der bruger libinput - MatchIsTouchpad "on" - MatchDevicePath "/dev/input/event*" - Driver "libinput" - - Option "TransformationMatrix" "130 0 0 0 130 0 0 0 100" - - # Bruger den ergonomiske 'adaptive' profil (1 0 er Adaptive) - #Option "AccelProfile" "adaptive" - - # Holder grundhastigheden neutral (0.0) - #Option "AccelSpeed" "0" - - # Valgfrit: Slå tap-to-click til, hvis du foretrækker det - # Option "Tapping" "on" -EndSection diff --git a/etc/environment b/etc/environment index 62d0c39..2c4d932 100644 --- a/etc/environment +++ b/etc/environment @@ -1 +1,4 @@ +QT_AUTO_SCREEN_SCALE_FACTOR=2 +QT_ENABLE_HIGHDPI_SCALING=2 +QT_SCALE_FACTOR=2 GDK_BACKEND=x11 \ No newline at end of file