From c59f00ca2333b3e77171f673484f0e07e93c8ce6 Mon Sep 17 00:00:00 2001 From: Signal Date: Tue, 4 Aug 2020 10:21:19 +0800 Subject: [PATCH 1/2] fix that desktop file should be trusted before execution --- .../.config/pcmanfm-qt/default/settings.conf | 103 ++++++++++++++++++ labs/linux-lab | 2 +- 2 files changed, 104 insertions(+), 1 deletion(-) create mode 100644 configs/linux-lab/system/home/ubuntu/.config/pcmanfm-qt/default/settings.conf diff --git a/configs/linux-lab/system/home/ubuntu/.config/pcmanfm-qt/default/settings.conf b/configs/linux-lab/system/home/ubuntu/.config/pcmanfm-qt/default/settings.conf new file mode 100644 index 0000000..763ef8b --- /dev/null +++ b/configs/linux-lab/system/home/ubuntu/.config/pcmanfm-qt/default/settings.conf @@ -0,0 +1,103 @@ +[Behavior] +AutoSelectionDelay=600 +BookmarkOpenMethod=current_tab +ConfirmDelete=true +ConfirmTrash=false +NoUsbTrash=false +QuickExec=true +SelectNewFiles=false +SingleClick=false +UseTrash=true + +[Desktop] +BgColor=#000000 +DesktopCellMargins=@Size(3 1) +DesktopIconSize=48 +DesktopShortcuts=@Invalid() +FgColor=#ffffff +Font="Sans Serif,9,-1,5,50,0,0,0,0,0" +HideItems=false +LastSlide= +ShadowColor=#000000 +ShowHidden=false +ShowWmMenu=false +SlideShowInterval=0 +SortColumn=name +SortFolderFirst=true +SortOrder=ascending +Wallpaper=/usr/share/lxqt/themes/debian/wallpaper.svg +WallpaperDirectory= +WallpaperMode=zoom +WallpaperRandomize=false + +[FolderView] +BackupAsHidden=false +BigIconSize=48 +CustomColumnWidths=@Invalid() +FolderViewCellMargins=@Size(3 3) +HiddenColumns=@Invalid() +Mode=icon +ShadowHidden=false +ShowFilter=false +ShowFullNames=false +ShowHidden=false +SidePaneIconSize=24 +SmallIconSize=24 +SortCaseSensitive=false +SortColumn=name +SortFolderFirst=true +SortOrder=ascending +ThumbnailIconSize=128 + +[Places] +PlacesApplications=true +PlacesComputer=true +PlacesDesktop=true +PlacesHome=true +PlacesNetwork=true +PlacesRoot=true +PlacesTrash=true + +[Search] +searchContentCaseInsensitive=false +searchContentRegexp=true +searchNameCaseInsensitive=false +searchNameRegexp=true +searchRecursive=false +searchhHidden=false + +[System] +Archiver=file-roller +FallbackIconThemeName=Adwaita +OnlyUserTemplates=false +SIUnit=false +SuCommand=lxqt-sudo %s +TemplateRunApp=false +TemplateTypeOnce=false +Terminal=xterm + +[Thumbnail] +MaxThumbnailFileSize=4096 +ShowThumbnails=true +ThumbnailLocalFilesOnly=true + +[Volume] +AutoRun=true +CloseOnUnmount=true +MountOnStartup=true +MountRemovable=true + +[Window] +AlwaysShowTabs=true +FixedHeight=480 +FixedWidth=640 +LastWindowHeight=480 +LastWindowMaximized=false +LastWindowWidth=640 +PathBarButtons=true +RememberWindowSize=true +ShowMenuBar=true +ShowTabClose=true +SidePaneMode=places +SplitView=false +SplitterPos=150 diff --git a/labs/linux-lab b/labs/linux-lab index 92f23e6..0b9cc24 160000 --- a/labs/linux-lab +++ b/labs/linux-lab @@ -1 +1 @@ -Subproject commit 92f23e6fa82f34300c22439871329bf0d81b3d57 +Subproject commit 0b9cc24782fd93f541e414b5854ebba34df070c8 -- Gitee From 179b7e6500aa847b63f938c729b43e649a8735e3 Mon Sep 17 00:00:00 2001 From: Signal Date: Sat, 15 Aug 2020 00:57:26 +0800 Subject: [PATCH 2/2] change lxQt desktop to opennox window manager and remove some unnecessary packages --- configs/linux-lab/Dockerfile | 41 ++- .../home/ubuntu/.config/lxqt/panel.conf | 109 -------- .../home/ubuntu/.config/openbox/autostart | 2 + .../.config/pcmanfm-qt/default/settings.conf | 103 ------- .../rox.sourceforge.net/ROX-Filer/Options | 100 +++++++ .../rox.sourceforge.net/ROX-Filer/menus2 | 17 ++ .../rox.sourceforge.net/ROX-Filer/panels | 1 + .../rox.sourceforge.net/ROX-Filer/pb_Default | 8 + .../tint2/horizontal-light-opaque.tint2rc | 262 ++++++++++++++++++ .../system/home/ubuntu/.config/tint2/tint2rc | 257 +++++++++++++++++ .../system/home/ubuntu/Desktop/help.desktop | 2 +- .../home/ubuntu/Desktop/showdesk.desktop | 2 +- .../home/ubuntu/Desktop/showterm.desktop | 2 +- .../system/etc/supervisor/conf.d/x11vnc.conf | 4 +- 14 files changed, 671 insertions(+), 239 deletions(-) delete mode 100644 configs/linux-lab/system/home/ubuntu/.config/lxqt/panel.conf create mode 100644 configs/linux-lab/system/home/ubuntu/.config/openbox/autostart delete mode 100644 configs/linux-lab/system/home/ubuntu/.config/pcmanfm-qt/default/settings.conf create mode 100644 configs/linux-lab/system/home/ubuntu/.config/rox.sourceforge.net/ROX-Filer/Options create mode 100644 configs/linux-lab/system/home/ubuntu/.config/rox.sourceforge.net/ROX-Filer/menus2 create mode 100644 configs/linux-lab/system/home/ubuntu/.config/rox.sourceforge.net/ROX-Filer/panels create mode 100644 configs/linux-lab/system/home/ubuntu/.config/rox.sourceforge.net/ROX-Filer/pb_Default create mode 100644 configs/linux-lab/system/home/ubuntu/.config/tint2/horizontal-light-opaque.tint2rc create mode 100644 configs/linux-lab/system/home/ubuntu/.config/tint2/tint2rc diff --git a/configs/linux-lab/Dockerfile b/configs/linux-lab/Dockerfile index 02902e9..4f3d96f 100644 --- a/configs/linux-lab/Dockerfile +++ b/configs/linux-lab/Dockerfile @@ -4,39 +4,36 @@ MAINTAINER Wu Zhangjin RUN sed -i -e "s%archive.ubuntu.com%mirrors.163.com%g" /etc/apt/sources.list -RUN apt-get -y update \ - && apt-get install -y --force-yes --no-install-recommends \ - python \ - && apt-get autoclean -y \ - && apt-get autoremove -y \ - && rm -rf /var/lib/apt/lists/* \ - && rm -rf /var/cache/apt/archives/*.deb +RUN apt-get -y update -RUN apt-get -y update \ - && apt-get install -y --force-yes --no-install-recommends \ - cpio \ +RUN apt-get install -y --no-install-recommends \ + python apt-utils + +RUN apt-get install -y --no-install-recommends \ + cpio + +RUN apt-get purge --auto-remove -y lxqt lxqt-session lxqt-panel lxqt-config lxqt-branding-debian lxqt-policykit lxqt-theme-debian lxqt-system-theme lxqt-sudo lxqt-runner pavucontrol-qt lxqt-globalkeys lxqt-about lximage-qt lxqt-notificationd lxqt-qtplugin \ + && apt-get purge --auto-remove -y firefox pulseaudio ibus ibus-sunpinyin qlipper qterminal featherpad minicom qps \ + && apt-get install -y --no-install-recommends \ + tint2 rox-filer obconf midori nano + +RUN apt-get purge --auto-remove -y \ && apt-get autoclean -y \ - && apt-get autoremove -y \ && rm -rf /var/lib/apt/lists/* \ - && rm -rf /home/ubuntu/ \ - && rm -rf /var/cache/apt/archives/*.deb + && rm -rf /var/cache/apt/archives/*.deb RUN cp /etc/apt/sources.list /etc/apt/sources.list.bak + RUN sed -i -e "s%archive.ubuntu.com%mirrors.163.com%g;s%focal%trusty%g" /etc/apt/sources.list RUN apt-get -y update \ - && apt-get install -y --force-yes --no-install-recommends \ - gcc-4.4 \ - && apt-get autoclean -y \ - && apt-get autoremove -y \ - && rm -rf /var/lib/apt/lists/* \ - && rm -rf /var/cache/apt/archives/*.deb + && apt-get install -y --no-install-recommends \ + gcc-4.4 -RUN apt-get -y update \ - && apt-get install -y --force-yes --no-install-recommends \ +RUN apt-get install -y --no-install-recommends \ gcc-4.8 \ && apt-get autoclean -y \ - && apt-get autoremove -y \ + && apt-get purge --auto-remove -y \ && rm -rf /var/lib/apt/lists/* \ && rm -rf /var/cache/apt/archives/*.deb diff --git a/configs/linux-lab/system/home/ubuntu/.config/lxqt/panel.conf b/configs/linux-lab/system/home/ubuntu/.config/lxqt/panel.conf deleted file mode 100644 index 993b121..0000000 --- a/configs/linux-lab/system/home/ubuntu/.config/lxqt/panel.conf +++ /dev/null @@ -1,109 +0,0 @@ -[General] -__userfile__=true -iconTheme=Humanity -panels=panel_{755b4c17-e147-4068-ad02-c2b250d47f6b} - -[cpuload2] -alignment=Right -type=cpuload - -[desktopswitch] -alignment=Right -type=desktopswitch - -[mainmenu] -alignment=Left -ownIcon=true -showText=true -text=Linux Lab -type=mainmenu - -[networkmonitor] -alignment=Right -icon=1 -interface=br0 -type=networkmonitor - -[panel1] -alignment=0 -animation-duration=64 -background-color=@Variant(\0\0\0\x43\x1\xff\xff\0\0\0\0\x7f\x7f\0\0) -background-image= -desktop=0 -font-color=@Variant(\0\0\0\x43\x1\xff\xff\xff\xff\xff\xff\xff\xff\0\0) -hidable=true -iconSize=22 -lineCount=1 -lockPanel=false -opacity=48 -panelSize=32 -plugins=mainmenu, showdesktop, desktopswitch, taskbar, tray, statusnotifier, mount, volume, worldclock, cpuload2 -position=Top -reserve-space=true -show-delay=64 -visible-margin=true -width=80 -width-percent=true - -[panel_%7B755b4c17-e147-4068-ad02-c2b250d47f6b%7D] -alignment=0 -animation-duration=0 -background-color=@Variant(\0\0\0\x43\x1\xff\xff\xff\xff\xff\xff\xff\xff\0\0) -background-image= -desktop=0 -font-color=@Variant(\0\0\0\x43\0\xff\xff\0\0\0\0\0\0\0\0) -hidable=true -iconSize=22 -lineCount=1 -lockPanel=false -opacity=86 -panelSize=32 -plugins=mainmenu, showdesktop, spacer6, taskbar2, spacer4, tray, spacer2, worldclock, spacer, networkmonitor, spacer3, desktopswitch -position=Top -reserve-space=false -show-delay=0 -visible-margin=true -width=80 -width-percent=true - -[showdesktop] -alignment=Right -type=showdesktop - -[spacer] -alignment=Left -spaceType=invisible -type=spacer - -[spacer2] -alignment=Right -spaceType=invisible -type=spacer - -[spacer3] -alignment=Left -spaceType=invisible -type=spacer - -[spacer4] -alignment=Left -spaceType=invisible -type=spacer - -[spacer6] -alignment=Right -expandable=true -spaceType=invisible -type=spacer - -[taskbar2] -alignment=Left -type=taskbar - -[tray] -alignment=Right -type=tray - -[worldclock] -alignment=Right -type=worldclock diff --git a/configs/linux-lab/system/home/ubuntu/.config/openbox/autostart b/configs/linux-lab/system/home/ubuntu/.config/openbox/autostart new file mode 100644 index 0000000..05392be --- /dev/null +++ b/configs/linux-lab/system/home/ubuntu/.config/openbox/autostart @@ -0,0 +1,2 @@ +tint2 & +rox-filer -S & diff --git a/configs/linux-lab/system/home/ubuntu/.config/pcmanfm-qt/default/settings.conf b/configs/linux-lab/system/home/ubuntu/.config/pcmanfm-qt/default/settings.conf deleted file mode 100644 index 763ef8b..0000000 --- a/configs/linux-lab/system/home/ubuntu/.config/pcmanfm-qt/default/settings.conf +++ /dev/null @@ -1,103 +0,0 @@ -[Behavior] -AutoSelectionDelay=600 -BookmarkOpenMethod=current_tab -ConfirmDelete=true -ConfirmTrash=false -NoUsbTrash=false -QuickExec=true -SelectNewFiles=false -SingleClick=false -UseTrash=true - -[Desktop] -BgColor=#000000 -DesktopCellMargins=@Size(3 1) -DesktopIconSize=48 -DesktopShortcuts=@Invalid() -FgColor=#ffffff -Font="Sans Serif,9,-1,5,50,0,0,0,0,0" -HideItems=false -LastSlide= -ShadowColor=#000000 -ShowHidden=false -ShowWmMenu=false -SlideShowInterval=0 -SortColumn=name -SortFolderFirst=true -SortOrder=ascending -Wallpaper=/usr/share/lxqt/themes/debian/wallpaper.svg -WallpaperDirectory= -WallpaperMode=zoom -WallpaperRandomize=false - -[FolderView] -BackupAsHidden=false -BigIconSize=48 -CustomColumnWidths=@Invalid() -FolderViewCellMargins=@Size(3 3) -HiddenColumns=@Invalid() -Mode=icon -ShadowHidden=false -ShowFilter=false -ShowFullNames=false -ShowHidden=false -SidePaneIconSize=24 -SmallIconSize=24 -SortCaseSensitive=false -SortColumn=name -SortFolderFirst=true -SortOrder=ascending -ThumbnailIconSize=128 - -[Places] -PlacesApplications=true -PlacesComputer=true -PlacesDesktop=true -PlacesHome=true -PlacesNetwork=true -PlacesRoot=true -PlacesTrash=true - -[Search] -searchContentCaseInsensitive=false -searchContentRegexp=true -searchNameCaseInsensitive=false -searchNameRegexp=true -searchRecursive=false -searchhHidden=false - -[System] -Archiver=file-roller -FallbackIconThemeName=Adwaita -OnlyUserTemplates=false -SIUnit=false -SuCommand=lxqt-sudo %s -TemplateRunApp=false -TemplateTypeOnce=false -Terminal=xterm - -[Thumbnail] -MaxThumbnailFileSize=4096 -ShowThumbnails=true -ThumbnailLocalFilesOnly=true - -[Volume] -AutoRun=true -CloseOnUnmount=true -MountOnStartup=true -MountRemovable=true - -[Window] -AlwaysShowTabs=true -FixedHeight=480 -FixedWidth=640 -LastWindowHeight=480 -LastWindowMaximized=false -LastWindowWidth=640 -PathBarButtons=true -RememberWindowSize=true -ShowMenuBar=true -ShowTabClose=true -SidePaneMode=places -SplitView=false -SplitterPos=150 diff --git a/configs/linux-lab/system/home/ubuntu/.config/rox.sourceforge.net/ROX-Filer/Options b/configs/linux-lab/system/home/ubuntu/.config/rox.sourceforge.net/ROX-Filer/Options new file mode 100644 index 0000000..a7802de --- /dev/null +++ b/configs/linux-lab/system/home/ubuntu/.config/rox.sourceforge.net/ROX-Filer/Options @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/configs/linux-lab/system/home/ubuntu/.config/rox.sourceforge.net/ROX-Filer/menus2 b/configs/linux-lab/system/home/ubuntu/.config/rox.sourceforge.net/ROX-Filer/menus2 new file mode 100644 index 0000000..c17087b --- /dev/null +++ b/configs/linux-lab/system/home/ubuntu/.config/rox.sourceforge.net/ROX-Filer/menus2 @@ -0,0 +1,17 @@ +; rox-filer GtkAccelMap rc-file -*- scheme -*- +; this file is an automated accelerator map dump +; +; (gtk_accel_path "/" "") +; (gtk_accel_path "/File/Set Icon..." "") +; (gtk_accel_path "/Remove Item(s)" "") +; (gtk_accel_path "/Edit Item" "") +; (gtk_accel_path "/ROX-Filer/" "") +; (gtk_accel_path "/ROX-Filer/Show Help Files" "h") +; (gtk_accel_path "/File/Set Run Action..." "") +; (gtk_accel_path "/File/Properties" "") +; (gtk_accel_path "/ROX-Filer/Home Directory" "") +; (gtk_accel_path "/ROX-Filer/Options..." "") +; (gtk_accel_path "/ROX-Filer/About ROX-Filer..." "") +; (gtk_accel_path "/ROX-Filer/Manual" "") +; (gtk_accel_path "/File/Shift Open" "") +; (gtk_accel_path "/Show Location" "") diff --git a/configs/linux-lab/system/home/ubuntu/.config/rox.sourceforge.net/ROX-Filer/panels b/configs/linux-lab/system/home/ubuntu/.config/rox.sourceforge.net/ROX-Filer/panels new file mode 100644 index 0000000..697bb66 --- /dev/null +++ b/configs/linux-lab/system/home/ubuntu/.config/rox.sourceforge.net/ROX-Filer/panels @@ -0,0 +1 @@ +Default diff --git a/configs/linux-lab/system/home/ubuntu/.config/rox.sourceforge.net/ROX-Filer/pb_Default b/configs/linux-lab/system/home/ubuntu/.config/rox.sourceforge.net/ROX-Filer/pb_Default new file mode 100644 index 0000000..85edd7c --- /dev/null +++ b/configs/linux-lab/system/home/ubuntu/.config/rox.sourceforge.net/ROX-Filer/pb_Default @@ -0,0 +1,8 @@ + + + /home/ubuntu/Desktop/showterm.desktop + /home/ubuntu/Desktop/showdesk.desktop + /home/ubuntu/Desktop/lab.desktop + /home/ubuntu/Desktop/help.desktop + /home/ubuntu + diff --git a/configs/linux-lab/system/home/ubuntu/.config/tint2/horizontal-light-opaque.tint2rc b/configs/linux-lab/system/home/ubuntu/.config/tint2/horizontal-light-opaque.tint2rc new file mode 100644 index 0000000..a9478c3 --- /dev/null +++ b/configs/linux-lab/system/home/ubuntu/.config/tint2/horizontal-light-opaque.tint2rc @@ -0,0 +1,262 @@ +#---- Generated by tint2conf 0254 ---- +# See https://gitlab.com/o9000/tint2/wikis/Configure for +# full documentation of the configuration options. +#------------------------------------- +# Gradients +#------------------------------------- +# Backgrounds +# Background 1: Panel +rounded = 0 +border_width = 1 +border_sides = TBLR +border_content_tint_weight = 0 +background_content_tint_weight = 0 +background_color = #eeeeee 100 +border_color = #bbbbbb 100 +background_color_hover = #eeeeee 100 +border_color_hover = #bbbbbb 100 +background_color_pressed = #eeeeee 100 +border_color_pressed = #bbbbbb 100 + +# Background 2: Default task, Iconified task +rounded = 5 +border_width = 1 +border_sides = TBLR +border_content_tint_weight = 0 +background_content_tint_weight = 0 +background_color = #eeeeee 100 +border_color = #eeeeee 100 +background_color_hover = #eeeeee 100 +border_color_hover = #cccccc 100 +background_color_pressed = #cccccc 100 +border_color_pressed = #cccccc 100 + +# Background 3: Active task +rounded = 5 +border_width = 1 +border_sides = TBLR +border_content_tint_weight = 0 +background_content_tint_weight = 0 +background_color = #dddddd 100 +border_color = #999999 100 +background_color_hover = #eeeeee 100 +border_color_hover = #aaaaaa 100 +background_color_pressed = #cccccc 100 +border_color_pressed = #999999 100 + +# Background 4: Urgent task +rounded = 5 +border_width = 1 +border_sides = TBLR +border_content_tint_weight = 0 +background_content_tint_weight = 0 +background_color = #aa4400 100 +border_color = #aa7733 100 +background_color_hover = #aa4400 100 +border_color_hover = #aa7733 100 +background_color_pressed = #aa4400 100 +border_color_pressed = #aa7733 100 + +# Background 5: Tooltip +rounded = 2 +border_width = 1 +border_sides = TBLR +border_content_tint_weight = 0 +background_content_tint_weight = 0 +background_color = #ffffaa 100 +border_color = #999999 100 +background_color_hover = #ffffaa 100 +border_color_hover = #999999 100 +background_color_pressed = #ffffaa 100 +border_color_pressed = #999999 100 + +# Background 6: Inactive desktop name +rounded = 2 +border_width = 1 +border_sides = TBLR +border_content_tint_weight = 0 +background_content_tint_weight = 0 +background_color = #eeeeee 100 +border_color = #cccccc 100 +background_color_hover = #eeeeee 100 +border_color_hover = #cccccc 100 +background_color_pressed = #eeeeee 100 +border_color_pressed = #cccccc 100 + +# Background 7: Active desktop name +rounded = 2 +border_width = 1 +border_sides = TBLR +border_content_tint_weight = 0 +background_content_tint_weight = 0 +background_color = #dddddd 100 +border_color = #999999 100 +background_color_hover = #dddddd 100 +border_color_hover = #999999 100 +background_color_pressed = #dddddd 100 +border_color_pressed = #999999 100 + +# Background 8: Systray +rounded = 3 +border_width = 0 +border_sides = TBLR +border_content_tint_weight = 0 +background_content_tint_weight = 0 +background_color = #dddddd 100 +border_color = #cccccc 100 +background_color_hover = #dddddd 100 +border_color_hover = #cccccc 100 +background_color_pressed = #dddddd 100 +border_color_pressed = #cccccc 100 + +#------------------------------------- +# Panel +panel_items = LTSC +panel_size = 100% 32 +panel_margin = 0 0 +panel_padding = 4 2 4 +panel_background_id = 1 +wm_menu = 1 +panel_dock = 0 +panel_pivot_struts = 0 +panel_position = bottom center horizontal +panel_layer = normal +panel_monitor = all +panel_shrink = 0 +autohide = 0 +autohide_show_timeout = 0 +autohide_hide_timeout = 0.5 +autohide_height = 2 +strut_policy = follow_size +panel_window_name = tint2 +disable_transparency = 0 +mouse_effects = 1 +font_shadow = 0 +mouse_hover_icon_asb = 100 0 10 +mouse_pressed_icon_asb = 100 0 0 +scale_relative_to_dpi = 0 +scale_relative_to_screen_height = 0 + +#------------------------------------- +# Taskbar +taskbar_mode = single_desktop +taskbar_hide_if_empty = 0 +taskbar_padding = 0 0 2 +taskbar_background_id = 0 +taskbar_active_background_id = 0 +taskbar_name = 1 +taskbar_hide_inactive_tasks = 0 +taskbar_hide_different_monitor = 0 +taskbar_hide_different_desktop = 0 +taskbar_always_show_all_desktop_tasks = 0 +taskbar_name_padding = 6 3 +taskbar_name_background_id = 6 +taskbar_name_active_background_id = 7 +taskbar_name_font = sans bold 9 +taskbar_name_font_color = #222222 100 +taskbar_name_active_font_color = #222222 100 +taskbar_distribute_size = 1 +taskbar_sort_order = none +task_align = left + +#------------------------------------- +# Task +task_text = 1 +task_icon = 1 +task_centered = 1 +urgent_nb_of_blink = 100000 +task_maximum_size = 140 35 +task_padding = 4 3 4 +task_font = sans 8 +task_tooltip = 1 +task_thumbnail = 0 +task_thumbnail_size = 210 +task_font_color = #222222 100 +task_icon_asb = 100 0 0 +task_background_id = 2 +task_active_background_id = 3 +task_urgent_background_id = 4 +task_iconified_background_id = 2 +mouse_left = toggle_iconify +mouse_middle = none +mouse_right = close +mouse_scroll_up = prev_task +mouse_scroll_down = next_task + +#------------------------------------- +# System tray (notification area) +systray_padding = 4 0 2 +systray_background_id = 8 +systray_sort = ascending +systray_icon_size = 22 +systray_icon_asb = 100 0 0 +systray_monitor = 1 +systray_name_filter = + +#------------------------------------- +# Launcher +launcher_padding = 0 0 2 +launcher_background_id = 0 +launcher_icon_background_id = 0 +launcher_icon_size = 22 +launcher_icon_asb = 100 0 0 +launcher_icon_theme_override = 0 +startup_notifications = 1 +launcher_tooltip = 1 +launcher_item_app = tint2conf.desktop +launcher_item_app = firefox.desktop +launcher_item_app = iceweasel.desktop +launcher_item_app = chromium-browser.desktop +launcher_item_app = google-chrome.desktop +launcher_item_app = x-terminal-emulator.desktop + +#------------------------------------- +# Clock +time1_format = %H:%M +time2_format = %A %d %B +time1_font = sans bold 8 +time1_timezone = +time2_timezone = +time2_font = sans 7 +clock_font_color = #222222 100 +clock_padding = 1 0 +clock_background_id = 0 +clock_tooltip = +clock_tooltip_timezone = +clock_lclick_command = zenity --calendar --text "" +clock_rclick_command = orage +clock_mclick_command = +clock_uwheel_command = +clock_dwheel_command = + +#------------------------------------- +# Battery +battery_tooltip = 1 +battery_low_status = 10 +battery_low_cmd = xmessage 'tint2: Battery low!' +battery_full_cmd = +bat1_font = sans 8 +bat2_font = sans 6 +battery_font_color = #222222 100 +bat1_format = +bat2_format = +battery_padding = 1 0 +battery_background_id = 0 +battery_hide = 101 +battery_lclick_command = +battery_rclick_command = +battery_mclick_command = +battery_uwheel_command = +battery_dwheel_command = +ac_connected_cmd = +ac_disconnected_cmd = + +#------------------------------------- +# Tooltip +tooltip_show_timeout = 0.5 +tooltip_hide_timeout = 0.1 +tooltip_padding = 2 2 +tooltip_background_id = 5 +tooltip_font_color = #222222 100 +tooltip_font = sans 9 + diff --git a/configs/linux-lab/system/home/ubuntu/.config/tint2/tint2rc b/configs/linux-lab/system/home/ubuntu/.config/tint2/tint2rc new file mode 100644 index 0000000..acee281 --- /dev/null +++ b/configs/linux-lab/system/home/ubuntu/.config/tint2/tint2rc @@ -0,0 +1,257 @@ +#---- Generated by tint2conf a7aa ---- +# See https://gitlab.com/o9000/tint2/wikis/Configure for +# full documentation of the configuration options. +#------------------------------------- +# Gradients +#------------------------------------- +# Backgrounds +# Background 1: Panel +rounded = 0 +border_width = 1 +border_sides = TBLR +border_content_tint_weight = 0 +background_content_tint_weight = 0 +background_color = #eeeeee 100 +border_color = #bbbbbb 100 +background_color_hover = #eeeeee 100 +border_color_hover = #bbbbbb 100 +background_color_pressed = #eeeeee 100 +border_color_pressed = #bbbbbb 100 + +# Background 2: Default task, Iconified task +rounded = 5 +border_width = 1 +border_sides = TBLR +border_content_tint_weight = 0 +background_content_tint_weight = 0 +background_color = #eeeeee 100 +border_color = #eeeeee 100 +background_color_hover = #eeeeee 100 +border_color_hover = #cccccc 100 +background_color_pressed = #cccccc 100 +border_color_pressed = #cccccc 100 + +# Background 3: Active task +rounded = 5 +border_width = 1 +border_sides = TBLR +border_content_tint_weight = 0 +background_content_tint_weight = 0 +background_color = #dddddd 100 +border_color = #999999 100 +background_color_hover = #eeeeee 100 +border_color_hover = #aaaaaa 100 +background_color_pressed = #cccccc 100 +border_color_pressed = #999999 100 + +# Background 4: Urgent task +rounded = 5 +border_width = 1 +border_sides = TBLR +border_content_tint_weight = 0 +background_content_tint_weight = 0 +background_color = #aa4400 100 +border_color = #aa7733 100 +background_color_hover = #aa4400 100 +border_color_hover = #aa7733 100 +background_color_pressed = #aa4400 100 +border_color_pressed = #aa7733 100 + +# Background 5: Tooltip +rounded = 2 +border_width = 1 +border_sides = TBLR +border_content_tint_weight = 0 +background_content_tint_weight = 0 +background_color = #ffffaa 100 +border_color = #999999 100 +background_color_hover = #ffffaa 100 +border_color_hover = #999999 100 +background_color_pressed = #ffffaa 100 +border_color_pressed = #999999 100 + +# Background 6: Inactive desktop name +rounded = 2 +border_width = 1 +border_sides = TBLR +border_content_tint_weight = 0 +background_content_tint_weight = 0 +background_color = #eeeeee 100 +border_color = #cccccc 100 +background_color_hover = #eeeeee 100 +border_color_hover = #cccccc 100 +background_color_pressed = #eeeeee 100 +border_color_pressed = #cccccc 100 + +# Background 7: Active desktop name +rounded = 2 +border_width = 1 +border_sides = TBLR +border_content_tint_weight = 0 +background_content_tint_weight = 0 +background_color = #dddddd 100 +border_color = #999999 100 +background_color_hover = #dddddd 100 +border_color_hover = #999999 100 +background_color_pressed = #dddddd 100 +border_color_pressed = #999999 100 + +# Background 8: Systray +rounded = 3 +border_width = 0 +border_sides = TBLR +border_content_tint_weight = 0 +background_content_tint_weight = 0 +background_color = #dddddd 100 +border_color = #cccccc 100 +background_color_hover = #dddddd 100 +border_color_hover = #cccccc 100 +background_color_pressed = #dddddd 100 +border_color_pressed = #cccccc 100 + +#------------------------------------- +# Panel +panel_items = LTC +panel_size = 100% 32 +panel_margin = 0 0 +panel_padding = 4 2 4 +panel_background_id = 1 +wm_menu = 1 +panel_dock = 0 +panel_pivot_struts = 0 +panel_position = top center horizontal +panel_layer = normal +panel_monitor = all +panel_shrink = 0 +autohide = 0 +autohide_show_timeout = 0 +autohide_hide_timeout = 0.5 +autohide_height = 2 +strut_policy = follow_size +panel_window_name = tint2 +disable_transparency = 0 +mouse_effects = 1 +font_shadow = 0 +mouse_hover_icon_asb = 100 0 10 +mouse_pressed_icon_asb = 100 0 0 +scale_relative_to_dpi = 0 +scale_relative_to_screen_height = 0 + +#------------------------------------- +# Taskbar +taskbar_mode = single_desktop +taskbar_hide_if_empty = 0 +taskbar_padding = 0 0 2 +taskbar_background_id = 0 +taskbar_active_background_id = 0 +taskbar_name = 1 +taskbar_hide_inactive_tasks = 0 +taskbar_hide_different_monitor = 0 +taskbar_hide_different_desktop = 0 +taskbar_always_show_all_desktop_tasks = 0 +taskbar_name_padding = 6 3 +taskbar_name_background_id = 6 +taskbar_name_active_background_id = 7 +taskbar_name_font = sans bold 9 +taskbar_name_font_color = #222222 100 +taskbar_name_active_font_color = #222222 100 +taskbar_distribute_size = 1 +taskbar_sort_order = none +task_align = left + +#------------------------------------- +# Task +task_text = 1 +task_icon = 1 +task_centered = 1 +urgent_nb_of_blink = 100000 +task_maximum_size = 140 35 +task_padding = 4 3 4 +task_font = sans 8 +task_tooltip = 1 +task_thumbnail = 0 +task_thumbnail_size = 210 +task_font_color = #222222 100 +task_icon_asb = 100 0 0 +task_background_id = 2 +task_active_background_id = 3 +task_urgent_background_id = 4 +task_iconified_background_id = 2 +mouse_left = toggle_iconify +mouse_middle = none +mouse_right = close +mouse_scroll_up = prev_task +mouse_scroll_down = next_task + +#------------------------------------- +# System tray (notification area) +systray_padding = 4 0 2 +systray_background_id = 8 +systray_sort = ascending +systray_icon_size = 22 +systray_icon_asb = 100 0 0 +systray_monitor = 1 +systray_name_filter = + +#------------------------------------- +# Launcher +launcher_padding = 0 0 2 +launcher_background_id = 0 +launcher_icon_background_id = 0 +launcher_icon_size = 22 +launcher_icon_asb = 100 0 0 +launcher_icon_theme = ubuntu-mono-dark +launcher_icon_theme_override = 0 +startup_notifications = 1 +launcher_tooltip = 1 + +#------------------------------------- +# Clock +time1_format = %H:%M +time2_format = %A %d %B +time1_font = sans bold 8 +time1_timezone = +time2_timezone = +time2_font = sans 7 +clock_font_color = #222222 100 +clock_padding = 1 0 +clock_background_id = 0 +clock_tooltip = +clock_tooltip_timezone = +clock_lclick_command = zenity --calendar --text "" +clock_rclick_command = orage +clock_mclick_command = +clock_uwheel_command = +clock_dwheel_command = + +#------------------------------------- +# Battery +battery_tooltip = 1 +battery_low_status = 10 +battery_low_cmd = xmessage 'tint2: Battery low!' +battery_full_cmd = +bat1_font = sans 8 +bat2_font = sans 6 +battery_font_color = #222222 100 +bat1_format = +bat2_format = +battery_padding = 1 0 +battery_background_id = 0 +battery_hide = 101 +battery_lclick_command = +battery_rclick_command = +battery_mclick_command = +battery_uwheel_command = +battery_dwheel_command = +ac_connected_cmd = +ac_disconnected_cmd = + +#------------------------------------- +# Tooltip +tooltip_show_timeout = 0.5 +tooltip_hide_timeout = 0.1 +tooltip_padding = 2 2 +tooltip_background_id = 5 +tooltip_font_color = #222222 100 +tooltip_font = sans 9 + diff --git a/configs/linux-lab/system/home/ubuntu/Desktop/help.desktop b/configs/linux-lab/system/home/ubuntu/Desktop/help.desktop index 3c41c11..0fb8880 100644 --- a/configs/linux-lab/system/home/ubuntu/Desktop/help.desktop +++ b/configs/linux-lab/system/home/ubuntu/Desktop/help.desktop @@ -2,6 +2,6 @@ Encoding=UTF-8 Name=Help Page Comment=Project Home page -Exec=/usr/bin/chromium-browser http://tinylab.org/linux-lab/ +Exec=/usr/bin/midori http://tinylab.org/linux-lab/ Icon=/usr/share/pixmaps/chromium-browser.png Type=Application diff --git a/configs/linux-lab/system/home/ubuntu/Desktop/showdesk.desktop b/configs/linux-lab/system/home/ubuntu/Desktop/showdesk.desktop index 5388f6e..dbd2801 100644 --- a/configs/linux-lab/system/home/ubuntu/Desktop/showdesk.desktop +++ b/configs/linux-lab/system/home/ubuntu/Desktop/showdesk.desktop @@ -2,6 +2,6 @@ Encoding=UTF-8 Name=Desktop Demo Comment=Demonstrate the usage of Linux Lab: http://tinylab.org/linux-lab/ -Exec=/usr/bin/chromium-browser http://showdesk.io/7977891c1d24e38dffbea1b8550ffbb8/ +Exec=/usr/bin/midori http://showdesk.io/7977891c1d24e38dffbea1b8550ffbb8/ Icon=/usr/share/pixmaps/chromium-browser.png Type=Application diff --git a/configs/linux-lab/system/home/ubuntu/Desktop/showterm.desktop b/configs/linux-lab/system/home/ubuntu/Desktop/showterm.desktop index 6426a5b..ded4d66 100644 --- a/configs/linux-lab/system/home/ubuntu/Desktop/showterm.desktop +++ b/configs/linux-lab/system/home/ubuntu/Desktop/showterm.desktop @@ -2,6 +2,6 @@ Encoding=UTF-8 Name=Terminal Demo Comment=Demonstrate the usage of Linux Lab: http://tinylab.org/linux-lab/ -Exec=/usr/bin/chromium-browser http://showterm.io/6fb264246580281d372c6 +Exec=/usr/bin/midori http://showterm.io/6fb264246580281d372c6 Icon=/usr/share/pixmaps/chromium-browser.png Type=Application diff --git a/tools/system/etc/supervisor/conf.d/x11vnc.conf b/tools/system/etc/supervisor/conf.d/x11vnc.conf index f4d2815..c6f678e 100644 --- a/tools/system/etc/supervisor/conf.d/x11vnc.conf +++ b/tools/system/etc/supervisor/conf.d/x11vnc.conf @@ -12,13 +12,13 @@ redirect_stderr=true [program:lxsession] priority=15 directory=/home/ubuntu -command=/usr/bin/lxsession +command=/usr/bin/openbox-session user=ubuntu autostart=true autorestart=true stopsignal=QUIT environment=DISPLAY=":1",HOME="/home/ubuntu",SHELL="/bin/bash" -stdout_logfile=/var/log/lxsession.log +stdout_logfile=/var/log/openbox-session.log redirect_stderr=true [program:x11vnc] -- Gitee