simplify dbus

ciscon · Jan 14, 2025 · 604403f · 604403f
1 parent 8b40cea
commit 604403f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/create_image.sh b/create_image.sh
@@ -70,7 +70,7 @@ slimconf="$currentdir/resources/slim.conf"
 
 packages="nano procps os-prober util-linux iputils-ping openssh-client file git sudo cmake ninja-build build-essential libgl1-mesa-dri libpcre3-dev terminfo vim-tiny unzip zstd alsa-utils fbset systemd-timesyncd cloud-utils parted lvm2 gdisk initramfs-tools fdisk firmware-linux firmware-linux-nonfree firmware-linux-free firmware-realtek firmware-iwlwifi firmware-intel-sound firmware-sof-signed libarchive-tools linux-image-generic ntfs-3g nfs-common exfat-fuse plymouth plymouth-label iw connman wpasupplicant zip grub2 "
 packages_nox11="ifupdown dhcpcd-base"
-packages_x11=" xserver-xorg-legacy xserver-xorg-core xserver-xorg-video-amdgpu xserver-xorg-video-radeon xserver-xorg-input-all xinit connman-gtk feh menu python3-xdg xdg-utils chromium pasystray pavucontrol pipewire pipewire-pulse wireplumber x11-xserver-utils dbus-x11 dbus-bin imagemagick gvfs-backends rtkit gnome-icon-theme xfce4-terminal xfce4 mousepad slim xkbset policykit-1-gnome fonts-recommended thunar-archive-plugin file-roller zip "
+packages_x11=" xserver-xorg-legacy xserver-xorg-core xserver-xorg-video-amdgpu xserver-xorg-video-radeon xserver-xorg-input-all xinit connman-gtk feh menu python3-xdg xdg-utils chromium pasystray pavucontrol pipewire pipewire-pulse wireplumber x11-xserver-utils dbus dbus-user-session dbus-x11 dbus-bin imagemagick gvfs-backends rtkit gnome-icon-theme xfce4-terminal xfce4 mousepad slim xkbset policykit-1-gnome fonts-recommended thunar-archive-plugin file-roller zip "
 
 if [ "$build_type" != "min" ];then
 	packages+=$packages_x11

diff --git a/resources/xinitrc.real b/resources/xinitrc.real
@@ -10,15 +10,14 @@ xrdb -load $HOME/.Xresources
 #disable accessibility features (sticky keys)
 xkbset -a
 
-if [ -z "$XDG_RUNTIME_DIR" ];then
-  export XDG_RUNTIME_DIR="/tmp/$(id -u)"
-  mkdir -p "$XDG_RUNTIME_DIR"
-fi
-[ -z "$DBUS_SESSION_BUS_ADDRESS" ] && eval $(/usr/bin/dbus-launch --exit-with-session --sh-syntax)
-
-dbus-cleanup-sockets
-dbus-update-activation-environment --all
-export NO_AT_BRIDGE=1
+#if [ -z "$XDG_RUNTIME_DIR" ];then
+#  export XDG_RUNTIME_DIR="/tmp/$(id -u)"
+#  mkdir -p "$XDG_RUNTIME_DIR"
+#fi
+#[ -z "$DBUS_SESSION_BUS_ADDRESS" ] && eval $(/usr/bin/dbus-launch --exit-with-session --sh-syntax)
+#dbus-cleanup-sockets
+#dbus-update-activation-environment --all
+#export NO_AT_BRIDGE=1
 
 #disable tearfree
 for device in $(xrandr |awk '{print $1}'|grep --color=never -v '^Screen'|grep --color=never -v '^[0-9]');do xrandr --output "$device" --set TearFree off >/dev/null 2>&1;done&