Merge branch 'dev' into dev-stable

Author: Hayao0819

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

@@ -8,6 +8,12 @@
 # Write the alias here.
 #
 
+# Alias
+unalias lsd
+unalias ls
+alias lsd='/usr/bin/lsd'
+
+
 # lsd-control
 [[ -f /usr/local/lib/lsd-alias ]] && source /usr/local/lib/lsd-alias
 

channels/i3/airootfs.any/etc/skel/.config/conky/conky-live.conf

@@ -34,7 +34,7 @@ conky.config = {
     cpu_avg_samples = 2,
     use_xft = true,
 }
-AからBを取り除く
+
 conky.text = [[
 ${color0}Open terminal      ${color1} : ${color2}mod+Enter
 ${color0}Kill active window ${color1} : ${color2}mod+Shift+Q

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

@@ -9,10 +9,6 @@
 # (c) 2020 Fascode Network.
 
 
-# Alias
-[[ -f .aliases ]] && source .aliases
-
-
 # Completion
 [ -e /usr/local/share/zsh-completions ] && fpath=(/usr/local/share/zsh-completions $fpath)
 autoload -U compinit
@@ -111,3 +107,6 @@ fi
 # Like fish prompt
 source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
 source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+
+# Alias
+[[ -f .aliases ]] && source .aliases