From 66ca607696d10486c27270b2c9fd0066e73bbb9f Mon Sep 17 00:00:00 2001 From: Alexander Tratsevskiy Date: Sun, 26 Mar 2023 22:58:17 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D1=87=D0=B8=D1=89=D0=B5=D0=BD?= =?UTF-8?q?=D1=8B=20=D1=88=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD=D1=8B,=20=D1=83?= =?UTF-8?q?=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=BF=D0=BE=D0=BA=D0=B0?= =?UTF-8?q?=20=D0=BD=D0=B5=20=D0=BF=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=B6?= =?UTF-8?q?=D0=B8=D0=B2=D0=B0=D0=B5=D0=BC=D1=8B=D0=B5=20=D0=BF=D1=80=D0=BE?= =?UTF-8?q?=D1=84=D0=B8=D0=BB=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- profiles/profiles.desc | 2 - .../2_ac_install_merge/.calculate_directory | 1 - .../x11-themes/.calculate_directory | 1 - .../adwaita-icon-theme/.calculate_directory | 1 - .../2-user/.calculate_directory | 1 - .../2-user/games-util/.calculate_directory | 1 - .../6_ac_desktop_profile/README-eng.txt | 8 --- .../6_ac_desktop_profile/README-rus.txt | 8 --- .../6_ac_update_sync/.calculate_directory | 1 - .../templates/6_ac_update_sync/README-eng.txt | 7 -- .../templates/6_ac_update_sync/README-rus.txt | 7 -- .../remerge/.calculate_directory | 1 - .../templates/6_ac_update_sync/remerge/0-ini | 5 -- .../remerge/2018/.calculate_directory | 1 - .../6_ac_update_sync/remerge/2018/20180209 | 4 -- .../remerge/2021/.calculate_directory | 1 - .../6_ac_update_sync/remerge/2021/20210212 | 4 -- .../revision/.calculate_directory | 1 - .../revision/2021/.calculate_directory | 1 - .../revision/2021/20211015-fix_filecaps | 9 --- .../world/.calculate_directory | 1 - .../templates/6_ac_update_sync/world/0-ini | 4 -- .../world/create/.calculate_directory | 1 - .../world/create/applications | 9 --- .../6_ac_update_sync/world/create/base | 17 ----- .../6_ac_update_sync/world/create/decoration | 22 ------ .../6_ac_update_sync/world/create/games | 9 --- .../6_ac_update_sync/world/create/graphics | 7 -- .../6_ac_update_sync/world/create/multimedia | 14 ---- .../6_ac_update_sync/world/create/netapps | 17 ----- .../6_ac_update_sync/world/create/network | 13 ---- .../6_ac_update_sync/world/create/printer | 13 ---- .../6_ac_update_sync/world/create/taiga | 10 --- .../6_ac_update_sync/world/create/tools | 67 ------------------- .../6_ac_update_sync/world/create/xfce | 30 --------- .../6_ac_update_sync/world/create/xorg | 18 ----- .../world/update/.calculate_directory | 1 - .../world/update/2018/.calculate_directory | 1 - .../world/update/2018/20180703 | 8 --- .../world/update/2021/.calculate_directory | 1 - .../world/update/2021/20210423 | 7 -- .../world/update/2021/20210927 | 7 -- profiles/templates/steam/.calculate_directory | 1 + .../adwaita-icon-theme/.calculate_directory | 1 + .../org.xfce.panel.applicationsmenu.svg | 0 .../places/.calculate_directory | 0 .../places/128/distributor-logo-xfce.svg | 0 .../places/128/distributor-logo.svg | 0 .../128/org.xfce.panel.applicationsmenu.svg | 0 .../places/128/start-calculate.svg | 0 .../places/128/start-here.svg | 0 .../adwaita-icon-theme/places/128/start.svg | 0 .../places/16/distributor-logo-xfce.svg | 0 .../places/16/distributor-logo.svg | 0 .../16/org.xfce.panel.applicationsmenu.svg | 0 .../places/16/start-calculate.svg | 0 .../places/16/start-here.svg | 0 .../adwaita-icon-theme/places/16/start.svg | 0 .../places/22/distributor-logo-xfce.svg | 0 .../places/22/distributor-logo.svg | 0 .../places/22/folder-download.svg | 0 .../places/22/folder-remote.svg | 0 .../22/org.xfce.panel.applicationsmenu.svg | 0 .../places/22/start-calculate.svg | 0 .../places/22/start-here.svg | 0 .../adwaita-icon-theme/places/22/start.svg | 0 .../places/22/user-home.svg | 0 .../places/24/distributor-logo-xfce.svg | 0 .../places/24/distributor-logo.svg | 0 .../places/24/folder-download.svg | 0 .../places/24/folder-remote.svg | 0 .../24/org.xfce.panel.applicationsmenu.svg | 0 .../places/24/start-calculate.svg | 0 .../places/24/start-here.svg | 0 .../adwaita-icon-theme/places/24/start.svg | 0 .../places/24/user-home.svg | 0 .../places/48/distributor-logo-xfce.svg | 0 .../places/48/distributor-logo.svg | 0 .../48/org.xfce.panel.applicationsmenu.svg | 0 .../places/48/start-calculate.svg | 0 .../places/48/start-here.svg | 0 .../adwaita-icon-theme/places/48/start.svg | 0 .../places/64/distributor-logo-xfce.svg | 0 .../places/64/distributor-logo.svg | 0 .../64/org.xfce.panel.applicationsmenu.svg | 0 .../places/64/start-calculate.svg | 0 .../places/64/start-here.svg | 0 .../adwaita-icon-theme/places/64/start.svg | 0 .../adwaita-icon-theme/start-here.svg | 0 .../adwaita-icon-theme/start.svg | 0 .../desktop}/.calculate_directory | 2 +- .../desktop}/Steam-1.0/.calculate/ini.env | 0 .../desktop}/Steam-1.0/.calculate_directory | 0 .../.config/menus/xfce-applications.menu | 0 .../Steam-1.0/.config/mousepad/mousepadrc | 0 .../.config/xfce4/xfce4-screenshooter | 0 .../xfconf/xfce-perchannel-xml/keyboards.xml | 0 .../xfconf/xfce-perchannel-xml/pointers.xml | 0 .../xfce-perchannel-xml/xfce4-notifyd.xml | 0 .../xfce-perchannel-xml/xfce4-panel.xml | 0 .../xfconf/xfce-perchannel-xml/xfwm4.xml | 0 .../.local/share/applications/Thunar.desktop | 0 .../xfce-keyboard-settings.desktop | 0 .../share/applications/xfce4-about.desktop | 0 .../share/applications/xfce4-run.desktop | 0 .../applications/xfce4-taskmanager.desktop | 0 .../xfce-accessories.directory | 0 .../xfce-multimedia.directory | 0 .../xfce-network.directory | 0 .../desktop}/Steam-1.0/.steam/registry.vdf | 0 .../desktop}/Steam-1.0/.xsession | 0 profiles/templates/steam/world | 28 ++++++++ profiles/templates/taiga/world | 8 +++ scripts/taiga/config.sh | 7 +- 114 files changed, 42 insertions(+), 347 deletions(-) delete mode 100644 profiles/templates/2_ac_install_merge/.calculate_directory delete mode 100644 profiles/templates/2_ac_install_merge/x11-themes/.calculate_directory delete mode 100644 profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/.calculate_directory delete mode 100644 profiles/templates/6_ac_desktop_profile/2-user/.calculate_directory delete mode 100644 profiles/templates/6_ac_desktop_profile/2-user/games-util/.calculate_directory delete mode 100644 profiles/templates/6_ac_desktop_profile/README-eng.txt delete mode 100644 profiles/templates/6_ac_desktop_profile/README-rus.txt delete mode 100644 profiles/templates/6_ac_update_sync/.calculate_directory delete mode 100644 profiles/templates/6_ac_update_sync/README-eng.txt delete mode 100644 profiles/templates/6_ac_update_sync/README-rus.txt delete mode 100644 profiles/templates/6_ac_update_sync/remerge/.calculate_directory delete mode 100644 profiles/templates/6_ac_update_sync/remerge/0-ini delete mode 100644 profiles/templates/6_ac_update_sync/remerge/2018/.calculate_directory delete mode 100644 profiles/templates/6_ac_update_sync/remerge/2018/20180209 delete mode 100644 profiles/templates/6_ac_update_sync/remerge/2021/.calculate_directory delete mode 100644 profiles/templates/6_ac_update_sync/remerge/2021/20210212 delete mode 100644 profiles/templates/6_ac_update_sync/revision/.calculate_directory delete mode 100644 profiles/templates/6_ac_update_sync/revision/2021/.calculate_directory delete mode 100644 profiles/templates/6_ac_update_sync/revision/2021/20211015-fix_filecaps delete mode 100644 profiles/templates/6_ac_update_sync/world/.calculate_directory delete mode 100644 profiles/templates/6_ac_update_sync/world/0-ini delete mode 100644 profiles/templates/6_ac_update_sync/world/create/.calculate_directory delete mode 100644 profiles/templates/6_ac_update_sync/world/create/applications delete mode 100644 profiles/templates/6_ac_update_sync/world/create/base delete mode 100644 profiles/templates/6_ac_update_sync/world/create/decoration delete mode 100644 profiles/templates/6_ac_update_sync/world/create/games delete mode 100644 profiles/templates/6_ac_update_sync/world/create/graphics delete mode 100644 profiles/templates/6_ac_update_sync/world/create/multimedia delete mode 100644 profiles/templates/6_ac_update_sync/world/create/netapps delete mode 100644 profiles/templates/6_ac_update_sync/world/create/network delete mode 100644 profiles/templates/6_ac_update_sync/world/create/printer delete mode 100644 profiles/templates/6_ac_update_sync/world/create/taiga delete mode 100644 profiles/templates/6_ac_update_sync/world/create/tools delete mode 100644 profiles/templates/6_ac_update_sync/world/create/xfce delete mode 100644 profiles/templates/6_ac_update_sync/world/create/xorg delete mode 100644 profiles/templates/6_ac_update_sync/world/update/.calculate_directory delete mode 100644 profiles/templates/6_ac_update_sync/world/update/2018/.calculate_directory delete mode 100644 profiles/templates/6_ac_update_sync/world/update/2018/20180703 delete mode 100644 profiles/templates/6_ac_update_sync/world/update/2021/.calculate_directory delete mode 100644 profiles/templates/6_ac_update_sync/world/update/2021/20210423 delete mode 100644 profiles/templates/6_ac_update_sync/world/update/2021/20210927 create mode 100644 profiles/templates/steam/.calculate_directory create mode 100644 profiles/templates/steam/adwaita-icon-theme/.calculate_directory rename profiles/templates/{2_ac_install_merge/x11-themes => steam}/adwaita-icon-theme/org.xfce.panel.applicationsmenu.svg (100%) rename profiles/templates/{2_ac_install_merge/x11-themes => steam}/adwaita-icon-theme/places/.calculate_directory (100%) rename profiles/templates/{2_ac_install_merge/x11-themes => steam}/adwaita-icon-theme/places/128/distributor-logo-xfce.svg (100%) rename profiles/templates/{2_ac_install_merge/x11-themes => steam}/adwaita-icon-theme/places/128/distributor-logo.svg (100%) rename profiles/templates/{2_ac_install_merge/x11-themes => steam}/adwaita-icon-theme/places/128/org.xfce.panel.applicationsmenu.svg (100%) rename profiles/templates/{2_ac_install_merge/x11-themes => steam}/adwaita-icon-theme/places/128/start-calculate.svg (100%) rename profiles/templates/{2_ac_install_merge/x11-themes => steam}/adwaita-icon-theme/places/128/start-here.svg (100%) rename profiles/templates/{2_ac_install_merge/x11-themes => steam}/adwaita-icon-theme/places/128/start.svg (100%) rename profiles/templates/{2_ac_install_merge/x11-themes => steam}/adwaita-icon-theme/places/16/distributor-logo-xfce.svg (100%) rename profiles/templates/{2_ac_install_merge/x11-themes => steam}/adwaita-icon-theme/places/16/distributor-logo.svg (100%) rename profiles/templates/{2_ac_install_merge/x11-themes => steam}/adwaita-icon-theme/places/16/org.xfce.panel.applicationsmenu.svg (100%) rename profiles/templates/{2_ac_install_merge/x11-themes => steam}/adwaita-icon-theme/places/16/start-calculate.svg (100%) rename profiles/templates/{2_ac_install_merge/x11-themes => steam}/adwaita-icon-theme/places/16/start-here.svg (100%) rename profiles/templates/{2_ac_install_merge/x11-themes => steam}/adwaita-icon-theme/places/16/start.svg (100%) rename profiles/templates/{2_ac_install_merge/x11-themes => steam}/adwaita-icon-theme/places/22/distributor-logo-xfce.svg (100%) rename profiles/templates/{2_ac_install_merge/x11-themes => steam}/adwaita-icon-theme/places/22/distributor-logo.svg (100%) rename profiles/templates/{2_ac_install_merge/x11-themes => steam}/adwaita-icon-theme/places/22/folder-download.svg (100%) rename profiles/templates/{2_ac_install_merge/x11-themes => steam}/adwaita-icon-theme/places/22/folder-remote.svg (100%) rename profiles/templates/{2_ac_install_merge/x11-themes => steam}/adwaita-icon-theme/places/22/org.xfce.panel.applicationsmenu.svg (100%) rename profiles/templates/{2_ac_install_merge/x11-themes => steam}/adwaita-icon-theme/places/22/start-calculate.svg (100%) rename profiles/templates/{2_ac_install_merge/x11-themes => steam}/adwaita-icon-theme/places/22/start-here.svg (100%) rename profiles/templates/{2_ac_install_merge/x11-themes => steam}/adwaita-icon-theme/places/22/start.svg (100%) rename profiles/templates/{2_ac_install_merge/x11-themes => steam}/adwaita-icon-theme/places/22/user-home.svg (100%) rename profiles/templates/{2_ac_install_merge/x11-themes => steam}/adwaita-icon-theme/places/24/distributor-logo-xfce.svg (100%) rename profiles/templates/{2_ac_install_merge/x11-themes => steam}/adwaita-icon-theme/places/24/distributor-logo.svg (100%) rename profiles/templates/{2_ac_install_merge/x11-themes => steam}/adwaita-icon-theme/places/24/folder-download.svg (100%) rename profiles/templates/{2_ac_install_merge/x11-themes => steam}/adwaita-icon-theme/places/24/folder-remote.svg (100%) rename profiles/templates/{2_ac_install_merge/x11-themes => steam}/adwaita-icon-theme/places/24/org.xfce.panel.applicationsmenu.svg (100%) rename profiles/templates/{2_ac_install_merge/x11-themes => steam}/adwaita-icon-theme/places/24/start-calculate.svg (100%) rename profiles/templates/{2_ac_install_merge/x11-themes => steam}/adwaita-icon-theme/places/24/start-here.svg (100%) rename profiles/templates/{2_ac_install_merge/x11-themes => steam}/adwaita-icon-theme/places/24/start.svg (100%) rename profiles/templates/{2_ac_install_merge/x11-themes => steam}/adwaita-icon-theme/places/24/user-home.svg (100%) rename profiles/templates/{2_ac_install_merge/x11-themes => steam}/adwaita-icon-theme/places/48/distributor-logo-xfce.svg (100%) rename profiles/templates/{2_ac_install_merge/x11-themes => steam}/adwaita-icon-theme/places/48/distributor-logo.svg (100%) rename profiles/templates/{2_ac_install_merge/x11-themes => steam}/adwaita-icon-theme/places/48/org.xfce.panel.applicationsmenu.svg (100%) rename profiles/templates/{2_ac_install_merge/x11-themes => steam}/adwaita-icon-theme/places/48/start-calculate.svg (100%) rename profiles/templates/{2_ac_install_merge/x11-themes => steam}/adwaita-icon-theme/places/48/start-here.svg (100%) rename profiles/templates/{2_ac_install_merge/x11-themes => steam}/adwaita-icon-theme/places/48/start.svg (100%) rename profiles/templates/{2_ac_install_merge/x11-themes => steam}/adwaita-icon-theme/places/64/distributor-logo-xfce.svg (100%) rename profiles/templates/{2_ac_install_merge/x11-themes => steam}/adwaita-icon-theme/places/64/distributor-logo.svg (100%) rename profiles/templates/{2_ac_install_merge/x11-themes => steam}/adwaita-icon-theme/places/64/org.xfce.panel.applicationsmenu.svg (100%) rename profiles/templates/{2_ac_install_merge/x11-themes => steam}/adwaita-icon-theme/places/64/start-calculate.svg (100%) rename profiles/templates/{2_ac_install_merge/x11-themes => steam}/adwaita-icon-theme/places/64/start-here.svg (100%) rename profiles/templates/{2_ac_install_merge/x11-themes => steam}/adwaita-icon-theme/places/64/start.svg (100%) rename profiles/templates/{2_ac_install_merge/x11-themes => steam}/adwaita-icon-theme/start-here.svg (100%) rename profiles/templates/{2_ac_install_merge/x11-themes => steam}/adwaita-icon-theme/start.svg (100%) rename profiles/templates/{6_ac_desktop_profile => steam/desktop}/.calculate_directory (54%) rename profiles/templates/{6_ac_desktop_profile/2-user/games-util => steam/desktop}/Steam-1.0/.calculate/ini.env (100%) rename profiles/templates/{6_ac_desktop_profile/2-user/games-util => steam/desktop}/Steam-1.0/.calculate_directory (100%) rename profiles/templates/{6_ac_desktop_profile/2-user/games-util => steam/desktop}/Steam-1.0/.config/menus/xfce-applications.menu (100%) rename profiles/templates/{6_ac_desktop_profile/2-user/games-util => steam/desktop}/Steam-1.0/.config/mousepad/mousepadrc (100%) rename profiles/templates/{6_ac_desktop_profile/2-user/games-util => steam/desktop}/Steam-1.0/.config/xfce4/xfce4-screenshooter (100%) rename profiles/templates/{6_ac_desktop_profile/2-user/games-util => steam/desktop}/Steam-1.0/.config/xfce4/xfconf/xfce-perchannel-xml/keyboards.xml (100%) rename profiles/templates/{6_ac_desktop_profile/2-user/games-util => steam/desktop}/Steam-1.0/.config/xfce4/xfconf/xfce-perchannel-xml/pointers.xml (100%) rename profiles/templates/{6_ac_desktop_profile/2-user/games-util => steam/desktop}/Steam-1.0/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml (100%) rename profiles/templates/{6_ac_desktop_profile/2-user/games-util => steam/desktop}/Steam-1.0/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml (100%) rename profiles/templates/{6_ac_desktop_profile/2-user/games-util => steam/desktop}/Steam-1.0/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml (100%) rename profiles/templates/{6_ac_desktop_profile/2-user/games-util => steam/desktop}/Steam-1.0/.local/share/applications/Thunar.desktop (100%) rename profiles/templates/{6_ac_desktop_profile/2-user/games-util => steam/desktop}/Steam-1.0/.local/share/applications/xfce-keyboard-settings.desktop (100%) rename profiles/templates/{6_ac_desktop_profile/2-user/games-util => steam/desktop}/Steam-1.0/.local/share/applications/xfce4-about.desktop (100%) rename profiles/templates/{6_ac_desktop_profile/2-user/games-util => steam/desktop}/Steam-1.0/.local/share/applications/xfce4-run.desktop (100%) rename profiles/templates/{6_ac_desktop_profile/2-user/games-util => steam/desktop}/Steam-1.0/.local/share/applications/xfce4-taskmanager.desktop (100%) rename profiles/templates/{6_ac_desktop_profile/2-user/games-util => steam/desktop}/Steam-1.0/.local/share/desktop-directories/xfce-accessories.directory (100%) rename profiles/templates/{6_ac_desktop_profile/2-user/games-util => steam/desktop}/Steam-1.0/.local/share/desktop-directories/xfce-multimedia.directory (100%) rename profiles/templates/{6_ac_desktop_profile/2-user/games-util => steam/desktop}/Steam-1.0/.local/share/desktop-directories/xfce-network.directory (100%) rename profiles/templates/{6_ac_desktop_profile/2-user/games-util => steam/desktop}/Steam-1.0/.steam/registry.vdf (100%) rename profiles/templates/{6_ac_desktop_profile/2-user/games-util => steam/desktop}/Steam-1.0/.xsession (100%) create mode 100644 profiles/templates/steam/world create mode 100644 profiles/templates/taiga/world diff --git a/profiles/profiles.desc b/profiles/profiles.desc index c429470..813c54e 100644 --- a/profiles/profiles.desc +++ b/profiles/profiles.desc @@ -7,9 +7,7 @@ #arch profile_directory status # AMD64 Profiles -amd64 directory/amd64/20 dev amd64 scratch/amd64/20 stable -amd64 steam/amd64/20 dev amd64 taiga/amd64/20 dev # vim: set ts=8 diff --git a/profiles/templates/2_ac_install_merge/.calculate_directory b/profiles/templates/2_ac_install_merge/.calculate_directory deleted file mode 100644 index 6aa2084..0000000 --- a/profiles/templates/2_ac_install_merge/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip env=install ac_install_merge==on diff --git a/profiles/templates/2_ac_install_merge/x11-themes/.calculate_directory b/profiles/templates/2_ac_install_merge/x11-themes/.calculate_directory deleted file mode 100644 index 720d52e..0000000 --- a/profiles/templates/2_ac_install_merge/x11-themes/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip diff --git a/profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/.calculate_directory b/profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/.calculate_directory deleted file mode 100644 index b065f51..0000000 --- a/profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip mergepkg()!=&&pkg(x11-themes/calculate-icon-theme)>=14-r6 diff --git a/profiles/templates/6_ac_desktop_profile/2-user/.calculate_directory b/profiles/templates/6_ac_desktop_profile/2-user/.calculate_directory deleted file mode 100644 index 6e56023..0000000 --- a/profiles/templates/6_ac_desktop_profile/2-user/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip ur_login!=root&&ini(main.update)!=off diff --git a/profiles/templates/6_ac_desktop_profile/2-user/games-util/.calculate_directory b/profiles/templates/6_ac_desktop_profile/2-user/games-util/.calculate_directory deleted file mode 100644 index 720d52e..0000000 --- a/profiles/templates/6_ac_desktop_profile/2-user/games-util/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip diff --git a/profiles/templates/6_ac_desktop_profile/README-eng.txt b/profiles/templates/6_ac_desktop_profile/README-eng.txt deleted file mode 100644 index 228e706..0000000 --- a/profiles/templates/6_ac_desktop_profile/README-eng.txt +++ /dev/null @@ -1,8 +0,0 @@ -# Calculate append=skip - -The ac_desktop_profile event: -- package installation -- user profile configuration - -Action: package configuration within a user profile -env: desktop diff --git a/profiles/templates/6_ac_desktop_profile/README-rus.txt b/profiles/templates/6_ac_desktop_profile/README-rus.txt deleted file mode 100644 index 5df4536..0000000 --- a/profiles/templates/6_ac_desktop_profile/README-rus.txt +++ /dev/null @@ -1,8 +0,0 @@ -# Calculate append=skip - -Событие ac_desktop_profile: -- установка пакета -- настройка профиля пользователя - -Действие: настройка пакета в профиле пользователя -env: desktop \ No newline at end of file diff --git a/profiles/templates/6_ac_update_sync/.calculate_directory b/profiles/templates/6_ac_update_sync/.calculate_directory deleted file mode 100644 index 6cc8a04..0000000 --- a/profiles/templates/6_ac_update_sync/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip env=update ac_update_sync==on diff --git a/profiles/templates/6_ac_update_sync/README-eng.txt b/profiles/templates/6_ac_update_sync/README-eng.txt deleted file mode 100644 index 2996b91..0000000 --- a/profiles/templates/6_ac_update_sync/README-eng.txt +++ /dev/null @@ -1,7 +0,0 @@ -# Calculate append=skip - -The ac_update_sync event: -- Portage syncing - -Action: world update, fix system -env: install diff --git a/profiles/templates/6_ac_update_sync/README-rus.txt b/profiles/templates/6_ac_update_sync/README-rus.txt deleted file mode 100644 index fe3ae65..0000000 --- a/profiles/templates/6_ac_update_sync/README-rus.txt +++ /dev/null @@ -1,7 +0,0 @@ -# Calculate append=skip - -Событие ac_update_sync: -- обновление портежей - -Действие: обновление world файла, исправление системы -env: install diff --git a/profiles/templates/6_ac_update_sync/remerge/.calculate_directory b/profiles/templates/6_ac_update_sync/remerge/.calculate_directory deleted file mode 100644 index 46ccab0..0000000 --- a/profiles/templates/6_ac_update_sync/remerge/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate path=/var/lib name=calculate diff --git a/profiles/templates/6_ac_update_sync/remerge/0-ini b/profiles/templates/6_ac_update_sync/remerge/0-ini deleted file mode 100644 index 33939dc..0000000 --- a/profiles/templates/6_ac_update_sync/remerge/0-ini +++ /dev/null @@ -1,5 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-container.remerge)== - -[overlay-container] -# Save the latest version, because when switching profile cl-setup-profile 3.2.2 makes a call cl-setup-system -remerge = 20180209 diff --git a/profiles/templates/6_ac_update_sync/remerge/2018/.calculate_directory b/profiles/templates/6_ac_update_sync/remerge/2018/.calculate_directory deleted file mode 100644 index 330b549..0000000 --- a/profiles/templates/6_ac_update_sync/remerge/2018/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip ini(overlay-container.remerge)<20190101 diff --git a/profiles/templates/6_ac_update_sync/remerge/2018/20180209 b/profiles/templates/6_ac_update_sync/remerge/2018/20180209 deleted file mode 100644 index 3480237..0000000 --- a/profiles/templates/6_ac_update_sync/remerge/2018/20180209 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=sys-fs/eudev,sys-fs/udev,sys-fs/udev-init-scripts,sys-apps/openrc,sys-apps/calculate-utils,x11-misc/lightdm,x11-base/xorg-server,sys-auth/consolekit - -[overlay-container] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/6_ac_update_sync/remerge/2021/.calculate_directory b/profiles/templates/6_ac_update_sync/remerge/2021/.calculate_directory deleted file mode 100644 index c5f00fe..0000000 --- a/profiles/templates/6_ac_update_sync/remerge/2021/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip ini(overlay-container.remerge)<20220101 diff --git a/profiles/templates/6_ac_update_sync/remerge/2021/20210212 b/profiles/templates/6_ac_update_sync/remerge/2021/20210212 deleted file mode 100644 index eb87fdc..0000000 --- a/profiles/templates/6_ac_update_sync/remerge/2021/20210212 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-container.remerge)<#-cl_pass_file-# merge=x11-themes/adwaita-icon-theme,x11-misc/sddm - -[overlay-container] -remerge = #-cl_pass_file-# diff --git a/profiles/templates/6_ac_update_sync/revision/.calculate_directory b/profiles/templates/6_ac_update_sync/revision/.calculate_directory deleted file mode 100644 index 46ccab0..0000000 --- a/profiles/templates/6_ac_update_sync/revision/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate path=/var/lib name=calculate diff --git a/profiles/templates/6_ac_update_sync/revision/2021/.calculate_directory b/profiles/templates/6_ac_update_sync/revision/2021/.calculate_directory deleted file mode 100644 index 2b3fa7e..0000000 --- a/profiles/templates/6_ac_update_sync/revision/2021/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip ini(overlay-container.revision)<20220101 diff --git a/profiles/templates/6_ac_update_sync/revision/2021/20211015-fix_filecaps b/profiles/templates/6_ac_update_sync/revision/2021/20211015-fix_filecaps deleted file mode 100644 index 6563a1e..0000000 --- a/profiles/templates/6_ac_update_sync/revision/2021/20211015-fix_filecaps +++ /dev/null @@ -1,9 +0,0 @@ -# Calculate exec=/bin/bash ini(overlay-container.revision)<#-cut(0,-,#-cl_pass_file-#)-# - -#-ini(overlay-container.revision,#-cut(0,-,#-cl_pass_file-#)-#)-# - -filecap /bin/ping net_raw &>/dev/null -filecap /bin/arping net_raw &>/dev/null -filecap /sbin/unix_chkpwd dac_override &>/dev/null - -exit 0 diff --git a/profiles/templates/6_ac_update_sync/world/.calculate_directory b/profiles/templates/6_ac_update_sync/world/.calculate_directory deleted file mode 100644 index 28b07ff..0000000 --- a/profiles/templates/6_ac_update_sync/world/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate path=/var/lib name=portage \ No newline at end of file diff --git a/profiles/templates/6_ac_update_sync/world/0-ini b/profiles/templates/6_ac_update_sync/world/0-ini deleted file mode 100644 index 7b24f6a..0000000 --- a/profiles/templates/6_ac_update_sync/world/0-ini +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate path=/var/lib/calculate name=ini.env format=samba cl_update_world==rebuild||cl_update_world==merge||ini(overlay-container.world)== - -[overlay-container] -world = 20210927 diff --git a/profiles/templates/6_ac_update_sync/world/create/.calculate_directory b/profiles/templates/6_ac_update_sync/world/create/.calculate_directory deleted file mode 100644 index efc7485..0000000 --- a/profiles/templates/6_ac_update_sync/world/create/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip cl_update_world==merge||cl_update_world==rebuild diff --git a/profiles/templates/6_ac_update_sync/world/create/applications b/profiles/templates/6_ac_update_sync/world/create/applications deleted file mode 100644 index 43a48e1..0000000 --- a/profiles/templates/6_ac_update_sync/world/create/applications +++ /dev/null @@ -1,9 +0,0 @@ -# Calculate name=world format=world - -#?in(os_linux_pkglist, CCDX)!=# -app-editors/leafpad -app-office/libreoffice -app-text/fbreader -app-text/qpdfview -sci-calculators/galculator -#in# diff --git a/profiles/templates/6_ac_update_sync/world/create/base b/profiles/templates/6_ac_update_sync/world/create/base deleted file mode 100644 index bb333f9..0000000 --- a/profiles/templates/6_ac_update_sync/world/create/base +++ /dev/null @@ -1,17 +0,0 @@ -# Calculate name=world format=world - -#?in(os_linux_pkglist, calculate)!=# -sys-apps/busybox -#in# - -#?in(os_linux_pkglist, CCDX)!=# -media-fonts/terminus-font -sys-apps/calculate-toolkit -sys-apps/ifplugd -sys-apps/less -#in# - -#?in(os_linux_pkglist, CCG, steam)!=# -app-portage/gentoolkit -sys-kernel/fake-sources -#in# diff --git a/profiles/templates/6_ac_update_sync/world/create/decoration b/profiles/templates/6_ac_update_sync/world/create/decoration deleted file mode 100644 index 9fc1589..0000000 --- a/profiles/templates/6_ac_update_sync/world/create/decoration +++ /dev/null @@ -1,22 +0,0 @@ -# Calculate name=world format=world - -#?in(os_linux_pkglist, CCDX, CCG, steam)!=# -x11-themes/calculate-icon-theme -#in# - -#?in(os_linux_pkglist, CCDX)!=# -media-gfx/calculate-wallpapers -media-gfx/dm-themes-calculate -media-gfx/lightdm-themes-calculate -x11-misc/qt5ct -x11-themes/adwaita-qt -x11-themes/claws-mail-theme-calculate -x11-themes/elementary-icon-theme -x11-themes/gnome-themes-standard -x11-themes/gtk-engines -x11-themes/xfwm4-themes -#in# - -#?in(os_linux_pkglist, CCG, steam)!=# -media-fonts/droid -#in# diff --git a/profiles/templates/6_ac_update_sync/world/create/games b/profiles/templates/6_ac_update_sync/world/create/games deleted file mode 100644 index 0c4ce6c..0000000 --- a/profiles/templates/6_ac_update_sync/world/create/games +++ /dev/null @@ -1,9 +0,0 @@ -# Calculate name=world format=world - -#?in(os_linux_pkglist, CCDX)!=# -games-misc/games-envd -#in# - -#?in(os_linux_pkglist, CCG, steam)!=# -games-util/steam-launcher -#in# diff --git a/profiles/templates/6_ac_update_sync/world/create/graphics b/profiles/templates/6_ac_update_sync/world/create/graphics deleted file mode 100644 index d265234..0000000 --- a/profiles/templates/6_ac_update_sync/world/create/graphics +++ /dev/null @@ -1,7 +0,0 @@ -# Calculate name=world format=world - -#?in(os_linux_pkglist, CCDX)!=# -media-gfx/gimp -media-gfx/imagemagick -media-gfx/nomacs -#in# diff --git a/profiles/templates/6_ac_update_sync/world/create/multimedia b/profiles/templates/6_ac_update_sync/world/create/multimedia deleted file mode 100644 index fb8612f..0000000 --- a/profiles/templates/6_ac_update_sync/world/create/multimedia +++ /dev/null @@ -1,14 +0,0 @@ -# Calculate name=world format=world - -#?in(os_linux_pkglist, CCDX)!=# -media-sound/clementine -media-sound/pavucontrol -media-sound/qastools -media-video/smplayer -#in# - -#?in(os_linux_pkglist, CCG, steam)!=# -media-sound/alsa-utils -media-sound/pulseaudio -#in# - diff --git a/profiles/templates/6_ac_update_sync/world/create/netapps b/profiles/templates/6_ac_update_sync/world/create/netapps deleted file mode 100644 index bbce566..0000000 --- a/profiles/templates/6_ac_update_sync/world/create/netapps +++ /dev/null @@ -1,17 +0,0 @@ -# Calculate name=world format=world - -#?in(os_linux_pkglist, CCG, steam, CCDX)!=# -x11-misc/x11vnc -#in# - -#?in(os_linux_pkglist, CCDX)!=# -app-text/wgetpaste -mail-client/claws-mail -net-im/gajim -net-im/gajim-httpupload -net-irc/hexchat -net-misc/remmina -net-misc/whois -net-p2p/deluge -www-client/firefox -#in# diff --git a/profiles/templates/6_ac_update_sync/world/create/network b/profiles/templates/6_ac_update_sync/world/create/network deleted file mode 100644 index 7a0de11..0000000 --- a/profiles/templates/6_ac_update_sync/world/create/network +++ /dev/null @@ -1,13 +0,0 @@ -# Calculate name=world format=world - -#?in(os_linux_pkglist, CCDX)!=# -net-dialup/pptpclient -net-dialup/rp-pppoe -net-dialup/xl2tpd -net-dns/bind-tools -net-misc/networkmanager-l2tp -net-misc/networkmanager-openvpn -net-misc/networkmanager-pptp -net-misc/networkmanager-vpnc -net-misc/vconfig -#in# diff --git a/profiles/templates/6_ac_update_sync/world/create/printer b/profiles/templates/6_ac_update_sync/world/create/printer deleted file mode 100644 index a26bad4..0000000 --- a/profiles/templates/6_ac_update_sync/world/create/printer +++ /dev/null @@ -1,13 +0,0 @@ -# Calculate name=world format=world - -#?in(os_linux_pkglist, CCDX)!=# -app-admin/system-config-printer -media-gfx/xsane -net-print/cnijfilter -net-print/cups -net-print/epson-inkjet-printer-escpr -net-print/foomatic-db-engine -net-print/gutenprint -net-print/hplip -net-print/hplip-plugin -#in# diff --git a/profiles/templates/6_ac_update_sync/world/create/taiga b/profiles/templates/6_ac_update_sync/world/create/taiga deleted file mode 100644 index 3c8108d..0000000 --- a/profiles/templates/6_ac_update_sync/world/create/taiga +++ /dev/null @@ -1,10 +0,0 @@ -# Calculate name=world format=world - -#?in(os_linux_pkglist, taiga)!=# -dev-db/postgresql:12 -dev-python/nodeenv -dev-python/setuptools -net-misc/rabbitmq-server -sys-devel/gettext -www-servers/nginx -#in# diff --git a/profiles/templates/6_ac_update_sync/world/create/tools b/profiles/templates/6_ac_update_sync/world/create/tools deleted file mode 100644 index b89e76b..0000000 --- a/profiles/templates/6_ac_update_sync/world/create/tools +++ /dev/null @@ -1,67 +0,0 @@ -# Calculate name=world format=world - -#?in(os_linux_pkglist, CCDX, CDC, directory, CCG, steam, CCS, scratch, taiga)!=# -app-text/tree -#in# - -#?in(os_linux_pkglist, CCDX, CDC, directory, CCG, steam)!=# -app-admin/logrotate -app-admin/syslog-ng -app-arch/lbzip2 -app-arch/p7zip -app-arch/pigz -app-editors/vim -app-vim/colorschemes -sys-process/cronie -#in# - -#?in(os_linux_pkglist, CDC, directory)!=# -sys-apps/calculate-server -#in# - -#?in(os_linux_pkglist, CCDX)!=# -app-admin/hardinfo -app-admin/hddtemp -app-admin/sudo -app-arch/rar -app-arch/unzip -app-cdr/cdrtools -app-cdr/dvd+rw-tools -app-misc/mc -app-misc/tmux -app-pda/usbmuxd -app-portage/portage-utils -dev-python/gst-python -net-misc/dhcp -sys-apps/acl -sys-apps/dmidecode -sys-apps/ethtool -sys-apps/gptfdisk -sys-apps/inxi -sys-apps/keyexec -sys-apps/lm_sensors -sys-apps/mlocate -sys-apps/pciutils -sys-apps/pcmciautils -sys-apps/pv -sys-apps/smartmontools -sys-apps/usb_modeswitch -sys-apps/usbutils -sys-auth/pam_update -sys-fs/cryptsetup -sys-fs/dmraid -sys-fs/dosfstools -sys-fs/exfat-utils -sys-fs/fuse-exfat -sys-fs/mtools -sys-fs/ntfs3g -sys-power/acpi -sys-power/cpupower -sys-power/powernowd -sys-power/powertop -sys-power/upower -sys-process/htop -sys-process/lsof -x11-libs/gksu -x11-misc/wmctrl -#in# diff --git a/profiles/templates/6_ac_update_sync/world/create/xfce b/profiles/templates/6_ac_update_sync/world/create/xfce deleted file mode 100644 index c513594..0000000 --- a/profiles/templates/6_ac_update_sync/world/create/xfce +++ /dev/null @@ -1,30 +0,0 @@ -# Calculate name=world format=world - -#?in(os_linux_pkglist, CCDX, CCG, steam)!=# -x11-terms/xfce4-terminal -#in# - -#?in(os_linux_pkglist, CCDX)!=# -app-arch/xarchiver -dev-util/catfish -media-sound/volumeicon -x11-misc/sw-notify-send -xfce-base/xfce4-meta -xfce-extra/thunar-archive-plugin -xfce-extra/thunar-media-tags-plugin -xfce-extra/thunar-volman -xfce-extra/tumbler -xfce-extra/xfce4-clipman-plugin -xfce-extra/xfce4-datetime-plugin -xfce-extra/xfce4-notifyd -xfce-extra/xfce4-power-manager -xfce-extra/xfce4-quicklauncher-plugin -xfce-extra/xfce4-screenshooter -xfce-extra/xfce4-taskmanager -xfce-extra/xfce4-xkb-plugin -#in# - -#?in(os_linux_pkglist, CCG, steam)!=# -xfce-base/xfce4-panel -xfce-base/xfwm4 -#in# diff --git a/profiles/templates/6_ac_update_sync/world/create/xorg b/profiles/templates/6_ac_update_sync/world/create/xorg deleted file mode 100644 index 16c5204..0000000 --- a/profiles/templates/6_ac_update_sync/world/create/xorg +++ /dev/null @@ -1,18 +0,0 @@ -# Calculate name=world format=world - -#?in(os_linux_pkglist, CCDX)!=# -app-misc/xorg-meta -x11-misc/lightdm -x11-misc/xscreensaver -#in# - -#?in(os_linux_pkglist, CCG, steam)!=# -x11-apps/mesa-progs -x11-apps/xrandr -x11-apps/xsetroot -x11-base/xorg-server -x11-misc/edid-data -x11-misc/sddm -# missing dependency for x11-drivers/nvidia-drivers -sys-devel/m4 -#in# diff --git a/profiles/templates/6_ac_update_sync/world/update/.calculate_directory b/profiles/templates/6_ac_update_sync/world/update/.calculate_directory deleted file mode 100644 index 06d9075..0000000 --- a/profiles/templates/6_ac_update_sync/world/update/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip cl_update_world!=merge&&cl_update_world!=rebuild diff --git a/profiles/templates/6_ac_update_sync/world/update/2018/.calculate_directory b/profiles/templates/6_ac_update_sync/world/update/2018/.calculate_directory deleted file mode 100644 index cd7b2f4..0000000 --- a/profiles/templates/6_ac_update_sync/world/update/2018/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip ini(overlay-container.world)<20190101 diff --git a/profiles/templates/6_ac_update_sync/world/update/2018/20180703 b/profiles/templates/6_ac_update_sync/world/update/2018/20180703 deleted file mode 100644 index 669fd9b..0000000 --- a/profiles/templates/6_ac_update_sync/world/update/2018/20180703 +++ /dev/null @@ -1,8 +0,0 @@ -# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-# - -#-ini(overlay-distros.world,#-cut()-#)-# - -#?in(os_linux_pkglist, CCDX)!=# -x11-misc/qt5ct -x11-themes/adwaita-qt -#in# diff --git a/profiles/templates/6_ac_update_sync/world/update/2021/.calculate_directory b/profiles/templates/6_ac_update_sync/world/update/2021/.calculate_directory deleted file mode 100644 index 486aa9a..0000000 --- a/profiles/templates/6_ac_update_sync/world/update/2021/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip ini(overlay-container.world)<20220101 diff --git a/profiles/templates/6_ac_update_sync/world/update/2021/20210423 b/profiles/templates/6_ac_update_sync/world/update/2021/20210423 deleted file mode 100644 index 9543ca8..0000000 --- a/profiles/templates/6_ac_update_sync/world/update/2021/20210423 +++ /dev/null @@ -1,7 +0,0 @@ -# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-# - -#-ini(overlay-distros.world,#-cut()-#)-# - -#?in(os_linux_pkglist, CCG)!=# -sys-devel/m4 -#in# diff --git a/profiles/templates/6_ac_update_sync/world/update/2021/20210927 b/profiles/templates/6_ac_update_sync/world/update/2021/20210927 deleted file mode 100644 index 350725e..0000000 --- a/profiles/templates/6_ac_update_sync/world/update/2021/20210927 +++ /dev/null @@ -1,7 +0,0 @@ -# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-# - -#-ini(overlay-distros.world,#-cut()-#)-# - -#?in(os_linux_pkglist, calculate)!=# -sys-apps/busybox -#in# diff --git a/profiles/templates/steam/.calculate_directory b/profiles/templates/steam/.calculate_directory new file mode 100644 index 0000000..88a11a8 --- /dev/null +++ b/profiles/templates/steam/.calculate_directory @@ -0,0 +1 @@ +# Calculate os_linux_shortname==steam cl_name==calculate-core append=skip diff --git a/profiles/templates/steam/adwaita-icon-theme/.calculate_directory b/profiles/templates/steam/adwaita-icon-theme/.calculate_directory new file mode 100644 index 0000000..0c05bca --- /dev/null +++ b/profiles/templates/steam/adwaita-icon-theme/.calculate_directory @@ -0,0 +1 @@ +# Calculate env=install ac_install_merge==on mergepkg(x11-themes/adwaita-icon-theme)!= append=skip diff --git a/profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/org.xfce.panel.applicationsmenu.svg b/profiles/templates/steam/adwaita-icon-theme/org.xfce.panel.applicationsmenu.svg similarity index 100% rename from profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/org.xfce.panel.applicationsmenu.svg rename to profiles/templates/steam/adwaita-icon-theme/org.xfce.panel.applicationsmenu.svg diff --git a/profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/.calculate_directory b/profiles/templates/steam/adwaita-icon-theme/places/.calculate_directory similarity index 100% rename from profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/.calculate_directory rename to profiles/templates/steam/adwaita-icon-theme/places/.calculate_directory diff --git a/profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/128/distributor-logo-xfce.svg b/profiles/templates/steam/adwaita-icon-theme/places/128/distributor-logo-xfce.svg similarity index 100% rename from profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/128/distributor-logo-xfce.svg rename to profiles/templates/steam/adwaita-icon-theme/places/128/distributor-logo-xfce.svg diff --git a/profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/128/distributor-logo.svg b/profiles/templates/steam/adwaita-icon-theme/places/128/distributor-logo.svg similarity index 100% rename from profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/128/distributor-logo.svg rename to profiles/templates/steam/adwaita-icon-theme/places/128/distributor-logo.svg diff --git a/profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/128/org.xfce.panel.applicationsmenu.svg b/profiles/templates/steam/adwaita-icon-theme/places/128/org.xfce.panel.applicationsmenu.svg similarity index 100% rename from profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/128/org.xfce.panel.applicationsmenu.svg rename to profiles/templates/steam/adwaita-icon-theme/places/128/org.xfce.panel.applicationsmenu.svg diff --git a/profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/128/start-calculate.svg b/profiles/templates/steam/adwaita-icon-theme/places/128/start-calculate.svg similarity index 100% rename from profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/128/start-calculate.svg rename to profiles/templates/steam/adwaita-icon-theme/places/128/start-calculate.svg diff --git a/profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/128/start-here.svg b/profiles/templates/steam/adwaita-icon-theme/places/128/start-here.svg similarity index 100% rename from profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/128/start-here.svg rename to profiles/templates/steam/adwaita-icon-theme/places/128/start-here.svg diff --git a/profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/128/start.svg b/profiles/templates/steam/adwaita-icon-theme/places/128/start.svg similarity index 100% rename from profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/128/start.svg rename to profiles/templates/steam/adwaita-icon-theme/places/128/start.svg diff --git a/profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/16/distributor-logo-xfce.svg b/profiles/templates/steam/adwaita-icon-theme/places/16/distributor-logo-xfce.svg similarity index 100% rename from profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/16/distributor-logo-xfce.svg rename to profiles/templates/steam/adwaita-icon-theme/places/16/distributor-logo-xfce.svg diff --git a/profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/16/distributor-logo.svg b/profiles/templates/steam/adwaita-icon-theme/places/16/distributor-logo.svg similarity index 100% rename from profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/16/distributor-logo.svg rename to profiles/templates/steam/adwaita-icon-theme/places/16/distributor-logo.svg diff --git a/profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/16/org.xfce.panel.applicationsmenu.svg b/profiles/templates/steam/adwaita-icon-theme/places/16/org.xfce.panel.applicationsmenu.svg similarity index 100% rename from profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/16/org.xfce.panel.applicationsmenu.svg rename to profiles/templates/steam/adwaita-icon-theme/places/16/org.xfce.panel.applicationsmenu.svg diff --git a/profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/16/start-calculate.svg b/profiles/templates/steam/adwaita-icon-theme/places/16/start-calculate.svg similarity index 100% rename from profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/16/start-calculate.svg rename to profiles/templates/steam/adwaita-icon-theme/places/16/start-calculate.svg diff --git a/profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/16/start-here.svg b/profiles/templates/steam/adwaita-icon-theme/places/16/start-here.svg similarity index 100% rename from profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/16/start-here.svg rename to profiles/templates/steam/adwaita-icon-theme/places/16/start-here.svg diff --git a/profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/16/start.svg b/profiles/templates/steam/adwaita-icon-theme/places/16/start.svg similarity index 100% rename from profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/16/start.svg rename to profiles/templates/steam/adwaita-icon-theme/places/16/start.svg diff --git a/profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/22/distributor-logo-xfce.svg b/profiles/templates/steam/adwaita-icon-theme/places/22/distributor-logo-xfce.svg similarity index 100% rename from profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/22/distributor-logo-xfce.svg rename to profiles/templates/steam/adwaita-icon-theme/places/22/distributor-logo-xfce.svg diff --git a/profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/22/distributor-logo.svg b/profiles/templates/steam/adwaita-icon-theme/places/22/distributor-logo.svg similarity index 100% rename from profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/22/distributor-logo.svg rename to profiles/templates/steam/adwaita-icon-theme/places/22/distributor-logo.svg diff --git a/profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/22/folder-download.svg b/profiles/templates/steam/adwaita-icon-theme/places/22/folder-download.svg similarity index 100% rename from profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/22/folder-download.svg rename to profiles/templates/steam/adwaita-icon-theme/places/22/folder-download.svg diff --git a/profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/22/folder-remote.svg b/profiles/templates/steam/adwaita-icon-theme/places/22/folder-remote.svg similarity index 100% rename from profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/22/folder-remote.svg rename to profiles/templates/steam/adwaita-icon-theme/places/22/folder-remote.svg diff --git a/profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/22/org.xfce.panel.applicationsmenu.svg b/profiles/templates/steam/adwaita-icon-theme/places/22/org.xfce.panel.applicationsmenu.svg similarity index 100% rename from profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/22/org.xfce.panel.applicationsmenu.svg rename to profiles/templates/steam/adwaita-icon-theme/places/22/org.xfce.panel.applicationsmenu.svg diff --git a/profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/22/start-calculate.svg b/profiles/templates/steam/adwaita-icon-theme/places/22/start-calculate.svg similarity index 100% rename from profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/22/start-calculate.svg rename to profiles/templates/steam/adwaita-icon-theme/places/22/start-calculate.svg diff --git a/profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/22/start-here.svg b/profiles/templates/steam/adwaita-icon-theme/places/22/start-here.svg similarity index 100% rename from profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/22/start-here.svg rename to profiles/templates/steam/adwaita-icon-theme/places/22/start-here.svg diff --git a/profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/22/start.svg b/profiles/templates/steam/adwaita-icon-theme/places/22/start.svg similarity index 100% rename from profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/22/start.svg rename to profiles/templates/steam/adwaita-icon-theme/places/22/start.svg diff --git a/profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/22/user-home.svg b/profiles/templates/steam/adwaita-icon-theme/places/22/user-home.svg similarity index 100% rename from profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/22/user-home.svg rename to profiles/templates/steam/adwaita-icon-theme/places/22/user-home.svg diff --git a/profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/24/distributor-logo-xfce.svg b/profiles/templates/steam/adwaita-icon-theme/places/24/distributor-logo-xfce.svg similarity index 100% rename from profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/24/distributor-logo-xfce.svg rename to profiles/templates/steam/adwaita-icon-theme/places/24/distributor-logo-xfce.svg diff --git a/profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/24/distributor-logo.svg b/profiles/templates/steam/adwaita-icon-theme/places/24/distributor-logo.svg similarity index 100% rename from profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/24/distributor-logo.svg rename to profiles/templates/steam/adwaita-icon-theme/places/24/distributor-logo.svg diff --git a/profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/24/folder-download.svg b/profiles/templates/steam/adwaita-icon-theme/places/24/folder-download.svg similarity index 100% rename from profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/24/folder-download.svg rename to profiles/templates/steam/adwaita-icon-theme/places/24/folder-download.svg diff --git a/profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/24/folder-remote.svg b/profiles/templates/steam/adwaita-icon-theme/places/24/folder-remote.svg similarity index 100% rename from profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/24/folder-remote.svg rename to profiles/templates/steam/adwaita-icon-theme/places/24/folder-remote.svg diff --git a/profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/24/org.xfce.panel.applicationsmenu.svg b/profiles/templates/steam/adwaita-icon-theme/places/24/org.xfce.panel.applicationsmenu.svg similarity index 100% rename from profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/24/org.xfce.panel.applicationsmenu.svg rename to profiles/templates/steam/adwaita-icon-theme/places/24/org.xfce.panel.applicationsmenu.svg diff --git a/profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/24/start-calculate.svg b/profiles/templates/steam/adwaita-icon-theme/places/24/start-calculate.svg similarity index 100% rename from profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/24/start-calculate.svg rename to profiles/templates/steam/adwaita-icon-theme/places/24/start-calculate.svg diff --git a/profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/24/start-here.svg b/profiles/templates/steam/adwaita-icon-theme/places/24/start-here.svg similarity index 100% rename from profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/24/start-here.svg rename to profiles/templates/steam/adwaita-icon-theme/places/24/start-here.svg diff --git a/profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/24/start.svg b/profiles/templates/steam/adwaita-icon-theme/places/24/start.svg similarity index 100% rename from profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/24/start.svg rename to profiles/templates/steam/adwaita-icon-theme/places/24/start.svg diff --git a/profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/24/user-home.svg b/profiles/templates/steam/adwaita-icon-theme/places/24/user-home.svg similarity index 100% rename from profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/24/user-home.svg rename to profiles/templates/steam/adwaita-icon-theme/places/24/user-home.svg diff --git a/profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/48/distributor-logo-xfce.svg b/profiles/templates/steam/adwaita-icon-theme/places/48/distributor-logo-xfce.svg similarity index 100% rename from profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/48/distributor-logo-xfce.svg rename to profiles/templates/steam/adwaita-icon-theme/places/48/distributor-logo-xfce.svg diff --git a/profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/48/distributor-logo.svg b/profiles/templates/steam/adwaita-icon-theme/places/48/distributor-logo.svg similarity index 100% rename from profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/48/distributor-logo.svg rename to profiles/templates/steam/adwaita-icon-theme/places/48/distributor-logo.svg diff --git a/profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/48/org.xfce.panel.applicationsmenu.svg b/profiles/templates/steam/adwaita-icon-theme/places/48/org.xfce.panel.applicationsmenu.svg similarity index 100% rename from profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/48/org.xfce.panel.applicationsmenu.svg rename to profiles/templates/steam/adwaita-icon-theme/places/48/org.xfce.panel.applicationsmenu.svg diff --git a/profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/48/start-calculate.svg b/profiles/templates/steam/adwaita-icon-theme/places/48/start-calculate.svg similarity index 100% rename from profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/48/start-calculate.svg rename to profiles/templates/steam/adwaita-icon-theme/places/48/start-calculate.svg diff --git a/profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/48/start-here.svg b/profiles/templates/steam/adwaita-icon-theme/places/48/start-here.svg similarity index 100% rename from profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/48/start-here.svg rename to profiles/templates/steam/adwaita-icon-theme/places/48/start-here.svg diff --git a/profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/48/start.svg b/profiles/templates/steam/adwaita-icon-theme/places/48/start.svg similarity index 100% rename from profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/48/start.svg rename to profiles/templates/steam/adwaita-icon-theme/places/48/start.svg diff --git a/profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/64/distributor-logo-xfce.svg b/profiles/templates/steam/adwaita-icon-theme/places/64/distributor-logo-xfce.svg similarity index 100% rename from profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/64/distributor-logo-xfce.svg rename to profiles/templates/steam/adwaita-icon-theme/places/64/distributor-logo-xfce.svg diff --git a/profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/64/distributor-logo.svg b/profiles/templates/steam/adwaita-icon-theme/places/64/distributor-logo.svg similarity index 100% rename from profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/64/distributor-logo.svg rename to profiles/templates/steam/adwaita-icon-theme/places/64/distributor-logo.svg diff --git a/profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/64/org.xfce.panel.applicationsmenu.svg b/profiles/templates/steam/adwaita-icon-theme/places/64/org.xfce.panel.applicationsmenu.svg similarity index 100% rename from profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/64/org.xfce.panel.applicationsmenu.svg rename to profiles/templates/steam/adwaita-icon-theme/places/64/org.xfce.panel.applicationsmenu.svg diff --git a/profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/64/start-calculate.svg b/profiles/templates/steam/adwaita-icon-theme/places/64/start-calculate.svg similarity index 100% rename from profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/64/start-calculate.svg rename to profiles/templates/steam/adwaita-icon-theme/places/64/start-calculate.svg diff --git a/profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/64/start-here.svg b/profiles/templates/steam/adwaita-icon-theme/places/64/start-here.svg similarity index 100% rename from profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/64/start-here.svg rename to profiles/templates/steam/adwaita-icon-theme/places/64/start-here.svg diff --git a/profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/64/start.svg b/profiles/templates/steam/adwaita-icon-theme/places/64/start.svg similarity index 100% rename from profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/places/64/start.svg rename to profiles/templates/steam/adwaita-icon-theme/places/64/start.svg diff --git a/profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/start-here.svg b/profiles/templates/steam/adwaita-icon-theme/start-here.svg similarity index 100% rename from profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/start-here.svg rename to profiles/templates/steam/adwaita-icon-theme/start-here.svg diff --git a/profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/start.svg b/profiles/templates/steam/adwaita-icon-theme/start.svg similarity index 100% rename from profiles/templates/2_ac_install_merge/x11-themes/adwaita-icon-theme/start.svg rename to profiles/templates/steam/adwaita-icon-theme/start.svg diff --git a/profiles/templates/6_ac_desktop_profile/.calculate_directory b/profiles/templates/steam/desktop/.calculate_directory similarity index 54% rename from profiles/templates/6_ac_desktop_profile/.calculate_directory rename to profiles/templates/steam/desktop/.calculate_directory index 0af99e1..e2a628f 100644 --- a/profiles/templates/6_ac_desktop_profile/.calculate_directory +++ b/profiles/templates/steam/desktop/.calculate_directory @@ -1 +1 @@ -# Calculate env=desktop path=~ name= chown=#-main.ur_login-#:#-main.ur_group-# ac_desktop_profile==on +# Calculate env=desktop path=~ name= chown=#-main.ur_login-#:#-main.ur_group-# ac_desktop_profile==on&&ur_login!=root diff --git a/profiles/templates/6_ac_desktop_profile/2-user/games-util/Steam-1.0/.calculate/ini.env b/profiles/templates/steam/desktop/Steam-1.0/.calculate/ini.env similarity index 100% rename from profiles/templates/6_ac_desktop_profile/2-user/games-util/Steam-1.0/.calculate/ini.env rename to profiles/templates/steam/desktop/Steam-1.0/.calculate/ini.env diff --git a/profiles/templates/6_ac_desktop_profile/2-user/games-util/Steam-1.0/.calculate_directory b/profiles/templates/steam/desktop/Steam-1.0/.calculate_directory similarity index 100% rename from profiles/templates/6_ac_desktop_profile/2-user/games-util/Steam-1.0/.calculate_directory rename to profiles/templates/steam/desktop/Steam-1.0/.calculate_directory diff --git a/profiles/templates/6_ac_desktop_profile/2-user/games-util/Steam-1.0/.config/menus/xfce-applications.menu b/profiles/templates/steam/desktop/Steam-1.0/.config/menus/xfce-applications.menu similarity index 100% rename from profiles/templates/6_ac_desktop_profile/2-user/games-util/Steam-1.0/.config/menus/xfce-applications.menu rename to profiles/templates/steam/desktop/Steam-1.0/.config/menus/xfce-applications.menu diff --git a/profiles/templates/6_ac_desktop_profile/2-user/games-util/Steam-1.0/.config/mousepad/mousepadrc b/profiles/templates/steam/desktop/Steam-1.0/.config/mousepad/mousepadrc similarity index 100% rename from profiles/templates/6_ac_desktop_profile/2-user/games-util/Steam-1.0/.config/mousepad/mousepadrc rename to profiles/templates/steam/desktop/Steam-1.0/.config/mousepad/mousepadrc diff --git a/profiles/templates/6_ac_desktop_profile/2-user/games-util/Steam-1.0/.config/xfce4/xfce4-screenshooter b/profiles/templates/steam/desktop/Steam-1.0/.config/xfce4/xfce4-screenshooter similarity index 100% rename from profiles/templates/6_ac_desktop_profile/2-user/games-util/Steam-1.0/.config/xfce4/xfce4-screenshooter rename to profiles/templates/steam/desktop/Steam-1.0/.config/xfce4/xfce4-screenshooter diff --git a/profiles/templates/6_ac_desktop_profile/2-user/games-util/Steam-1.0/.config/xfce4/xfconf/xfce-perchannel-xml/keyboards.xml b/profiles/templates/steam/desktop/Steam-1.0/.config/xfce4/xfconf/xfce-perchannel-xml/keyboards.xml similarity index 100% rename from profiles/templates/6_ac_desktop_profile/2-user/games-util/Steam-1.0/.config/xfce4/xfconf/xfce-perchannel-xml/keyboards.xml rename to profiles/templates/steam/desktop/Steam-1.0/.config/xfce4/xfconf/xfce-perchannel-xml/keyboards.xml diff --git a/profiles/templates/6_ac_desktop_profile/2-user/games-util/Steam-1.0/.config/xfce4/xfconf/xfce-perchannel-xml/pointers.xml b/profiles/templates/steam/desktop/Steam-1.0/.config/xfce4/xfconf/xfce-perchannel-xml/pointers.xml similarity index 100% rename from profiles/templates/6_ac_desktop_profile/2-user/games-util/Steam-1.0/.config/xfce4/xfconf/xfce-perchannel-xml/pointers.xml rename to profiles/templates/steam/desktop/Steam-1.0/.config/xfce4/xfconf/xfce-perchannel-xml/pointers.xml diff --git a/profiles/templates/6_ac_desktop_profile/2-user/games-util/Steam-1.0/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml b/profiles/templates/steam/desktop/Steam-1.0/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml similarity index 100% rename from profiles/templates/6_ac_desktop_profile/2-user/games-util/Steam-1.0/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml rename to profiles/templates/steam/desktop/Steam-1.0/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml diff --git a/profiles/templates/6_ac_desktop_profile/2-user/games-util/Steam-1.0/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/profiles/templates/steam/desktop/Steam-1.0/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml similarity index 100% rename from profiles/templates/6_ac_desktop_profile/2-user/games-util/Steam-1.0/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml rename to profiles/templates/steam/desktop/Steam-1.0/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml diff --git a/profiles/templates/6_ac_desktop_profile/2-user/games-util/Steam-1.0/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml b/profiles/templates/steam/desktop/Steam-1.0/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml similarity index 100% rename from profiles/templates/6_ac_desktop_profile/2-user/games-util/Steam-1.0/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml rename to profiles/templates/steam/desktop/Steam-1.0/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml diff --git a/profiles/templates/6_ac_desktop_profile/2-user/games-util/Steam-1.0/.local/share/applications/Thunar.desktop b/profiles/templates/steam/desktop/Steam-1.0/.local/share/applications/Thunar.desktop similarity index 100% rename from profiles/templates/6_ac_desktop_profile/2-user/games-util/Steam-1.0/.local/share/applications/Thunar.desktop rename to profiles/templates/steam/desktop/Steam-1.0/.local/share/applications/Thunar.desktop diff --git a/profiles/templates/6_ac_desktop_profile/2-user/games-util/Steam-1.0/.local/share/applications/xfce-keyboard-settings.desktop b/profiles/templates/steam/desktop/Steam-1.0/.local/share/applications/xfce-keyboard-settings.desktop similarity index 100% rename from profiles/templates/6_ac_desktop_profile/2-user/games-util/Steam-1.0/.local/share/applications/xfce-keyboard-settings.desktop rename to profiles/templates/steam/desktop/Steam-1.0/.local/share/applications/xfce-keyboard-settings.desktop diff --git a/profiles/templates/6_ac_desktop_profile/2-user/games-util/Steam-1.0/.local/share/applications/xfce4-about.desktop b/profiles/templates/steam/desktop/Steam-1.0/.local/share/applications/xfce4-about.desktop similarity index 100% rename from profiles/templates/6_ac_desktop_profile/2-user/games-util/Steam-1.0/.local/share/applications/xfce4-about.desktop rename to profiles/templates/steam/desktop/Steam-1.0/.local/share/applications/xfce4-about.desktop diff --git a/profiles/templates/6_ac_desktop_profile/2-user/games-util/Steam-1.0/.local/share/applications/xfce4-run.desktop b/profiles/templates/steam/desktop/Steam-1.0/.local/share/applications/xfce4-run.desktop similarity index 100% rename from profiles/templates/6_ac_desktop_profile/2-user/games-util/Steam-1.0/.local/share/applications/xfce4-run.desktop rename to profiles/templates/steam/desktop/Steam-1.0/.local/share/applications/xfce4-run.desktop diff --git a/profiles/templates/6_ac_desktop_profile/2-user/games-util/Steam-1.0/.local/share/applications/xfce4-taskmanager.desktop b/profiles/templates/steam/desktop/Steam-1.0/.local/share/applications/xfce4-taskmanager.desktop similarity index 100% rename from profiles/templates/6_ac_desktop_profile/2-user/games-util/Steam-1.0/.local/share/applications/xfce4-taskmanager.desktop rename to profiles/templates/steam/desktop/Steam-1.0/.local/share/applications/xfce4-taskmanager.desktop diff --git a/profiles/templates/6_ac_desktop_profile/2-user/games-util/Steam-1.0/.local/share/desktop-directories/xfce-accessories.directory b/profiles/templates/steam/desktop/Steam-1.0/.local/share/desktop-directories/xfce-accessories.directory similarity index 100% rename from profiles/templates/6_ac_desktop_profile/2-user/games-util/Steam-1.0/.local/share/desktop-directories/xfce-accessories.directory rename to profiles/templates/steam/desktop/Steam-1.0/.local/share/desktop-directories/xfce-accessories.directory diff --git a/profiles/templates/6_ac_desktop_profile/2-user/games-util/Steam-1.0/.local/share/desktop-directories/xfce-multimedia.directory b/profiles/templates/steam/desktop/Steam-1.0/.local/share/desktop-directories/xfce-multimedia.directory similarity index 100% rename from profiles/templates/6_ac_desktop_profile/2-user/games-util/Steam-1.0/.local/share/desktop-directories/xfce-multimedia.directory rename to profiles/templates/steam/desktop/Steam-1.0/.local/share/desktop-directories/xfce-multimedia.directory diff --git a/profiles/templates/6_ac_desktop_profile/2-user/games-util/Steam-1.0/.local/share/desktop-directories/xfce-network.directory b/profiles/templates/steam/desktop/Steam-1.0/.local/share/desktop-directories/xfce-network.directory similarity index 100% rename from profiles/templates/6_ac_desktop_profile/2-user/games-util/Steam-1.0/.local/share/desktop-directories/xfce-network.directory rename to profiles/templates/steam/desktop/Steam-1.0/.local/share/desktop-directories/xfce-network.directory diff --git a/profiles/templates/6_ac_desktop_profile/2-user/games-util/Steam-1.0/.steam/registry.vdf b/profiles/templates/steam/desktop/Steam-1.0/.steam/registry.vdf similarity index 100% rename from profiles/templates/6_ac_desktop_profile/2-user/games-util/Steam-1.0/.steam/registry.vdf rename to profiles/templates/steam/desktop/Steam-1.0/.steam/registry.vdf diff --git a/profiles/templates/6_ac_desktop_profile/2-user/games-util/Steam-1.0/.xsession b/profiles/templates/steam/desktop/Steam-1.0/.xsession similarity index 100% rename from profiles/templates/6_ac_desktop_profile/2-user/games-util/Steam-1.0/.xsession rename to profiles/templates/steam/desktop/Steam-1.0/.xsession diff --git a/profiles/templates/steam/world b/profiles/templates/steam/world new file mode 100644 index 0000000..2c7118c --- /dev/null +++ b/profiles/templates/steam/world @@ -0,0 +1,28 @@ +# Calculate env=update ac_update_sync==on path=/var/lib/portage cl_update_world==merge||cl_update_world==rebuild format=world +app-admin/logrotate +app-admin/syslog-ng +app-arch/lbzip2 +app-arch/p7zip +app-arch/pigz +app-portage/gentoolkit +app-text/tree +app-vim/colorschemes +games-util/steam-launcher +media-fonts/droid +media-sound/alsa-utils +media-sound/pulseaudio +sys-kernel/fake-sources +sys-process/cronie +x11-apps/mesa-progs +x11-apps/xrandr +x11-apps/xsetroot +x11-base/xorg-server +x11-misc/edid-data +x11-misc/sddm +x11-misc/x11vnc +x11-terms/xfce4-terminal +x11-themes/calculate-icon-theme +xfce-base/xfce4-panel +xfce-base/xfwm4 +# missing dependency for x11-drivers/nvidia-drivers +sys-devel/m4 diff --git a/profiles/templates/taiga/world b/profiles/templates/taiga/world new file mode 100644 index 0000000..5e6aca3 --- /dev/null +++ b/profiles/templates/taiga/world @@ -0,0 +1,8 @@ +# Calculate env=update ac_update_sync==on path=/var/lib/portage cl_update_world==merge||cl_update_world==rebuild format=world +app-text/tree +dev-db/postgresql:12 +dev-python/nodeenv +dev-python/setuptools +net-misc/rabbitmq-server +sys-devel/gettext +www-servers/nginx diff --git a/scripts/taiga/config.sh b/scripts/taiga/config.sh index 9fb7598..4e42959 100755 --- a/scripts/taiga/config.sh +++ b/scripts/taiga/config.sh @@ -1,12 +1,11 @@ #!/bin/bash -export PATH="/lib/rc/bin:$PATH" set -ueo pipefail +export PATH="/lib/rc/bin:$PATH" . /var/db/repos/container/scripts/functions.sh . /var/db/repos/calculate/scripts/ini.sh cd /var/calculate/www/taiga - configure_conf() { local config=$1 einfo "Setting up $config ..." @@ -15,12 +14,12 @@ configure_conf() { var=${replace[$i]} val=${replace[$i+1]} grep -qE "^([#;]\s*)?\s*['\"]?$var['\"]?\s*[:=]" $config || eerror "Parametr '$var' is not found." - sed -i -E "s|^([#;]\s*)?(\s*)(['\"]?)(${var})(['\"]?)(\s*)([:=])(\s*)?.*$|\2\3\4\5\6\7\8${val}|g" \ $config done eend } + [[ ${ini[taiga.public_register]} == 'True' ]] && public_register='true' || public_register='false' replace=( USER \'${ini[postgresql.taiga_user]}\', @@ -28,7 +27,7 @@ replace=( SECRET_KEY \"${ini[taiga.secret_key]}\" TAIGA_SITES_SCHEME \"${ini[taiga.protocol]}\" TAIGA_SITES_DOMAIN \"${ini[taiga.taiga_sites_domain]}\" - MEDIA_ROOT '/var/calculate/www/taiga/taiga-back/media' + MEDIA_ROOT \'/var/calculate/www/taiga/taiga-back/media\' DEFAULT_FROM_EMAIL \'${ini[taiga.from_email]}\' EMAIL_USE_TLS ${ini[taiga.smtp_tls]} EMAIL_USE_SSL ${ini[taiga.smtp_ssl]}