Merge branch 'dev' into dev-stable

Author: Hayao0819

channels/i3/README.md

@@ -225,7 +225,7 @@ Use the Theme Manager described above
 - Change the system settings, such as screen resolution, etc.  
 Use system manager as described above
 - Change the wallpaper  
-Run nitrogen from the launcher or terminal, and select the image to one you like.  
+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/bash.bashrc

@@ -0,0 +1,4 @@
+# /etc/bash.bashrc
+
+export EDITOR=nano
+export QT_QPA_PLATFORMTHEME=qt5ct

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

@@ -9,8 +9,6 @@
 #
 
 # Alias
-unalias lsd
-unalias ls
 alias lsd='/usr/bin/lsd'
 
 

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

@@ -0,0 +1,30 @@
+# Qt5ct config file
+
+[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/i3/airootfs.any/etc/skel/.profile

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

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

@@ -121,3 +121,5 @@ else
 
     install_powerline_precmd
 fi
+
+export TERMINAL=/usr/bin/sakura

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

@@ -0,0 +1,4 @@
+# /etc/zsh/zshenv
+
+export EDITOR=nano
+export QT_QPA_PLATFORMTHEME=qt5ct

channels/i3/airootfs.any/usr/share/doc/alter-i3/Document.html

@@ -752,7 +752,7 @@ <h2 id="how-to-change-settings">How to change settings</h2>
 <li>Change the system settings, such as screen resolution, etc.<br>
 Use system manager as described above</li>
 <li>Change the wallpaper<br>
-Run nitrogen from the launcher or terminal, and select the image to one you like.<br>
+Run <code>nitrogen</code> from the launcher or terminal, and select the image to one you like.<br>
 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.</li>
 <li>Hide the window with the operating instructions<br>
 Remove <code>~/.config/conky</code> , or edit <code>~/.config/i3/config</code> and remove line 42 (<code>exec --no-startup-id conky </code>)</li>

channels/i3/packages.i686/i3.i686

@@ -55,3 +55,7 @@ alterlinux-i3-manager
 
 # autostart
 dex
+
+# Qt config
+qt5ct
+qt5-styleplugins

channels/i3/packages.x86_64/i3.x86_64

@@ -55,3 +55,6 @@ alterlinux-i3-manager
 
 # autostart
 dex
+
+# Qt config
+qt5ct