From 93f4d0885909fdc9478fe0346805dc50820c03c7 Mon Sep 17 00:00:00 2001 From: manuel Date: Wed, 20 Mar 2024 11:53:53 -0100 Subject: [PATCH] update python_modules and iso_configs to the new loaded debian and devuan 64 bit isos --- iso_configs/loaded-xfce/Thunar/uca.xml | 24 ++ iso_configs/loaded-xfce/xfce4/helpers.rc | 3 + .../panel/launcher-14/16211853731.desktop | 9 + .../panel/launcher-15/16158061302.desktop | 14 ++ .../panel/launcher-16/16158061493.desktop | 17 ++ .../panel/launcher-17/16158061764.desktop | 9 + .../panel/launcher-17/16158067576.desktop | 13 + .../panel/launcher-17/16158067647.desktop | 17 ++ .../panel/launcher-17/16158067718.desktop | 13 + .../panel/launcher-17/161580678811.desktop | 13 + .../panel/launcher-17/161580681212.desktop | 13 + .../loaded-xfce/xfce4/panel/whiskermenu-7.rc | 83 ++++++ .../loaded-xfce/xfce4/terminal/accels.scm | 58 +++++ .../loaded-xfce/xfce4/terminal/terminalrc | 32 +++ .../xfconf/xfce-perchannel-xml/displays.xml | 51 ++++ .../xfconf/xfce-perchannel-xml/keyboards.xml | 8 + .../xfconf/xfce-perchannel-xml/pointers.xml | 19 ++ .../xfconf/xfce-perchannel-xml/ristretto.xml | 9 + .../xfconf/xfce-perchannel-xml/thunar.xml | 18 ++ .../xfce-perchannel-xml/xfce4-appfinder.xml | 9 + .../xfce-perchannel-xml/xfce4-desktop.xml | 28 +++ .../xfce4-keyboard-shortcuts.xml | 199 +++++++++++++++ .../xfce-perchannel-xml/xfce4-notifyd.xml | 12 + .../xfce-perchannel-xml/xfce4-panel.xml | 111 ++++++++ .../xfce4-power-manager.xml | 13 + .../xfce-perchannel-xml/xfce4-session.xml | 42 ++++ .../xfce4-settings-manager.xml | 8 + .../xfconf/xfce-perchannel-xml/xfwm4.xml | 94 +++++++ .../xfconf/xfce-perchannel-xml/xsettings.xml | 47 ++++ python_modules/build_iso.py | 10 +- python_modules/conf.py | 8 +- python_modules/inflate_bubble.py | 238 +++++------------- python_modules/infra.py | 12 +- 33 files changed, 1062 insertions(+), 192 deletions(-) create mode 100755 iso_configs/loaded-xfce/Thunar/uca.xml create mode 100755 iso_configs/loaded-xfce/xfce4/helpers.rc create mode 100755 iso_configs/loaded-xfce/xfce4/panel/launcher-14/16211853731.desktop create mode 100755 iso_configs/loaded-xfce/xfce4/panel/launcher-15/16158061302.desktop create mode 100755 iso_configs/loaded-xfce/xfce4/panel/launcher-16/16158061493.desktop create mode 100755 iso_configs/loaded-xfce/xfce4/panel/launcher-17/16158061764.desktop create mode 100755 iso_configs/loaded-xfce/xfce4/panel/launcher-17/16158067576.desktop create mode 100755 iso_configs/loaded-xfce/xfce4/panel/launcher-17/16158067647.desktop create mode 100755 iso_configs/loaded-xfce/xfce4/panel/launcher-17/16158067718.desktop create mode 100755 iso_configs/loaded-xfce/xfce4/panel/launcher-17/161580678811.desktop create mode 100755 iso_configs/loaded-xfce/xfce4/panel/launcher-17/161580681212.desktop create mode 100644 iso_configs/loaded-xfce/xfce4/panel/whiskermenu-7.rc create mode 100755 iso_configs/loaded-xfce/xfce4/terminal/accels.scm create mode 100644 iso_configs/loaded-xfce/xfce4/terminal/terminalrc create mode 100644 iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/displays.xml create mode 100644 iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/keyboards.xml create mode 100644 iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/pointers.xml create mode 100644 iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/ristretto.xml create mode 100644 iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/thunar.xml create mode 100644 iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml create mode 100644 iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml create mode 100644 iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml create mode 100644 iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml create mode 100644 iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml create mode 100644 iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml create mode 100644 iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml create mode 100644 iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml create mode 100644 iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml create mode 100644 iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml diff --git a/iso_configs/loaded-xfce/Thunar/uca.xml b/iso_configs/loaded-xfce/Thunar/uca.xml new file mode 100755 index 00000000..a9feff9e --- /dev/null +++ b/iso_configs/loaded-xfce/Thunar/uca.xml @@ -0,0 +1,24 @@ + + + + utilities-terminal + Open terminal Here + 1673812465309246-1 + exo-open --working-directory %f --launch TerminalEmulator + This is used to open a terminal instance at this location + * + + + + + org.xfce.filemanager + Open thunar as root here + + 1673198900020311-6 + pkexec thunar %f + + * + * + + + diff --git a/iso_configs/loaded-xfce/xfce4/helpers.rc b/iso_configs/loaded-xfce/xfce4/helpers.rc new file mode 100755 index 00000000..56433e70 --- /dev/null +++ b/iso_configs/loaded-xfce/xfce4/helpers.rc @@ -0,0 +1,3 @@ +FileManager=thunar +TerminalEmulator=xfce4-terminal + diff --git a/iso_configs/loaded-xfce/xfce4/panel/launcher-14/16211853731.desktop b/iso_configs/loaded-xfce/xfce4/panel/launcher-14/16211853731.desktop new file mode 100755 index 00000000..1d917a7b --- /dev/null +++ b/iso_configs/loaded-xfce/xfce4/panel/launcher-14/16211853731.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Version=1.0 +Name=Peppermint Update +Comment=Simple Update Shortcut +Type=Application +Exec=sudo xDaily +Icon=system-software-update +Terminal=true +StartupNotify=false diff --git a/iso_configs/loaded-xfce/xfce4/panel/launcher-15/16158061302.desktop b/iso_configs/loaded-xfce/xfce4/panel/launcher-15/16158061302.desktop new file mode 100755 index 00000000..b6dd1b52 --- /dev/null +++ b/iso_configs/loaded-xfce/xfce4/panel/launcher-15/16158061302.desktop @@ -0,0 +1,14 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Exec=exo-open --launch FileManager %u +Icon=org.xfce.filemanager +StartupNotify=true +Terminal=false +Categories=Utility;X-XFCE;X-Xfce-Toplevel; +OnlyShowIn=XFCE; +X-XFCE-MimeType=inode/directory;x-scheme-handler/trash; +X-AppStream-Ignore=True +Name=File Manager +Comment=Browse the file system +X-XFCE-Source=file:///usr/share/applications/xfce4-file-manager.desktop diff --git a/iso_configs/loaded-xfce/xfce4/panel/launcher-16/16158061493.desktop b/iso_configs/loaded-xfce/xfce4/panel/launcher-16/16158061493.desktop new file mode 100755 index 00000000..e1a20bd4 --- /dev/null +++ b/iso_configs/loaded-xfce/xfce4/panel/launcher-16/16158061493.desktop @@ -0,0 +1,17 @@ +[Desktop Entry] +Version=1.0 +Name=Xfce Terminal +Comment=Terminal Emulator +GenericName=Terminal Emulator +Exec=xfce4-terminal +Icon=org.xfce.terminal +Terminal=false +Type=Application +Categories=GTK;System;TerminalEmulator; +StartupNotify=true +Actions=preferences; +X-XFCE-Source=file:///usr/share/applications/xfce4-terminal.desktop + +[Desktop Action preferences] +Name=Terminal Preferences +Exec=xfce4-terminal --preferences diff --git a/iso_configs/loaded-xfce/xfce4/panel/launcher-17/16158061764.desktop b/iso_configs/loaded-xfce/xfce4/panel/launcher-17/16158061764.desktop new file mode 100755 index 00000000..bd7eb898 --- /dev/null +++ b/iso_configs/loaded-xfce/xfce4/panel/launcher-17/16158061764.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Name=Peppermint Hub +Comment=This will open the Pep Hub +Exec=hub +Icon=peppermint-hub-128 +Terminal=false +StartupNotify=false diff --git a/iso_configs/loaded-xfce/xfce4/panel/launcher-17/16158067576.desktop b/iso_configs/loaded-xfce/xfce4/panel/launcher-17/16158067576.desktop new file mode 100755 index 00000000..1001eddf --- /dev/null +++ b/iso_configs/loaded-xfce/xfce4/panel/launcher-17/16158067576.desktop @@ -0,0 +1,13 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Exec=xfce4-appfinder --collapsed +Icon=org.xfce.appfinder +StartupNotify=true +Terminal=false +Categories=Utility;X-XFCE;X-Xfce-Toplevel; +OnlyShowIn=XFCE; +Name=Run Program... +Comment=Enter a command you want to launch +Keywords=run;command;application;program;finder;search;launcher;everything;spotlight;sherlock;applesearch;unity dash;krunner;synapse;ulauncher;launchy;gnome do;pie;apwal;recoll;alfred;quicksilver;tracker;beagle;kupfer; +X-XFCE-Source=file:///usr/share/applications/xfce4-run.desktop diff --git a/iso_configs/loaded-xfce/xfce4/panel/launcher-17/16158067647.desktop b/iso_configs/loaded-xfce/xfce4/panel/launcher-17/16158067647.desktop new file mode 100755 index 00000000..7ee64bad --- /dev/null +++ b/iso_configs/loaded-xfce/xfce4/panel/launcher-17/16158067647.desktop @@ -0,0 +1,17 @@ +[Desktop Entry] +Version=1.0 +Name=Power Manager +GenericName=Power Manager +Comment=Settings for the Xfce Power Manager +Exec=xfce4-power-manager-settings +Icon=org.xfce.powermanager +Terminal=false +Type=Application +Categories=XFCE;GTK;Settings;DesktopSettings;X-XFCE-SettingsDialog;X-XFCE-HardwareSettings; +Keywords=settings;preferences;buttons;sleep;hibernate;battery;suspend;shutdown;brightness;laptop lid;lock screen;plugged in;saving;critical; +NotShowIn=GNOME;KDE;Unity; +StartupNotify=true +X-XfcePluggable=true +X-XfceHelpComponent=xfce4-power-manager +X-XfceHelpPage=start +X-XFCE-Source=file:///usr/share/applications/xfce4-power-manager-settings.desktop diff --git a/iso_configs/loaded-xfce/xfce4/panel/launcher-17/16158067718.desktop b/iso_configs/loaded-xfce/xfce4/panel/launcher-17/16158067718.desktop new file mode 100755 index 00000000..e20d6e39 --- /dev/null +++ b/iso_configs/loaded-xfce/xfce4/panel/launcher-17/16158067718.desktop @@ -0,0 +1,13 @@ +[Desktop Entry] +Name=Advanced Network Configuration +Comment=Manage and change your network connection settings +Icon=preferences-system-network +Exec=nm-connection-editor +Terminal=false +StartupNotify=true +Type=Application +X-GNOME-Bugzilla-Bugzilla=GNOME +X-GNOME-Bugzilla-Product=NetworkManager +X-GNOME-Bugzilla-Component=nm-connection-editor +Categories=GNOME;GTK;Settings;X-GNOME-NetworkSettings;X-GNOME-Utilities; +X-XFCE-Source=file:///usr/share/applications/nm-connection-editor.desktop diff --git a/iso_configs/loaded-xfce/xfce4/panel/launcher-17/161580678811.desktop b/iso_configs/loaded-xfce/xfce4/panel/launcher-17/161580678811.desktop new file mode 100755 index 00000000..e3376d21 --- /dev/null +++ b/iso_configs/loaded-xfce/xfce4/panel/launcher-17/161580678811.desktop @@ -0,0 +1,13 @@ +[Desktop Entry] +Name=Text Editor +Comment=Simple Text Editor +GenericName=Text Editor +Exec=mousepad %F +Icon=org.xfce.mousepad +Terminal=false +StartupNotify=true +Type=Application +Categories=Utility;TextEditor;GTK; +MimeType=text/plain; +X-XFCE-Source=file:///usr/share/applications/mousepad.desktop +Path= diff --git a/iso_configs/loaded-xfce/xfce4/panel/launcher-17/161580681212.desktop b/iso_configs/loaded-xfce/xfce4/panel/launcher-17/161580681212.desktop new file mode 100755 index 00000000..80e4c778 --- /dev/null +++ b/iso_configs/loaded-xfce/xfce4/panel/launcher-17/161580681212.desktop @@ -0,0 +1,13 @@ +[Desktop Entry] +Name=Synaptic Package Manager +GenericName=Package Manager +Comment=Install, remove and upgrade software packages +Exec=synaptic-pkexec +Icon=synaptic +Terminal=false +Type=Application +Categories=PackageManager;GTK;System;Settings; +X-Ubuntu-Gettext-Domain=synaptic +StartupNotify=true +StartupWMClass=synaptic +X-XFCE-Source=file:///usr/share/applications/synaptic.desktop diff --git a/iso_configs/loaded-xfce/xfce4/panel/whiskermenu-7.rc b/iso_configs/loaded-xfce/xfce4/panel/whiskermenu-7.rc new file mode 100644 index 00000000..c9f8e3c7 --- /dev/null +++ b/iso_configs/loaded-xfce/xfce4/panel/whiskermenu-7.rc @@ -0,0 +1,83 @@ +favorites=Welcome.desktop,Pephub.desktop +recent= +button-title=Menu +button-icon=org.xfce.panel.whiskermenu +button-single-row=false +show-button-title=true +show-button-icon=false +launcher-show-name=true +launcher-show-description=false +launcher-show-tooltip=true +launcher-icon-size=1 +hover-switch-category=true +category-show-name=true +category-icon-size=1 +sort-categories=true +view-mode=2 +default-category=2 +recent-items-max=10 +favorites-in-recent=true +position-search-alternate=true +position-commands-alternate=true +position-categories-alternate=true +position-categories-horizontal=false +stay-on-focus-out=false +profile-shape=0 +confirm-session-command=true +menu-width=477 +menu-height=566 +menu-opacity=100 +command-settings=xfce4-settings-manager +show-command-settings=true +command-lockscreen=xflock4 +show-command-lockscreen=true +command-switchuser=dm-tool switch-to-greeter +show-command-switchuser=false +command-logoutuser=xfce4-session-logout --logout --fast +show-command-logoutuser=false +command-restart=xfce4-session-logout --reboot --fast +show-command-restart=false +command-shutdown=xfce4-session-logout --halt --fast +show-command-shutdown=false +command-suspend=xfce4-session-logout --suspend +show-command-suspend=false +command-hibernate=xfce4-session-logout --hibernate +show-command-hibernate=false +command-logout=xfce4-session-logout +show-command-logout=true +command-menueditor=menulibre +show-command-menueditor=true +command-profile=mugshot +show-command-profile=true +search-actions=5 + +[action0] +name=Man Pages +pattern=# +command=exo-open --launch TerminalEmulator man %s +regex=false + +[action1] +name=Web Search +pattern=? +command=exo-open --launch WebBrowser https://duckduckgo.com/?q=%u +regex=false + +[action2] +name=Wikipedia +pattern=!w +command=exo-open --launch WebBrowser https://en.wikipedia.org/wiki/%u +regex=false + +[action3] +name=Run in Terminal +pattern=! +command=exo-open --launch TerminalEmulator %s +regex=false + +[action4] +name=Open URI +pattern=^(file|http|https):\\/\\/(.*)$ +command=exo-open \\0 +regex=true + diff --git a/iso_configs/loaded-xfce/xfce4/terminal/accels.scm b/iso_configs/loaded-xfce/xfce4/terminal/accels.scm new file mode 100755 index 00000000..673bbea0 --- /dev/null +++ b/iso_configs/loaded-xfce/xfce4/terminal/accels.scm @@ -0,0 +1,58 @@ +; xfce4-terminal GtkAccelMap rc-file -*- scheme -*- +; this file is an automated accelerator map dump +; +(gtk_accel_path "/terminal-window/goto-tab-2" "2") +(gtk_accel_path "/terminal-window/goto-tab-6" "6") +; (gtk_accel_path "/terminal-window/copy-input" "") +; (gtk_accel_path "/terminal-window/close-other-tabs" "") +; (gtk_accel_path "/terminal-window/move-tab-right" "Page_Down") +(gtk_accel_path "/terminal-window/goto-tab-7" "7") +; (gtk_accel_path "/terminal-window/set-title-color" "") +; (gtk_accel_path "/terminal-window/edit-menu" "") +; (gtk_accel_path "/terminal-window/zoom-menu" "") +(gtk_accel_path "/terminal-window/goto-tab-1" "1") +; (gtk_accel_path "/terminal-window/fullscreen" "F11") +; (gtk_accel_path "/terminal-window/read-only" "") +(gtk_accel_path "/terminal-window/goto-tab-5" "5") +; (gtk_accel_path "/terminal-window/preferences" "") +; (gtk_accel_path "/terminal-window/reset-and-clear" "") +; (gtk_accel_path "/terminal-window/about" "") +(gtk_accel_path "/terminal-window/goto-tab-4" "4") +; (gtk_accel_path "/terminal-window/close-window" "q") +; (gtk_accel_path "/terminal-window/reset" "") +; (gtk_accel_path "/terminal-window/save-contents" "") +(gtk_accel_path "/terminal-window/toggle-menubar" "F10") +; (gtk_accel_path "/terminal-window/copy" "c") +; (gtk_accel_path "/terminal-window/copy-html" "") +; (gtk_accel_path "/terminal-window/last-active-tab" "") +; (gtk_accel_path "/terminal-window/show-borders" "") +; (gtk_accel_path "/terminal-window/view-menu" "") +; (gtk_accel_path "/terminal-window/detach-tab" "d") +; (gtk_accel_path "/terminal-window/scroll-on-output" "") +; (gtk_accel_path "/terminal-window/show-toolbar" "") +; (gtk_accel_path "/terminal-window/next-tab" "Page_Down") +; (gtk_accel_path "/terminal-window/tabs-menu" "") +; (gtk_accel_path "/terminal-window/search-next" "") +; (gtk_accel_path "/terminal-window/search-prev" "") +; (gtk_accel_path "/terminal-window/undo-close-tab" "") +; (gtk_accel_path "/terminal-window/set-title" "s") +; (gtk_accel_path "/terminal-window/contents" "F1") +; (gtk_accel_path "/terminal-window/zoom-reset" "0") +; (gtk_accel_path "/terminal-window/close-tab" "w") +; (gtk_accel_path "/terminal-window/new-tab" "t") +; (gtk_accel_path "/terminal-window/new-window" "n") +; (gtk_accel_path "/terminal-window/terminal-menu" "") +; (gtk_accel_path "/terminal-window/show-menubar" "") +; (gtk_accel_path "/terminal-window/select-all" "a") +; (gtk_accel_path "/terminal-window/paste" "v") +(gtk_accel_path "/terminal-window/goto-tab-9" "9") +; (gtk_accel_path "/terminal-window/move-tab-left" "Page_Up") +; (gtk_accel_path "/terminal-window/search" "f") +; (gtk_accel_path "/terminal-window/file-menu" "") +; (gtk_accel_path "/terminal-window/prev-tab" "Page_Up") +; (gtk_accel_path "/terminal-window/paste-selection" "") +; (gtk_accel_path "/terminal-window/zoom-in" "plus") +; (gtk_accel_path "/terminal-window/zoom-out" "minus") +(gtk_accel_path "/terminal-window/goto-tab-8" "8") +; (gtk_accel_path "/terminal-window/help-menu" "") +(gtk_accel_path "/terminal-window/goto-tab-3" "3") diff --git a/iso_configs/loaded-xfce/xfce4/terminal/terminalrc b/iso_configs/loaded-xfce/xfce4/terminal/terminalrc new file mode 100644 index 00000000..555da9da --- /dev/null +++ b/iso_configs/loaded-xfce/xfce4/terminal/terminalrc @@ -0,0 +1,32 @@ +[Configuration] +MiscAlwaysShowTabs=FALSE +MiscBell=FALSE +MiscBellUrgent=FALSE +MiscBordersDefault=TRUE +MiscCursorBlinks=FALSE +MiscCursorShape=TERMINAL_CURSOR_SHAPE_BLOCK +MiscDefaultGeometry=90x26 +MiscInheritGeometry=FALSE +MiscMenubarDefault=FALSE +MiscMouseAutohide=FALSE +MiscMouseWheelZoom=TRUE +MiscToolbarDefault=FALSE +MiscConfirmClose=TRUE +MiscCycleTabs=TRUE +MiscTabCloseButtons=TRUE +MiscTabCloseMiddleClick=TRUE +MiscTabPosition=GTK_POS_TOP +MiscHighlightUrls=TRUE +MiscMiddleClickOpensUri=FALSE +MiscCopyOnSelect=FALSE +MiscShowRelaunchDialog=TRUE +MiscRewrapOnResize=TRUE +MiscUseShiftArrowsToScroll=FALSE +MiscSlimTabs=FALSE +MiscNewTabAdjacent=FALSE +MiscSearchDialogOpacity=100 +MiscShowUnsafePasteDialog=TRUE +ScrollingBar=TERMINAL_SCROLLBAR_NONE +FontName=Monospace 11 +BackgroundDarkness=0,900000 +MiscRightClickAction=TERMINAL_RIGHT_CLICK_ACTION_CONTEXT_MENU \ No newline at end of file diff --git a/iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/displays.xml b/iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/displays.xml new file mode 100644 index 00000000..9996e58c --- /dev/null +++ b/iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/displays.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/keyboards.xml b/iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/keyboards.xml new file mode 100644 index 00000000..ff9be7ff --- /dev/null +++ b/iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/keyboards.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/pointers.xml b/iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/pointers.xml new file mode 100644 index 00000000..e0bab275 --- /dev/null +++ b/iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/pointers.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/ristretto.xml b/iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/ristretto.xml new file mode 100644 index 00000000..781e4e71 --- /dev/null +++ b/iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/ristretto.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/thunar.xml b/iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/thunar.xml new file mode 100644 index 00000000..4343d9b6 --- /dev/null +++ b/iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/thunar.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml b/iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml new file mode 100644 index 00000000..05599660 --- /dev/null +++ b/iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml new file mode 100644 index 00000000..9dea2baf --- /dev/null +++ b/iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml b/iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml new file mode 100644 index 00000000..317f8a41 --- /dev/null +++ b/iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml @@ -0,0 +1,199 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml b/iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml new file mode 100644 index 00000000..7f16d299 --- /dev/null +++ b/iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml new file mode 100644 index 00000000..7b3b2003 --- /dev/null +++ b/iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml b/iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml new file mode 100644 index 00000000..c0ba8ed4 --- /dev/null +++ b/iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml b/iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml new file mode 100644 index 00000000..83463638 --- /dev/null +++ b/iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml b/iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml new file mode 100644 index 00000000..d058283d --- /dev/null +++ b/iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml b/iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml new file mode 100644 index 00000000..c8552039 --- /dev/null +++ b/iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml new file mode 100644 index 00000000..1d2b924e --- /dev/null +++ b/iso_configs/loaded-xfce/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/python_modules/build_iso.py b/python_modules/build_iso.py index 93dd3923..d349cd56 100644 --- a/python_modules/build_iso.py +++ b/python_modules/build_iso.py @@ -189,7 +189,7 @@ class BuildOpenbox(BuildBase): return cmd_list -class BuildLoadedxfce(BuildBase): +class BuildLoaded(BuildBase): """ This class will ensure the loaded xfce builds are built """ def __init__(self, sbase, sarch): """ @@ -197,9 +197,9 @@ class BuildLoadedxfce(BuildBase): ensure that the method resolution order (MRO) is followed correctly, allowing for a smooth inheritance hierarchy """ - super().__init__(sbase, sarch, self.opb_helper) + super().__init__(sbase, sarch, self.loaded_helper) - def opb_helper(self): + def loaded_helper(self): """ The helper functions to ensure the loaded xfce requirements are used @@ -210,7 +210,7 @@ class BuildLoadedxfce(BuildBase): if arch_suffix in ["64"]: os.system(f'touch {self.sbase.upper()}.{arch_suffix}loadxf') if arch_suffix in ["64"]: - cmd_list = getattr(conf, f"build{arch_suffix}_loaded_xfce_build", []) + cmd_list = getattr(conf, f"build{arch_suffix}_loaded_build", []) for command in cmd_list: execute = command + '()' exec(execute) @@ -344,7 +344,7 @@ class Decsions: if build_argument in build_type_mapping: pass readybuild() - BuildLoadedxfce(*build_type_mapping[build_argument]) + BuildLoaded(*build_type_mapping[build_argument]) else: logger.critical("You have not specified a build to process!") diff --git a/python_modules/conf.py b/python_modules/conf.py index 6409df63..642780ef 100644 --- a/python_modules/conf.py +++ b/python_modules/conf.py @@ -38,8 +38,8 @@ setup_gfb_cmds = ('inflate_bubble.set_gfb', setup_opb_cmds = ('inflate_bubble.set_opb', 'infra.open_box_configs' ) -setup_loadedxf_cmds = ('inflate_bubble.set_loaded_xfce', - 'infra.open_loaded_xfce_configs' +setup_loaded_cmds = ('inflate_bubble.set_loaded', + 'infra.loaded_configs' ) @@ -108,7 +108,7 @@ buildarm_opb_build = (shared_setup_cmds + setup_opb_cmds + ) #Xfce_loaded -build64_loadedxf_build = (shared_setup_cmds + setup_loadedxf_cmds + +build64_loaded_build = (shared_setup_cmds + setup_loaded_cmds + setup_chroot_grub_64 + setup_binary_grub_64 + setup_fw_64_32 ) @@ -182,7 +182,7 @@ OPENBOX_LIST = ('openbox\n' 'qt5ct\n' 'jgmenu\n' ) -LOADED_XFCE_LIST = ('xfce4\n' +LOADED_LIST = ('xfce4\n' 'xfce4-goodies\n' 'xorg\n' 'xserver-xorg\n' diff --git a/python_modules/inflate_bubble.py b/python_modules/inflate_bubble.py index 2c7844e0..046553b7 100644 --- a/python_modules/inflate_bubble.py +++ b/python_modules/inflate_bubble.py @@ -1,184 +1,68 @@ -""" -* Author: "PeppermintOS Team(peppermintosteam@proton.me) -* -* License: SPDX-License-Identifier: GPL-3.0-or-later -* -* These functions will build the base of the fusato build folders -* As well as commonly used functions -""" +# SPDX-License-Identifier: GPL-3.0-or-later +# +# SPDX-FileCopyrightText: 2023 PeppermintOS Team (peppermintosteam@proton.me) -import os -from pathlib import Path -import conf +# This Make file is used to execute the different parts if the bubble system +# by running for example deb64 will chain execute copy_fls, copy_flders and +# inflate to build an ISO . To begin a fresh skeleton, you need to run only +# fresh...after that. As build sare release for publication you can run nightly +# or release to move the files to your web server location the +# run the build you need. +# None of these steps need to run as root all this can be ran ad a normal user +PY_PATH = ~/bubbles/python_modules -# Set the home path used regardless the user logged in -BSTRING_ISO_CONFIGS = '~/bubbles/iso_configs' -HOME_FOLDER = str(Path(BSTRING_ISO_CONFIGS).expanduser()) -PACKAGE_LIST = "fusato/config/package-lists/" -CHROOT_FOLDER = "fusato/config/includes.chroot/" -BOOTSTRAP_FOLDER = 'fusato/config/includes.bootstrap/' -FUSATO_ROOT = 'fusato' +## 64 bit ISOs -# Fusato base -def set_fusato_structure(): - """ Make some needed folders for the fustao build process. - at the moment you deal with chroot and bootstrap - """ - make_chroot = ['usr/share/distro-info/', - 'usr/share/python-apt/templates/', - 'usr/share/icons/default', - 'usr/share/peppermint/', - 'usr/share/themes/', - 'usr/local/bin/', - 'usr/bin/', - 'usr/sbin', - 'etc/lightdm', - 'etc/default', - 'etc/apt', - 'etc/apt/preferences.d', - 'etc/apt/sources.list.d', - 'etc/skel/Desktop', - 'etc/skel/.local/share', - 'etc/skel/.config/autostart/', - 'etc/lightdm/lightdm.conf.d/', - 'usr/share/peppermint/pep_id/', - ] - os.chdir(os.path.join(HOME_FOLDER, FUSATO_ROOT)) - if os.path.exists('config'): - rm_cmd = "sudo rm -r -f config" - os.system(rm_cmd) - os.makedirs('config') +dev64xfce: + python3 ${PY_PATH}/build_iso.py set e-xfce b-dev64 +deb64xfce: + python3 ${PY_PATH}/build_iso.py set e-xfce b-deb64 +deb64gfb: + python3 ${PY_PATH}/build_iso.py set e-gnomefb b-deb64 +dev64gfb: + python3 ${PY_PATH}/build_iso.py set e-gnomefb b-dev64 +deb64opb: + python3 ${PY_PATH}/build_iso.py set e-openbox b-deb64 +dev64opb: + python3 ${PY_PATH}/build_iso.py set e-openbox b-dev64 +deb64loadxf: + python3 ${PY_PATH}/build_iso.py set e-loadxf b-deb64 +dev64loadxf: + python3 ${PY_PATH}/build_iso.py set e-loadxf b-dev64 +## 32 bit ISOs +deb32xfce: + python3 ${PY_PATH}/build_iso.py set e-xfce b-deb32 +dev32xfce: + python3 ${PY_PATH}/build_iso.py set e-xfce b-dev32 +deb32gfb: + python3 ${PY_PATH}/build_iso.py set e-gnomefb b-deb32 +dev32gfb: + python3 ${PY_PATH}/build_iso.py set e-gnomefb b-dev32 +deb32opb: + python3 ${PY_PATH}/build_iso.py set e-openbox b-deb32 +dev32opb: + python3 ${PY_PATH}/build_iso.py set e-openbox b-dev32 - make_bootstrap = ['etc/apt'] - make_packages = ['package-lists/'] - make_chfldrs = make_chroot - for f_f in make_chfldrs: - os.makedirs(os.path.join(HOME_FOLDER, CHROOT_FOLDER, f_f)) - for f_f in make_bootstrap: - os.makedirs(os.path.join(HOME_FOLDER, BOOTSTRAP_FOLDER, f_f)) - for f_f in make_packages: - os.makedirs(os.path.join(HOME_FOLDER,PACKAGE_LIST, f_f)) +## arm ISOs +debarmxfce: + python3 ${PY_PATH}/build_iso.py set e-xfce b-debarm +devarmxfce: + python3 ${PY_PATH}/build_iso.py set e-xfce b-devarm +debarmgfb: + python3 ${PY_PATH}/build_iso.py set e-gnomefb b-debarm +devarmgfb: + python3 ${PY_PATH}/build_iso.py set e-gnomefb b-devarm +debarmopb: + python3 ${PY_PATH}/build_iso.py set e-openbox b-debarm +devarmopb: + python3 ${PY_PATH}/build_iso.py set e-openbox b-devarm + +release: + python3 ${PY_PATH}/release.py - -# Commonly Shared -def make_build_file(base, arch, extension, build_description): - """ - This will get the base, arch, extension, and build, to write the file - """ - file_path = os.path.join(os.path.expanduser(HOME_FOLDER), FUSATO_ROOT, - f'{base}.{arch}{extension}' - ) - with open(file_path, 'w', encoding='UTF-8') as f_p: - f_p.write(build_description) - - -def make_bld_xfce(base,arch): - """Write the xfce build file""" - make_build_file(base, arch, 'xfc', 'XFCE Build') - - -def make_bld_gnomeflashback(base,arch): - """Write the gnome fb build file""" - make_build_file(base, arch, 'gfb', 'Gnome Flash Back Build') - - -def make_bld_openbox(base,arch): - """Write the openbox build file""" - make_build_file(base, arch, 'opb', 'OpenBox Build') - - -def make_bld_loaded(base,arch): - """Write the loaded build file""" - make_build_file(base, arch, 'loaded', 'Loaded xfce Build') - -# Make the shared package lists files -def make_package_list(file_name, content, mode='a'): - """Create the package list file with the specified content""" - with open(os.path.join(HOME_FOLDER, PACKAGE_LIST, file_name), mode, - encoding='UTF-8') as f_p: - f_p.write(content) - - -def set_general_shared(): - """ Create the list for general shared list""" - make_package_list('genshared.list.chroot', conf.GENERAL_SHARED_LIST, mode='x') - - -def set_grub_shared(): - """ Create the list for shared grub list""" - make_package_list('grub.list.chroot', conf.GRUB_LIST_SHARED, mode='x') - - -def set_binary_shared(): - """ Create the shared list for grub binary""" - make_package_list('installer.list.binary', conf.BINARY_LIST_SHARED, mode='x') - - -# Light DM paklage list login window -def set_lightdm(): - """ Create the list for the light dm list """ - make_package_list('lightdm.list.chroot', conf.LIGHT_DM_LIST, mode='x') - - -# Desktop Environments -def set_xfce(): - """ Create the list for the xfce xfce list""" - make_package_list('xfce.list.chroot', conf.XFCE_LIST, mode='x') - - -def set_gfb(): - """ Create the list for the gnomeflashback list""" - make_package_list('gfb.list.chroot', conf.GNOME_FLASHBACK_LIST, mode='x') - -def set_opb(): - """ Create the list for the openbox list""" - make_package_list('opb.list.chroot', conf.OPENBOX_LIST, mode='x') - -def set_loaded(): - """ Create the list for the loaded list""" - make_package_list('loaded.list.chroot', conf.LOADED_LIST, mode='x') - - -# CHROOT Specific -def set_chroot_grub_64(): - """ Append the grub list for 64 bit grub""" - make_package_list('gfb.list.chroot', conf.GRUB_LIST_64) - - -def set_chroot_grub_arm(): - """ Append the grub list for the ARM grub""" - make_package_list('gfb.list.chroot', conf.GRUB_LIST_ARM64) - - -def set_chroot_grub_32(): - """ Append the grub list for the 32 bit grub""" - make_package_list('gfb.list.chroot', conf.GRUB_LIST_32) - - -# Binary Specific -def set_binary_64(): - """ Create the list for grub binary packages for 64 bit""" - make_package_list('installer.list.binary', conf.BINARY_LIST_64) - - -def set_binary_arm(): - """ Create the list for grub binary packages for 64 bit""" - make_package_list('installer.list.binary', conf.BINARY_LIST_ARM) - - -def set_binary_32(): - """ Create the list for grub binary packages for 32 bit""" - make_package_list('installer.list.binary', conf.BINARY_LIST_32) - - -# Firmware Specific -def set_firmware(): - """ Create the list for the firmware support for genral ISOs""" - make_package_list('firmware.list.chroot', conf.FIRMWARE_LIST_32_64, mode='x') - - -def set_firmware_arm(): - """ Create the list for the firmware support for arm ISOs""" - make_package_list('firmware.list.chroot', conf.FIRMWARE_LIST_ARM, mode='x') +# run this to start with a blank shell for +# config folders/ +fresh: + python3 ${PY_PATH}/fresh_bubble.py diff --git a/python_modules/infra.py b/python_modules/infra.py index 36af7ccc..c2947441 100644 --- a/python_modules/infra.py +++ b/python_modules/infra.py @@ -341,7 +341,7 @@ def shared_files(): '/lightdm/lightdm-gtk-greeter.conf', '/plymouth/plymouthd.conf', #'/packages/deb-multimedia-keyring_2016.8.1_all.deb', - #'/repo_public_key/trusted.gpg', +# '/repo_public_key/trusted.gpg', ) @@ -474,16 +474,16 @@ def open_box_configs(): logger.info(MSG_FIN + HOME_FOLDER + WPCHROOT + des_ob) -def loaded_xfce_configs(): +def loaded_configs(): """ Copy the loaded xfce files - """ + """# logger.info("Copy loaded xfce configs") - src_ob = '/loaded-xfce' - des_ob = '/etc/skel/' + src_loaded = '/loaded-xfce' + des_loaded = '/etc/skel/.config/' logger.info("INFO: Copying - " + HOME_FOLDER + src_loaded) - shutil.copytree(HOME_FOLDER + src_ob, + shutil.copytree(HOME_FOLDER + src_loaded, HOME_FOLDER + WPCHROOT + des_loaded, dirs_exist_ok = True )