Merge branch 'dev' into dev-stable

Author: Hayao0819

channels/cinnamon/airootfs.any/etc/bash.bashrc

@@ -14,3 +14,4 @@ PS1='\u@\h:\w\$ '
 [[ -f /etc/bash_functions ]] && source /etc/bash_functions
 
 export EDITOR=nano
+export QT_QPA_PLATFORMTHEME=qt5ct

channels/cinnamon/airootfs.any/etc/skel/.config/qt5ct/qt5ct.conf

@@ -0,0 +1,28 @@
+[Appearance]
+color_scheme_path=/usr/share/qt5ct/colors/airy.conf
+custom_palette=false
+icon_theme=Inverse-blue-dark
+standard_dialogs=default
+style=gtk2
+
+[Fonts]
+fixed="@Variant(\0\0\0@\0\0\0,\0S\0\x61\0u\0\x63\0\x65\0\x43\0o\0\x64\0\x65\0P\0r\0o\0 \0N\0\x65\0r\0\x64\0 \0\x46\0o\0n\0t@(\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\f\x11)"
+general=@Variant(\0\0\0@\0\0\0 \0N\0o\0t\0o\0 \0S\0\x61\0n\0s\0 \0\x43\0J\0K\0 \0J\0P@(\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10)
+
+[Interface]
+activate_item_on_single_click=1
+buttonbox_layout=0
+cursor_flash_time=1000
+dialog_buttons_have_icons=1
+double_click_interval=400
+gui_effects=@Invalid()
+keyboard_scheme=2
+menus_have_icons=true
+show_shortcuts_in_context_menus=true
+stylesheets=@Invalid()
+toolbutton_style=4
+underline_shortcut=1
+wheel_scroll_lines=3
+
+[SettingsWindow]
+geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\x84\0\0\0\x31\0\0\x3\x66\0\0\x2\xff\0\0\0\x86\0\0\0M\0\0\x3\x64\0\0\x2\xfd\0\0\0\0\0\0\0\0\x4\0\0\0\0\x86\0\0\0M\0\0\x3\x64\0\0\x2\xfd)

channels/cinnamon/airootfs.any/etc/skel/.profile

@@ -0,0 +1 @@
+export QT_QPA_PLATFORMTHEME="qt5ct"

channels/cinnamon/airootfs.any/etc/zsh/zshenv

@@ -1 +1,2 @@
 export EDITOR=nano
+export QT_QPA_PLATFORMTHEME=qt5ct

channels/cinnamon/packages.i686/gtk-icon-theme.i686

@@ -16,3 +16,7 @@ inverse-icon-theme-blue-git
 
 # theme
 arc-gtk-theme
+
+# Qt config
+qt5ct
+qt5-styleplugins

channels/cinnamon/packages.x86_64/gtk-icon-theme.x86_64

@@ -16,3 +16,7 @@ inverse-icon-theme-blue-git
 
 # theme
 arc-gtk-theme
+
+# Qt config
+qt5ct
+qt5-styleplugins

channels/i3/README.md

@@ -112,7 +112,8 @@ i3wmには多数の便利なショートカットがあります。ショート
 - 画面の解像度など、システムの設定を変更したい  
 前述の設定マネージャを使用してください
 - 壁紙を変えたい  
-`~/.config/i3/config` を編集し、16行目 `exec --no-startup-id "feh --bg-fill ***` の***の位置に、壁紙のパスを記述してください
+ランチャーなどからnitrogenを起動し，お好みの画像に変更してください  
+壁紙を追加したい場合は右下のボタンから設定を開き，壁紙があるフォルダを追加してください
 - 操作方法が表示されたウィンドウを非表示にしたい  
 `~/.config/conky` を削除する、もしくは `~/.config/i3/config` を編集し、42行目 (`exec --no-startup-id conky`) を削除することで無効に出来ます
 
@@ -223,9 +224,10 @@ If you want to add some customization, please refer to this section.
 Use the Theme Manager described above
 - Change the system settings, such as screen resolution, etc.  
 Use system manager as described above
-- Change the wallpaper.  
-Edit `~/.config/i3/config` , and add line 16 `exec --no- startup-id "feh --bg-fill ***` with the path to the wallpaper in the *** position.
-- Hide the window with the operating instructions.  
+- Change the wallpaper  
+Run nitrogen from the launcher or terminal, and select the image to one you like.  
+If you want to add a wallpaper, click the button on bottom right to open the settings window, and add the folder where the wallpaper is located.
+- Hide the window with the operating instructions  
 Remove `~/.config/conky` , or edit `~/.config/i3/config` and remove line 42 (`exec --no-startup-id conky `)
 
 

channels/i3/airootfs.any/etc/skel/.config/i3/config

@@ -13,7 +13,7 @@
 # Appearance
 
 # wallpaper
-exec --no-startup-id "feh --bg-fill /usr/share/backgrounds/alter-jiju.png"
+exec_always --no-startup-id nitrogen --restore
 
 # font
 font pango:Noto Sans 9
@@ -30,14 +30,13 @@ for_window [class="^.*"] border pixel 2
 
 
 # automatic-startup
-exec_always --no-startup-id /usr/lib/mate-polkit/polkit-mate-authentication-agent-1
 exec_always --no-startup-id $HOME/.config/polybar/launch.sh
-exec_always --no-startup-id light-locker
-exec_always --no-startup-id compton
-exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
-exec --no-startup-id nm-applet
+exec --no-startup-id /usr/lib/mate-polkit/polkit-mate-authentication-agent-1
 exec --no-startup-id xfce4-clipman
+exec --no-startup-id light-locker
 exec --no-startup-id dex -ae i3
+exec --no-startup-id nm-applet
+exec --no-startup-id compton
 exec --no-startup-id dunst
 exec --no-startup-id conky
 exec --no-startup-id fcitx

channels/i3/airootfs.any/etc/skel/.config/nitrogen/bg-saved.cfg

@@ -0,0 +1,15 @@
+# ---------------------------------------------
+#  Alter Linux i3wm edition
+#  background config file
+#
+#  Watasuke
+#  Twitter: @Watasuke102
+#  Email  : Watasuke102@gmail.com
+#
+#  (c) 2020 Fascode Network.
+# ---------------------------------------------
+
+[xin_-1]
+file=/usr/share/backgrounds/alter-jiju.png
+mode=3
+bgcolor=#000000

channels/i3/airootfs.any/etc/skel/.config/nitrogen/nitrogen.cfg

@@ -0,0 +1,23 @@
+# ---------------------------------------------
+#  Alter Linux i3wm edition
+#  background config file
+#
+#  Watasuke
+#  Twitter: @Watasuke102
+#  Email  : Watasuke102@gmail.com
+#
+#  (c) 2020 Fascode Network.
+# ---------------------------------------------
+
+[geometry]
+posx=0
+posy=0
+sizex=520
+sizey=500
+
+[nitrogen]
+view=icon
+recurse=true
+sort=alpha
+icon_caps=false
+dirs=/usr/share/backgrounds;