From adee526cc0d6ff2d8f66c9e51d13712e1f76cc73 Mon Sep 17 00:00:00 2001 From: Daniel Cerna Date: Fri, 9 Jun 2023 14:19:00 -0400 Subject: [PATCH] Migrating to debian 12 This PR will include all the required migrations (at least for the base layers) in order to upgrade to debian 12 --- .gitignore | 3 + base-system/deps-dev.txt | 4 +- kernel-builder/build-kernel.sh | 20 +- kernel-builder/dependencies.txt | 306 ++ kernel-builder/huronos.config | 2881 +++++++++++------ kernel-builder/sources.list | 12 +- .../base/02-firmware/dependencies.txt | 3 +- software-modules/base/03-budgie/budgie.sh | 72 +- .../files/huronOS-desktop-config.conf | 221 ++ .../files/huronOS-desktop-config.dump | 379 +-- .../base/03-budgie/setup-desktop.sh | 26 +- 11 files changed, 2617 insertions(+), 1310 deletions(-) create mode 100644 .gitignore create mode 100644 kernel-builder/dependencies.txt mode change 100755 => 100644 software-modules/base/03-budgie/budgie.sh create mode 100644 software-modules/base/03-budgie/files/huronOS-desktop-config.conf mode change 100755 => 100644 software-modules/base/03-budgie/setup-desktop.sh diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..376d62a1 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +*.md +doc/* +kernel-builder/kernel-stuff/* diff --git a/base-system/deps-dev.txt b/base-system/deps-dev.txt index 260e1f2a..a76eb5e2 100644 --- a/base-system/deps-dev.txt +++ b/base-system/deps-dev.txt @@ -1,7 +1,7 @@ gddrescue genisoimage gpart -netcat +netcat-openbsd smartmontools unzip -zip \ No newline at end of file +zip diff --git a/kernel-builder/build-kernel.sh b/kernel-builder/build-kernel.sh index 3b2df36c..7488f81c 100755 --- a/kernel-builder/build-kernel.sh +++ b/kernel-builder/build-kernel.sh @@ -17,21 +17,23 @@ # Enya Quetzalli # Set basic kernel data -set -e +set -xe export HTOOLS_KERNEL_DIR="$(pwd)" -export KERNEL_VERSION=6.0.15 +export KERNEL_VERSION=6.1.31 export AUFS_REPOSITORY=aufs-standalone -export AUFS_BRANCH=aufs6.0 +export AUFS_BRANCH=aufs6.1 export AUFS_TOOLS_REPOSITORY=aufs-util export AUFS_TOOLS_BRANCH=aufs6.0 -export PACKAGES="asciidoctor autoconf automake autopoint autotools-dev bc binutils binutils-common binutils-x86-64-linux-gnu bison bsdextrautils build-essential bzip2 ca-certificates cpp cpp-10 debhelper dh-autoreconf dh-exec dh-python dh-strip-nondeterminism diffstat docutils-common dpkg-dev dvipng dwarves dwz ed file flex fontconfig fontconfig-config fonts-dejavu-core fonts-font-awesome fonts-lato fonts-lmodern fonts-urw-base35 g++ g++-10 gcc gcc-10 gcc-10-multilib gcc-multilib gettext ghostscript git graphviz groff-base intltool-debian kernel-wedge lib32asan6 lib32atomic1 lib32gcc-10-dev lib32gcc-s1 lib32gomp1 lib32itm1 lib32quadmath0 lib32stdc++6 lib32ubsan1 libann0 libapache-pom-java libarchive-zip-perl libasan6 libatomic1 libaudit-dev libavahi-client3 libavahi-common-data libavahi-common3 libbabeltrace-dev libbabeltrace1 libbinutils libblkid-dev libc-dev-bin libc6-dev libc6-dev-i386 libc6-dev-x32 libc6-i386 libc6-x32 libcairo2 libcap-dev libcap-ng-dev libcc1-0 libcdt5 libcgraph6 libcommons-logging-java libcommons-parent-java libcrypt-dev libctf-nobfd0 libctf0 libcups2 libdatrie1 libdbus-1-3 libdebhelper-perl libdeflate0 libdpkg-perl libdw-dev libdw1 libelf-dev libexpat1-dev libffi-dev libfile-stripnondeterminism-perl libfontbox-java libfontconfig1 libfribidi0 libgcc-10-dev libgd3 libglib2.0-0 libglib2.0-bin libglib2.0-data libglib2.0-dev libglib2.0-dev-bin libgomp1 libgraphite2-3 libgs9 libgs9-common libgts-0.7-5 libgvc6 libgvpr2 libharfbuzz0b libiberty-dev libice6 libicu67 libidn11 libijs-0.35 libisl23 libitm1 libjbig0 libjbig2dec0 libjpeg62-turbo libjs-jquery libjs-sphinxdoc libjs-underscore libkpathsea6 liblab-gamut1 liblcms2-2 liblsan0 libltdl7 liblzma-dev libmagic-mgc libmagic1 libmount-dev libmpc3 libmpdec3 libmpfr6 libncurses5-dev libncursesw5-dev libnewt-dev libnsl-dev libnuma-dev libnuma1 libopencsd-dev libopencsd0 libopenjp2-7 libpango-1.0-0 libpangocairo-1.0-0 libpangoft2-1.0-0 libpaper-utils libpaper1 libpathplan4 libpci-dev libpcre16-3 libpcre2-16-0 libpcre2-32-0 libpcre2-dev libpcre2-posix2 libpcre3-dev libpcre32-3 libpcrecpp0v5 libpdfbox-java libperl-dev libpipeline1 libpixman-1-0 libpng-dev libptexenc1 libpython3-dev libpython3-stdlib libpython3.9 libpython3.9-dev libpython3.9-minimal libpython3.9-stdlib libquadmath0 libruby2.7 libselinux1-dev libsepol1-dev libsigsegv2 libslang2-dev libsm6 libsqlite3-0 libssl-dev libstdc++-10-dev libsub-override-perl libsynctex2 libteckit0 libtexlua53 libtexluajit2 libthai-data libthai0 libtiff5 libtirpc-dev libtool libtsan0 libubsan1 libuchardet0 libudev-dev libunwind-dev libunwind8 libwebp6 libwrap0 libwrap0-dev libx11-6 libx11-data libx32asan6 libx32atomic1 libx32gcc-10-dev libx32gcc-s1 libx32gomp1 libx32itm1 libx32quadmath0 libx32stdc++6 libx32ubsan1 libxau6 libxaw7 libxcb-render0 libxcb-shm0 libxcb1 libxdmcp6 libxext6 libxi6 libxml2 libxmu6 libxpm4 libxrender1 libxt6 libyaml-0-2 libzzip-0-13 linux-libc-dev lz4 m4 make man-db media-types openssl patch patchutils pkg-config po-debconf poppler-data preview-latex-style python-babel-localedata python3 python3-alabaster python3-babel python3-certifi python3-chardet python3-dev python3-distutils python3-docutils python3-idna python3-imagesize python3-jinja2 python3-lib2to3 python3-markupsafe python3-minimal python3-packaging python3-pkg-resources python3-pygments python3-pyparsing python3-requests python3-roman python3-six python3-snowballstemmer python3-sphinx python3-sphinx-rtd-theme python3-tz python3-urllib3 python3.9 python3.9-dev python3.9-minimal quilt rake rsync ruby ruby-asciidoctor ruby-minitest ruby-net-telnet ruby-power-assert ruby-rubygems ruby-test-unit ruby-xmlrpc ruby2.7 rubygems-integration sgml-base sphinx-common sphinx-rtd-theme-common t1utils tex-common texlive-base texlive-binaries texlive-latex-base texlive-latex-extra texlive-latex-recommended texlive-pictures uuid-dev x11-common xdg-utils xml-core xz-utils zlib1g-dev" +export PACKAGES="" +# Get the dependencies and replace every new line with a space +mapfile -t PACKAGES >/etc/login.defs @@ -61,26 +41,27 @@ sed -i 's/#autologin-user=.*/autologin-user=contestant/g' /etc/lightdm/lightdm.c sed -i 's/#autologin-user-timeout=.*/autologin-user-timeout=0/g' /etc/lightdm/lightdm.conf ## Set budgie background -mkdir -p /usr/share/backgrounds/ -cp files/huronos-background.png /usr/share/backgrounds/huronos-background.png +cp files/huronos-background.png /usr/share/backgrounds/budgie/default.jpg cp files/huronos-lightdm.png /usr/share/backgrounds/huronos-lightdm.png chmod 644 /usr/share/backgrounds/huronos* echo "background=/usr/share/backgrounds/huronos-lightdm.png" >>/etc/lightdm/lightdm-gtk-greeter.conf -## Set budgie menu configs +## Prepare budgie menu configs cp files/huronOS-desktop-config.dump /tmp/huronOS-desktop-config.dump chmod 777 /tmp/huronOS-desktop-config.dump -cp files/gnome-applications.menu /etc/xdg/menus/gnome-applications.menu -rm /usr/share/desktop-directories/* -rf -cp files/directories/* /usr/share/desktop-directories/ +## This section below doesn't work +#cp files/gnome-applications.menu /etc/xdg/menus/gnome-applications.menu +#rm /usr/share/desktop-directories/* -rf +#mkdir -p /usr/share/desktop-directories +#cp files/directories/* /usr/share/desktop-directories/ rfkill unblock bluetooth ## Set .desktop launchers mkdir -p /tmp/save/ cp files/nano.svg /usr/share/icons/hicolor/scalable/apps/ -cp /usr/share/applications/gnome-*-panel.desktop /tmp/save/ -cp /usr/share/applications/budgie-*.desktop /tmp/save/ -cp /usr/share/applications/gnome-control-center.desktop /tmp/save/ +cp /usr/share/applications/budgie-*-panel.desktop /tmp/save/ +cp /usr/share/applications/org.buddiesofbudgie.*.desktop /tmp/save/ +cp /usr/share/applications/budgie-control-center.desktop /tmp/save/ cp /usr/share/applications/org.gnome.Calendar.desktop /tmp/save/ cp /usr/share/applications/org.gnome.Nautilus.desktop /tmp/save/ cp /usr/share/applications/org.gnome.Terminal.desktop /tmp/save/ @@ -90,31 +71,27 @@ cp /tmp/save/* /usr/share/applications/ rm -rf /tmp/save ## Replace nm-applet with connman-gtk -sed -i 's/Exec=.*$/Exec=connman-gtk --tray/g' /etc/xdg/autostart/budgie-desktop-nm-applet.desktop -sed -i 's/TryExec=.*$/TryExec=connman-gtk/g' /etc/xdg/autostart/budgie-desktop-nm-applet.desktop -mv /etc/xdg/autostart/budgie-desktop-nm-applet.desktop /etc/xdg/autostart/budgie-desktop-connman-applet.desktop +sed -i 's/Exec=.*$/Exec=connman-gtk --tray/g' /etc/xdg/autostart/org.buddiesofbudgie.BudgieDesktopNmApplet.desktop +sed -i 's/TryExec=.*$/TryExec=connman-gtk/g' /etc/xdg/autostart/org.buddiesofbudgie.BudgieDesktopNmApplet.desktop +mv /etc/xdg/autostart/org.buddiesofbudgie.BudgieDesktopNmApplet.desktop /etc/xdg/autostart/budgie-desktop-connman-applet.desktop +rm -f /etc/xdg/autostart/nm-applet.desktop ## Add our own default mime apps rm -rf /usr/share/applications/gnome-mimeapps.list ln -s /etc/xdg/mimeapps.list /usr/share/applications/mimeapps.list ## Set Budgie as default desktop -sed -i 's/Name=.*/Name=Budgie/g' /usr/share/xsessions/lightdm-xsession.desktop -sed -i 's/Exec=.*/Exec=budgie-desktop/g' /usr/share/xsessions/lightdm-xsession.desktop -echo "DesktopNames=Budgie;GNOME" >>/usr/share/xsessions/lightdm-xsession-desktop +sed -i 's|Name=.*|Name=Budgie|g' /usr/share/xsessions/lightdm-xsession.desktop +sed -i 's|Exec=.*|Exec=/usr/bin/budgie-desktop|g' /usr/share/xsessions/lightdm-xsession.desktop +echo "DesktopNames=Budgie;GNOME" >>/usr/share/xsessions/lightdm-xsession.desktop -## Set default dconf settings +## Prepare plank settings cp files/huronOS-plank-config.dump /tmp/huronOS-plank-config.dump chmod 777 /tmp/huronOS-plank-config.dump -mkdir -p /etc/dconf/ -cp -rf files/dconf/* /etc/dconf/ -chmod -R 755 /etc/dconf/ -dconf update ## Create user for contest with no password for login useradd -m -s /bin/bash contestant sed -i 's/contestant:x:/contestant::/g' /etc/passwd -mkdir -p /home/contestant/.config/JetBrains chown -R contestant:contestant /home/contestant/ ## Activate services @@ -136,19 +113,20 @@ rm /usr/lib/udev/rules.d/*udisks2*.rules ## Compile schemas to include connman-gtk glib-compile-schemas /usr/share/glib-2.0/schemas/ - systemctl daemon-reload systemctl enable lightdm.service -systemctl enable hsync.timer - -## Set default resolution for VGA unknown displays -#cp -f "files/10-unknown.conf" "/usr/share/X11/xorg.conf.d/10-unknown.conf" +systemctl start hsync.timer ## Copy plank resolution monitor cp -f "files/plankrm" "/usr/local/bin/plankrm" chmod +x "/usr/local/bin/plankrm" -echo "Please run setup-desktop.sh on each user will have the contestant user interface" +# Copy autostart files +cp -f setup-desktop.sh /tmp/setup-desktop.sh +mkdir -p /tmp/files/autostart +cp -f -r files/autostart/* /tmp/files/autostart + +echo "Please run /tmp/setup-desktop.sh on each user will have the contestant user interface" sleep 10 ## Launch lightdm to configure desktops diff --git a/software-modules/base/03-budgie/files/huronOS-desktop-config.conf b/software-modules/base/03-budgie/files/huronOS-desktop-config.conf new file mode 100644 index 00000000..650c6352 --- /dev/null +++ b/software-modules/base/03-budgie/files/huronOS-desktop-config.conf @@ -0,0 +1,221 @@ +[com/solus-project/budgie-panel] +dark-theme=true +migration-level=1 +panels=['47c58566-0657-11ee-8634-7f651fa7eba6'] + +[com/solus-project/budgie-panel/applets/{344c99e4-06e2-11ee-b296-934d0afcb2aa}] +alignment='end' +name='User Indicator' +position=3 + +[com/solus-project/budgie-panel/applets/{47c9a2e0-0657-11ee-8634-7f651fa7eba6}] +alignment='start' +name='Budgie Menu' +position=0 + +[com/solus-project/budgie-panel/applets/{4826e284-0657-11ee-8634-7f651fa7eba6}] +alignment='end' +name='System Tray' +position=0 + +[com/solus-project/budgie-panel/applets/{482bb264-0657-11ee-8634-7f651fa7eba6}] +alignment='end' +name='Notifications' +position=1 + +[com/solus-project/budgie-panel/applets/{4852a144-0657-11ee-8634-7f651fa7eba6}] +alignment='end' +name='Status Indicator' +position=2 + +[com/solus-project/budgie-panel/applets/{4860409c-0657-11ee-8634-7f651fa7eba6}] +alignment='center' +name='Clock' +position=0 + +[com/solus-project/budgie-panel/applets/{53ab298c-06e1-11ee-b296-934d0afcb2aa}] +alignment='start' +name='Budgie Menu' +position=0 + +[com/solus-project/budgie-panel/applets/{53f7a2bc-06e1-11ee-b296-934d0afcb2aa}] +alignment='end' +name='System Tray' +position=0 + +[com/solus-project/budgie-panel/applets/{541d9224-06e1-11ee-b296-934d0afcb2aa}] +alignment='end' +name='Status Indicator' +position=1 + +[com/solus-project/budgie-panel/applets/{542beec8-06e1-11ee-b296-934d0afcb2aa}] +alignment='center' +name='Clock' +position=0 + +[com/solus-project/budgie-panel/applets/{542f73a4-06e1-11ee-b296-934d0afcb2aa}] +alignment='end' +name='Raven Trigger' +position=2 + +[com/solus-project/budgie-panel/applets/{fd7ae75c-066b-11ee-a11f-c742789ae9aa}] +alignment='end' +name='User Indicator' +position=3 + +[com/solus-project/budgie-panel/panels/{47c58566-0657-11ee-8634-7f651fa7eba6}] +applets=['47c9a2e0-0657-11ee-8634-7f651fa7eba6', '482bb264-0657-11ee-8634-7f651fa7eba6', 'fd7ae75c-066b-11ee-a11f-c742789ae9aa', '4826e284-0657-11ee-8634-7f651fa7eba6', '4860409c-0657-11ee-8634-7f651fa7eba6', '4852a144-0657-11ee-8634-7f651fa7eba6'] +dock-mode=false +enable-shadow=true +location='top' +size=36 +spacing=2 +transparency='none' + +[com/solus-project/budgie-panel/panels/{53a553cc-06e1-11ee-b296-934d0afcb2aa}] +applets=['53ab298c-06e1-11ee-b296-934d0afcb2aa', '542beec8-06e1-11ee-b296-934d0afcb2aa', '542f73a4-06e1-11ee-b296-934d0afcb2aa', '344c99e4-06e2-11ee-b296-934d0afcb2aa', '53f7a2bc-06e1-11ee-b296-934d0afcb2aa', '541d9224-06e1-11ee-b296-934d0afcb2aa'] +enable-shadow=true +location='top' +size=36 +spacing=2 +transparency='none' + +[com/solus-project/budgie-wm] +button-layout='appmenu:minimize,maximize,close' +center-windows=false + +[com/solus-project/clock/instance/clock/{4860409c-0657-11ee-8634-7f651fa7eba6}] +show-seconds=true + +[com/solus-project/clock/instance/clock/{542beec8-06e1-11ee-b296-934d0afcb2aa}] +show-date=false +show-seconds=true + +[net/launchpad/plank/docks/dock1] +alignment='center' +auto-pinning=true +current-workspace-only=false +dock-items=['org.gnome.Terminal.dockitem', 'org.gnome.Nautilus.dockitem'] +hide-delay=0 +hide-mode='intelligent' +icon-size=44 +items-alignment='center' +lock-items=true +monitor='' +offset=0 +pinned-only=false +position='bottom' +pressure-reveal=false +show-dock-item=false +theme='Default' +tooltips-enabled=true +unhide-delay=0 +zoom-enabled=true +zoom-percent=130 + +[org/buddiesofbudgie/budgie-desktop/raven/widgets] +initialized=true +uuids=['f0f649c3-3534-484a-a779-2e655654a39f', '36cd7a36-ad64-47ad-8df4-08e300189758', '322248bf-830e-4a7d-9c1a-a96c96393ae6', 'b7126d09-c501-417c-9ed5-520861dbae3a'] + +[org/buddiesofbudgie/budgie-desktop/raven/widgets/instance-info/2ebe2413-cc41-4453-a5ec-45d2b10e405c] +module='org.buddiesofbudgie.budgie-desktop.raven.widget.MediaControls.so' + +[org/buddiesofbudgie/budgie-desktop/raven/widgets/instance-info/2ed6fbf7-c139-4b48-86ef-dc5db9cd29d2] +module='org.buddiesofbudgie.budgie-desktop.raven.widget.SoundOutput.so' + +[org/buddiesofbudgie/budgie-desktop/raven/widgets/instance-info/322248bf-830e-4a7d-9c1a-a96c96393ae6] +module='org.buddiesofbudgie.budgie-desktop.raven.widget.SoundInput.so' + +[org/buddiesofbudgie/budgie-desktop/raven/widgets/instance-info/36cd7a36-ad64-47ad-8df4-08e300189758] +module='org.buddiesofbudgie.budgie-desktop.raven.widget.SoundOutput.so' + +[org/buddiesofbudgie/budgie-desktop/raven/widgets/instance-info/9aacae1d-0ddb-44e1-9738-497332a09000] +module='org.buddiesofbudgie.budgie-desktop.raven.widget.SoundInput.so' + +[org/buddiesofbudgie/budgie-desktop/raven/widgets/instance-info/b7126d09-c501-417c-9ed5-520861dbae3a] +module='org.buddiesofbudgie.budgie-desktop.raven.widget.MediaControls.so' + +[org/buddiesofbudgie/budgie-desktop/raven/widgets/instance-info/bc28e01f-60bb-4c48-802d-ad9b8d2ac0da] +module='org.buddiesofbudgie.budgie-desktop.raven.widget.Calendar.so' + +[org/buddiesofbudgie/budgie-desktop/raven/widgets/instance-info/f0f649c3-3534-484a-a779-2e655654a39f] +module='org.buddiesofbudgie.budgie-desktop.raven.widget.Calendar.so' + +[org/buddiesofbudgie/control-center] +last-panel='power' +window-state=(980, 640, false) + +[org/gnome/desktop/a11y/interface] +high-contrast=false + +[org/gnome/desktop/input-sources] +current=uint32 0 +sources=[('xkb', 'us')] +xkb-options=@as [] + +[org/gnome/desktop/interface] +clock-format='12h' +clock-show-date=false +clock-show-seconds=true +color-scheme='prefer-dark' +cursor-theme='Adwaita' +gtk-theme='Adwaita-dark' +icon-theme='Moka' +show-battery-percentage=false + +[org/gnome/desktop/media-handling] +automount=false +automount-open=false + +[org/gnome/desktop/screensaver] +lock-delay=uint32 0 + +[org/gnome/desktop/session] +idle-delay=uint32 0 + +[org/gnome/desktop/wm/preferences] +button-layout='appmenu:minimize,maximize,close' +num-workspaces=1 + +[org/gnome/gedit/plugins/filebrowser] +root='file:///' +tree-view=true +virtual-root='file:///home/contestant' + +[org/gnome/gedit/preferences/editor] +highlight-current-line=true +scheme='oblivion' +wrap-last-split-mode='word' + +[org/gnome/gedit/state/window] +bottom-panel-size=140 +side-panel-active-page='GeditWindowDocumentsPanel' +side-panel-size=200 +size=(800, 817) +state=87168 + +[org/gnome/mutter] +edge-tiling=true + +[org/gnome/nautilus/preferences] +default-folder-viewer='icon-view' +migrated-gtk-settings=true +search-filter-time-type='last_modified' + +[org/gnome/nautilus/window-state] +initial-size=(890, 550) + +[org/gnome/settings-daemon/plugins/power] +ambient-enabled=false +idle-dim=false +sleep-inactive-ac-timeout=3600 +sleep-inactive-ac-type='nothing' +sleep-inactive-battery-timeout=1800 +sleep-inactive-battery-type='nothing' + +[org/gnome/settings-daemon/plugins/xsettings] +overrides={'Gtk/ShellShowsAppMenu': <0>, 'Gtk/DecorationLayout': <'menu:minimize,maximize,close'>} + +[org/gtk/gtk4/settings/file-chooser] +show-hidden=false +sort-directories-first=false diff --git a/software-modules/base/03-budgie/files/huronOS-desktop-config.dump b/software-modules/base/03-budgie/files/huronOS-desktop-config.dump index 692a5135..650c6352 100644 --- a/software-modules/base/03-budgie/files/huronOS-desktop-config.dump +++ b/software-modules/base/03-budgie/files/huronOS-desktop-config.dump @@ -1,254 +1,221 @@ -[budgie-panel] +[com/solus-project/budgie-panel] +dark-theme=true migration-level=1 -panels=['de1f0454-aa48-11ec-9e4f-1c3947b2ea3d'] +panels=['47c58566-0657-11ee-8634-7f651fa7eba6'] -[budgie-panel/applets/{1028fd42-b9f8-11ec-b51e-3c2c30cd6fd0}] -alignment='start' -name='Count Down' -position=2 +[com/solus-project/budgie-panel/applets/{344c99e4-06e2-11ee-b296-934d0afcb2aa}] +alignment='end' +name='User Indicator' +position=3 -[budgie-panel/applets/{464c94a4-b9f5-11ec-bb1c-3c2c30cd6fd0}] +[com/solus-project/budgie-panel/applets/{47c9a2e0-0657-11ee-8634-7f651fa7eba6}] alignment='start' name='Budgie Menu' position=0 -[budgie-panel/applets/{464f66ac-b9f5-11ec-bb1c-3c2c30cd6fd0}] -alignment='start' -name='Spacer' -position=1 - -[budgie-panel/applets/{464f9bae-b9f5-11ec-bb1c-3c2c30cd6fd0}] -alignment='start' -name='Icon Task List' -position=2 - -[budgie-panel/applets/{4653e11e-b9f5-11ec-bb1c-3c2c30cd6fd0}] -alignment='end' -name='Spacer' -position=0 - -[budgie-panel/applets/{4653fd7a-b9f5-11ec-bb1c-3c2c30cd6fd0}] +[com/solus-project/budgie-panel/applets/{4826e284-0657-11ee-8634-7f651fa7eba6}] alignment='end' name='System Tray' -position=1 +position=0 -[budgie-panel/applets/{46567eec-b9f5-11ec-bb1c-3c2c30cd6fd0}] +[com/solus-project/budgie-panel/applets/{482bb264-0657-11ee-8634-7f651fa7eba6}] alignment='end' name='Notifications' -position=2 - -[budgie-panel/applets/{4670a39e-b9f5-11ec-bb1c-3c2c30cd6fd0}] -alignment='end' -name='Status Indicator' -position=3 - -[budgie-panel/applets/{4672c750-b9f5-11ec-bb1c-3c2c30cd6fd0}] -alignment='end' -name='User Indicator' -position=4 - -[budgie-panel/applets/{46734608-b9f5-11ec-bb1c-3c2c30cd6fd0}] -alignment='end' -name='Spacer' -position=5 - -[budgie-panel/applets/{46735d46-b9f5-11ec-bb1c-3c2c30cd6fd0}] -alignment='end' -name='Separator' -position=6 - -[budgie-panel/applets/{46739216-b9f5-11ec-bb1c-3c2c30cd6fd0}] -alignment='end' -name='Clock' -position=7 - -[budgie-panel/applets/{46741e2a-b9f5-11ec-bb1c-3c2c30cd6fd0}] -alignment='end' -name='Raven Trigger' -position=8 - -[budgie-panel/applets/{74466fa6-b9f5-11ec-bafa-3c2c30cd6fd0}] -alignment='end' -name='Keyboard Layout' -position=6 - -[budgie-panel/applets/{8b7072e2-871f-11ed-920f-3c2c30cd6fd0}] -alignment='end' -name='System Tray' position=1 -[budgie-panel/applets/{9803aefe-b9f5-11ec-bafa-3c2c30cd6fd0}] -alignment='end' -name='Separator' -position=4 - -[budgie-panel/applets/{a9234aee-871f-11ed-920f-3c2c30cd6fd0}] +[com/solus-project/budgie-panel/applets/{4852a144-0657-11ee-8634-7f651fa7eba6}] alignment='end' name='Status Indicator' position=2 -[budgie-panel/applets/{c46af740-b9f5-11ec-bafa-3c2c30cd6fd0}] -alignment='end' -name='Spacer' +[com/solus-project/budgie-panel/applets/{4860409c-0657-11ee-8634-7f651fa7eba6}] +alignment='center' +name='Clock' position=0 -[budgie-panel/applets/{de2516be-aa48-11ec-9e4f-1c3947b2ea3d}] +[com/solus-project/budgie-panel/applets/{53ab298c-06e1-11ee-b296-934d0afcb2aa}] alignment='start' name='Budgie Menu' position=0 -[budgie-panel/applets/{de37ad74-aa48-11ec-9e4f-1c3947b2ea3d}] -alignment='start' -name='Spacer' -position=1 - -[budgie-panel/applets/{de3b1202-aa48-11ec-9e4f-1c3947b2ea3d}] -alignment='start' -name='Icon Task List' -position=2 - -[budgie-panel/applets/{de658ff0-aa48-11ec-9e4f-1c3947b2ea3d}] -alignment='end' -name='Spacer' -position=5 - -[budgie-panel/applets/{de68df70-aa48-11ec-9e4f-1c3947b2ea3d}] -alignment='end' -name='Notifications' -position=2 - -[budgie-panel/applets/{de85757c-aa48-11ec-9e4f-1c3947b2ea3d}] -alignment='end' -name='User Indicator' -position=8 - -[budgie-panel/applets/{de87d90c-aa48-11ec-9e4f-1c3947b2ea3d}] +[com/solus-project/budgie-panel/applets/{53f7a2bc-06e1-11ee-b296-934d0afcb2aa}] alignment='end' -name='Spacer' -position=9 +name='System Tray' +position=0 -[budgie-panel/applets/{de8841b2-aa48-11ec-9e4f-1c3947b2ea3d}] +[com/solus-project/budgie-panel/applets/{541d9224-06e1-11ee-b296-934d0afcb2aa}] alignment='end' -name='Separator' -position=7 +name='Status Indicator' +position=1 -[budgie-panel/applets/{de88fee0-aa48-11ec-9e4f-1c3947b2ea3d}] +[com/solus-project/budgie-panel/applets/{542beec8-06e1-11ee-b296-934d0afcb2aa}] alignment='center' name='Clock' position=0 -[budgie-panel/applets/{de8aeea8-aa48-11ec-9e4f-1c3947b2ea3d}] +[com/solus-project/budgie-panel/applets/{542f73a4-06e1-11ee-b296-934d0afcb2aa}] alignment='end' name='Raven Trigger' -position=6 - -[budgie-panel/applets/{e5cb2d9a-871f-11ed-920f-3c2c30cd6fd0}] -alignment='end' -name='Spacer' -position=3 - -[budgie-panel/applets/{f02f7da0-871e-11ed-941a-3c2c30cd6fd0}] -alignment='start' -name='Budgie Menu' -position=0 - -[budgie-panel/applets/{f0326eca-871e-11ed-941a-3c2c30cd6fd0}] -alignment='start' -name='Spacer' -position=1 - -[budgie-panel/applets/{f032ab6a-871e-11ed-941a-3c2c30cd6fd0}] -alignment='start' -name='Icon Task List' position=2 -[budgie-panel/applets/{f036f850-871e-11ed-941a-3c2c30cd6fd0}] -alignment='end' -name='Spacer' -position=0 - -[budgie-panel/applets/{f0371038-871e-11ed-941a-3c2c30cd6fd0}] -alignment='end' -name='System Tray' -position=1 - -[budgie-panel/applets/{f03913e2-871e-11ed-941a-3c2c30cd6fd0}] -alignment='end' -name='Notifications' -position=2 - -[budgie-panel/applets/{f04d4894-871e-11ed-941a-3c2c30cd6fd0}] -alignment='end' -name='Status Indicator' -position=3 - -[budgie-panel/applets/{f04f227c-871e-11ed-941a-3c2c30cd6fd0}] +[com/solus-project/budgie-panel/applets/{fd7ae75c-066b-11ee-a11f-c742789ae9aa}] alignment='end' name='User Indicator' -position=4 - -[budgie-panel/applets/{f04fa7e2-871e-11ed-941a-3c2c30cd6fd0}] -alignment='end' -name='Spacer' -position=5 - -[budgie-panel/applets/{f04fbf0c-871e-11ed-941a-3c2c30cd6fd0}] -alignment='end' -name='Separator' -position=6 - -[budgie-panel/applets/{f04ff7a6-871e-11ed-941a-3c2c30cd6fd0}] -alignment='end' -name='Clock' -position=7 - -[budgie-panel/applets/{f05087b6-871e-11ed-941a-3c2c30cd6fd0}] -alignment='end' -name='Raven Trigger' -position=8 - -[budgie-panel/instance/budgie-menu/{de2516be-aa48-11ec-9e4f-1c3947b2ea3d}] -enable-menu-label=true -menu-compact=false -menu-label='Apps' - -[budgie-panel/instance/spacer/{de658ff0-aa48-11ec-9e4f-1c3947b2ea3d}] -size=1 - -[budgie-panel/instance/spacer/{e5cb2d9a-871f-11ed-920f-3c2c30cd6fd0}] -size=2 - -[budgie-panel/instance/tray/{8b7072e2-871f-11ed-920f-3c2c30cd6fd0}] -spacing=0 +position=3 -[budgie-panel/panels/{464c1fd8-b9f5-11ec-bb1c-3c2c30cd6fd0}] -applets=['464f66ac-b9f5-11ec-bb1c-3c2c30cd6fd0', '4672c750-b9f5-11ec-bb1c-3c2c30cd6fd0', '46734608-b9f5-11ec-bb1c-3c2c30cd6fd0', '46567eec-b9f5-11ec-bb1c-3c2c30cd6fd0', '4653e11e-b9f5-11ec-bb1c-3c2c30cd6fd0', '464c94a4-b9f5-11ec-bb1c-3c2c30cd6fd0', '464f9bae-b9f5-11ec-bb1c-3c2c30cd6fd0', '4653fd7a-b9f5-11ec-bb1c-3c2c30cd6fd0', '46735d46-b9f5-11ec-bb1c-3c2c30cd6fd0', '4670a39e-b9f5-11ec-bb1c-3c2c30cd6fd0', '46739216-b9f5-11ec-bb1c-3c2c30cd6fd0', '46741e2a-b9f5-11ec-bb1c-3c2c30cd6fd0'] +[com/solus-project/budgie-panel/panels/{47c58566-0657-11ee-8634-7f651fa7eba6}] +applets=['47c9a2e0-0657-11ee-8634-7f651fa7eba6', '482bb264-0657-11ee-8634-7f651fa7eba6', 'fd7ae75c-066b-11ee-a11f-c742789ae9aa', '4826e284-0657-11ee-8634-7f651fa7eba6', '4860409c-0657-11ee-8634-7f651fa7eba6', '4852a144-0657-11ee-8634-7f651fa7eba6'] +dock-mode=false +enable-shadow=true location='top' -size=39 +size=36 +spacing=2 transparency='none' -[budgie-panel/panels/{de1f0454-aa48-11ec-9e4f-1c3947b2ea3d}] -applets=['e5cb2d9a-871f-11ed-920f-3c2c30cd6fd0', 'de85757c-aa48-11ec-9e4f-1c3947b2ea3d', 'de88fee0-aa48-11ec-9e4f-1c3947b2ea3d', 'de8841b2-aa48-11ec-9e4f-1c3947b2ea3d', '9803aefe-b9f5-11ec-bafa-3c2c30cd6fd0', '8b7072e2-871f-11ed-920f-3c2c30cd6fd0', 'a9234aee-871f-11ed-920f-3c2c30cd6fd0', 'de2516be-aa48-11ec-9e4f-1c3947b2ea3d', 'de87d90c-aa48-11ec-9e4f-1c3947b2ea3d', '1028fd42-b9f8-11ec-b51e-3c2c30cd6fd0', 'de37ad74-aa48-11ec-9e4f-1c3947b2ea3d', 'de658ff0-aa48-11ec-9e4f-1c3947b2ea3d', 'c46af740-b9f5-11ec-bafa-3c2c30cd6fd0', '74466fa6-b9f5-11ec-bafa-3c2c30cd6fd0'] +[com/solus-project/budgie-panel/panels/{53a553cc-06e1-11ee-b296-934d0afcb2aa}] +applets=['53ab298c-06e1-11ee-b296-934d0afcb2aa', '542beec8-06e1-11ee-b296-934d0afcb2aa', '542f73a4-06e1-11ee-b296-934d0afcb2aa', '344c99e4-06e2-11ee-b296-934d0afcb2aa', '53f7a2bc-06e1-11ee-b296-934d0afcb2aa', '541d9224-06e1-11ee-b296-934d0afcb2aa'] +enable-shadow=true location='top' -size=35 +size=36 +spacing=2 transparency='none' -[budgie-panel/panels/{f02ed558-871e-11ed-941a-3c2c30cd6fd0}] -applets=['f04fbf0c-871e-11ed-941a-3c2c30cd6fd0', 'f04d4894-871e-11ed-941a-3c2c30cd6fd0', 'f05087b6-871e-11ed-941a-3c2c30cd6fd0', 'f032ab6a-871e-11ed-941a-3c2c30cd6fd0', 'f0371038-871e-11ed-941a-3c2c30cd6fd0', 'f0326eca-871e-11ed-941a-3c2c30cd6fd0', 'f036f850-871e-11ed-941a-3c2c30cd6fd0', 'f02f7da0-871e-11ed-941a-3c2c30cd6fd0', 'f04f227c-871e-11ed-941a-3c2c30cd6fd0', 'f04fa7e2-871e-11ed-941a-3c2c30cd6fd0', 'f04ff7a6-871e-11ed-941a-3c2c30cd6fd0', 'f03913e2-871e-11ed-941a-3c2c30cd6fd0'] -location='top' -size=39 -transparency='none' +[com/solus-project/budgie-wm] +button-layout='appmenu:minimize,maximize,close' +center-windows=false + +[com/solus-project/clock/instance/clock/{4860409c-0657-11ee-8634-7f651fa7eba6}] +show-seconds=true -[budgie-raven] -raven-position='BUDGIE_RAVEN_POSITION_AUTOMATIC' -show-calendar-widget=true -show-mic-input-widget=false -show-mpris-widget=false -show-sound-output-widget=false +[com/solus-project/clock/instance/clock/{542beec8-06e1-11ee-b296-934d0afcb2aa}] +show-date=false +show-seconds=true -[budgie-wm] -attach-modal-dialogs=true +[net/launchpad/plank/docks/dock1] +alignment='center' +auto-pinning=true +current-workspace-only=false +dock-items=['org.gnome.Terminal.dockitem', 'org.gnome.Nautilus.dockitem'] +hide-delay=0 +hide-mode='intelligent' +icon-size=44 +items-alignment='center' +lock-items=true +monitor='' +offset=0 +pinned-only=false +position='bottom' +pressure-reveal=false +show-dock-item=false +theme='Default' +tooltips-enabled=true +unhide-delay=0 +zoom-enabled=true +zoom-percent=130 + +[org/buddiesofbudgie/budgie-desktop/raven/widgets] +initialized=true +uuids=['f0f649c3-3534-484a-a779-2e655654a39f', '36cd7a36-ad64-47ad-8df4-08e300189758', '322248bf-830e-4a7d-9c1a-a96c96393ae6', 'b7126d09-c501-417c-9ed5-520861dbae3a'] + +[org/buddiesofbudgie/budgie-desktop/raven/widgets/instance-info/2ebe2413-cc41-4453-a5ec-45d2b10e405c] +module='org.buddiesofbudgie.budgie-desktop.raven.widget.MediaControls.so' + +[org/buddiesofbudgie/budgie-desktop/raven/widgets/instance-info/2ed6fbf7-c139-4b48-86ef-dc5db9cd29d2] +module='org.buddiesofbudgie.budgie-desktop.raven.widget.SoundOutput.so' + +[org/buddiesofbudgie/budgie-desktop/raven/widgets/instance-info/322248bf-830e-4a7d-9c1a-a96c96393ae6] +module='org.buddiesofbudgie.budgie-desktop.raven.widget.SoundInput.so' + +[org/buddiesofbudgie/budgie-desktop/raven/widgets/instance-info/36cd7a36-ad64-47ad-8df4-08e300189758] +module='org.buddiesofbudgie.budgie-desktop.raven.widget.SoundOutput.so' + +[org/buddiesofbudgie/budgie-desktop/raven/widgets/instance-info/9aacae1d-0ddb-44e1-9738-497332a09000] +module='org.buddiesofbudgie.budgie-desktop.raven.widget.SoundInput.so' + +[org/buddiesofbudgie/budgie-desktop/raven/widgets/instance-info/b7126d09-c501-417c-9ed5-520861dbae3a] +module='org.buddiesofbudgie.budgie-desktop.raven.widget.MediaControls.so' + +[org/buddiesofbudgie/budgie-desktop/raven/widgets/instance-info/bc28e01f-60bb-4c48-802d-ad9b8d2ac0da] +module='org.buddiesofbudgie.budgie-desktop.raven.widget.Calendar.so' + +[org/buddiesofbudgie/budgie-desktop/raven/widgets/instance-info/f0f649c3-3534-484a-a779-2e655654a39f] +module='org.buddiesofbudgie.budgie-desktop.raven.widget.Calendar.so' + +[org/buddiesofbudgie/control-center] +last-panel='power' +window-state=(980, 640, false) + +[org/gnome/desktop/a11y/interface] +high-contrast=false + +[org/gnome/desktop/input-sources] +current=uint32 0 +sources=[('xkb', 'us')] +xkb-options=@as [] + +[org/gnome/desktop/interface] +clock-format='12h' +clock-show-date=false +clock-show-seconds=true +color-scheme='prefer-dark' +cursor-theme='Adwaita' +gtk-theme='Adwaita-dark' +icon-theme='Moka' +show-battery-percentage=false + +[org/gnome/desktop/media-handling] +automount=false +automount-open=false + +[org/gnome/desktop/screensaver] +lock-delay=uint32 0 + +[org/gnome/desktop/session] +idle-delay=uint32 0 + +[org/gnome/desktop/wm/preferences] button-layout='appmenu:minimize,maximize,close' -button-style='traditional' -caffeine-mode=false -center-windows=true +num-workspaces=1 + +[org/gnome/gedit/plugins/filebrowser] +root='file:///' +tree-view=true +virtual-root='file:///home/contestant' + +[org/gnome/gedit/preferences/editor] +highlight-current-line=true +scheme='oblivion' +wrap-last-split-mode='word' + +[org/gnome/gedit/state/window] +bottom-panel-size=140 +side-panel-active-page='GeditWindowDocumentsPanel' +side-panel-size=200 +size=(800, 817) +state=87168 + +[org/gnome/mutter] +edge-tiling=true + +[org/gnome/nautilus/preferences] +default-folder-viewer='icon-view' +migrated-gtk-settings=true +search-filter-time-type='last_modified' + +[org/gnome/nautilus/window-state] +initial-size=(890, 550) + +[org/gnome/settings-daemon/plugins/power] +ambient-enabled=false +idle-dim=false +sleep-inactive-ac-timeout=3600 +sleep-inactive-ac-type='nothing' +sleep-inactive-battery-timeout=1800 +sleep-inactive-battery-type='nothing' + +[org/gnome/settings-daemon/plugins/xsettings] +overrides={'Gtk/ShellShowsAppMenu': <0>, 'Gtk/DecorationLayout': <'menu:minimize,maximize,close'>} + +[org/gtk/gtk4/settings/file-chooser] +show-hidden=false +sort-directories-first=false diff --git a/software-modules/base/03-budgie/setup-desktop.sh b/software-modules/base/03-budgie/setup-desktop.sh old mode 100755 new mode 100644 index c3b83faa..6d6548ff --- a/software-modules/base/03-budgie/setup-desktop.sh +++ b/software-modules/base/03-budgie/setup-desktop.sh @@ -19,7 +19,7 @@ set -xe ## Setup autostart of plank & systembus-notifications mkdir -p ~/.config/autostart/ -cp -r files/autostart/* ~/.config/autostart/ +cp -r /tmp/files/autostart/* ~/.config/autostart/ ## Launch plank (from the monitor script) to create its own config files (plankrm >/dev/null 2>&1 &) @@ -29,24 +29,8 @@ echo -e "[PlankDockItemPreferences]\nLauncher=file:///usr/share/applications/org echo -e "[PlankDockItemPreferences]\nLauncher=file:///usr/share/applications/org.gnome.Nautilus.desktop" >~/.config/plank/dock1/launchers/org.gnome.Nautilus.dockitem dconf load /net/launchpad/plank/docks/