Skip to content

Commit

Permalink
Migrating 2nd and 3rd layer to debian 12
Browse files Browse the repository at this point in the history
  • Loading branch information
DT3264 committed Jun 27, 2023
1 parent 530d432 commit 1ef965e
Show file tree
Hide file tree
Showing 5 changed files with 425 additions and 276 deletions.
3 changes: 1 addition & 2 deletions software-modules/base/02-firmware/dependencies.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ firmware-bnx2x
firmware-brcm80211
firmware-cavium
firmware-intel-sound
firmware-intelwimax
firmware-ipw2x00
firmware-ivtv
firmware-iwlwifi
Expand Down Expand Up @@ -46,4 +45,4 @@ pulseaudio-module-gsettings
sigrok-firmware-fx2lafw
ubertooth-firmware
vulkan-tools
vulkan-validationlayers:amd64
vulkan-validationlayers:amd64
72 changes: 25 additions & 47 deletions software-modules/base/03-budgie/budgie.sh
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -30,26 +30,6 @@ rm -rf /usr/share/lightdm/*
rm -rf /usr/share/images/desktop-base/*
rm /usr/share/xsessions/budgie-desktop.desktop

## Replace debian logo branding with huronOS
rm -rf /usr/share/wallpapers/
rm -rf /usr/share/icons/desktop-base/*
rm -rf /usr/share/desktop-base/
rm -rf /usr/share/plymouth/
rm -rf /usr/share/pixmaps/debian*
cp -rf files/vendor/* /usr/share/icons/desktop-base
ln -sf /usr/share/icons/desktop-base/scalable/emblems/emblem-huronos.svg /etc/alternatives/emblem-vendor-scalable
ln -sf /usr/share/icons/desktop-base/scalable/emblems/emblem-huronos-symbolic.svg /etc/alternatives/emblem-vendor-symbolic-scalable
ln -sf /usr/share/icons/desktop-base/scalable/emblems/emblem-huronos-white.svg /etc/alternatives/emblem-vendor-white-scalable
ln -sf /usr/share/icons/desktop-base/64/emblems/emblem-huronos.png /etc/alternatives/emblem-vendor-64
ln -sf /usr/share/icons/desktop-base/64/emblems/emblem-huronos-symbolic.png /etc/alternatives/emblem-vendor-symbolic-64
ln -sf /usr/share/icons/desktop-base/64/emblems/emblem-huronos-white.png /etc/alternatives/emblem-vendor-white-64
ln -sf /usr/share/icons/desktop-base/128/emblems/emblem-huronos.png /etc/alternatives/emblem-vendor-128
ln -sf /usr/share/icons/desktop-base/128/emblems/emblem-huronos-symbolic.png /etc/alternatives/emblem-vendor-symbolic-128
ln -sf /usr/share/icons/desktop-base/128/emblems/emblem-huronos-white.png /etc/alternatives/emblem-vendor-white-128
ln -sf /usr/share/icons/desktop-base/256/emblems/emblem-huronos.png /etc/alternatives/emblem-vendor-256
ln -sf /usr/share/icons/desktop-base/256/emblems/emblem-huronos-symbolic.png /etc/alternatives/emblem-vendor-symbolic-256
ln -sf /usr/share/icons/desktop-base/256/emblems/emblem-huronos-white.png /etc/alternatives/emblem-vendor-white-256

## Fix terminals not updating $PATH on su
echo "ALWAYS_SET_PATH yes" >>/etc/login.defs

Expand All @@ -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/
Expand All @@ -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
Expand All @@ -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
Expand Down
221 changes: 221 additions & 0 deletions software-modules/base/03-budgie/files/huronOS-desktop-config.conf
Original file line number Diff line number Diff line change
@@ -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
Loading

0 comments on commit 1ef965e

Please sign in to comment.