fix(mailsync): incorrect indent

This
1. Sorts the aliases
2. Removes a couple of comments that havent been used in a long time
3. Shortens paths to include ~/ instead of /home/flyingstitchman

config/hypr/hyprland.conf

@@ -54,6 +54,7 @@ decoration {
     noise=.03
     vibrancy=.2
     vibrancy_darkness=0.5
+    input_methods=true
     }
 
   # Other

config/zshrc

@@ -13,36 +13,29 @@ export XDG_DATA_HOME="$HOME/.local/share"
 export XDG_STATE_HOME="$HOME/.local/state"
 
 # Aliases
-alias kon="ncmpcpp -b ~/.config/ncmpcpp/bindings"
+alias c='clear'
-alias myip="curl ifconfig.me"
+alias cd="z"
+alias find="fd"
+alias gdb="gdb -x /usr/share/pwndbg/gdbinit.py" #pwntools for GDB
 alias ghidra="_JAVA_AWT_WM_NONREPARENTING=1 ghidra"
-alias ls='eza'
+alias icat="kitty +kitten icat"
+alias imv="imv -b aa77bb"
+alias kon="ncmpcpp -b ~/.config/ncmpcpp/bindings"
 alias l='ls -l'
 alias la='ls -la'
+alias lg='lazygit'
 alias ll='ls -l'
 alias lla='ls -la'
-alias v="nvim"   # Launch neovim with 'v'
+alias ls='eza'
-alias mountUSB="mount /home/flyingstitchman/ExternalDrive" # Automagically mount and unmount my flashdrive
-alias umountUSB="umount /home/flyingstitchman/ExternalDrive"
-alias unityAvi="/home/flyingstitchman/Documents/Unity/Editors/2019.4.31f1/Editor/Unity -projectPath ~/ExternalDrive/Unity\ Projects/Avatar\ 3.0\ 2019"
-alias ssh="TERM=xterm ssh"   #Fix foot issue in ssh
-alias gdb="gdb -x /usr/share/pwndbg/gdbinit.py" #pwntools for GDB
 alias make="make -j 20"
-alias cd="z"
+alias mountUSB="mount ~/ExternalDrive" # Automagically mount and unmount my flashdrive
-alias imv="imv -b aa77bb"
+alias myip="curl ifconfig.me"
-alias find="fd"
-alias tree="eza --tree"
-alias icat="kitty +kitten icat"
 alias qsus="NIXPKGS_ALLOW_UNFREE=1 nix-shell -p quartus-prime-lite -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/fe7ab74a86d78ba00d144aa7a8da8c71a200c563.tar.gz"
-
+alias ssh="TERM=xterm ssh"   #Fix foot issue in ssh
-# thanks fire :3
+alias tree="eza --tree"
-alias c='clear'
+alias umountUSB="umount ~/ExternalDrive"
-alias lg='lazygit'
+alias unityAvi="~/Documents/Unity/Editors/2019.4.31f1/Editor/Unity -projectPath ~/ExternalDrive/Unity\ Projects/Avatar\ 3.0\ 2019"
-# Future fire, this is for a meme.
+alias v="nvim"   # Launch neovim with 'v'
-nya() {
-   args=$(echo $@ | sed 's/nya/git/g')
-   git $args 2>&1 >/dev/null | sed 's/git/nya/g' | sed 's/GIT/NYA/g' | sed 's/Git/Nya/g'
-}
 
 # Automatically get new programs for autocompletion
 
@@ -102,17 +95,10 @@ compinit
 # End of lines added by compinstall
 eval "$(zoxide init zsh)"
 
-
-# Default Programs
-export EDITOR=nvim
-
 # Needed for pam_gnupg for ssh keys TO DO
 #export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
 export PATH="${PATH}:/home/flyingstitchman/.cargo/bin"
 
-# Fcitx for Xwayland
-XMODIFIERS=@im=fcitx
-
  # Clean Up
 export QT_QPA_PLATFORM=wayland
 export QT_QPA_PLATFORMTHEME=qt5ct
@@ -138,6 +124,8 @@ export CARGO_HOME="$XDG_DATA_HOME"/cargo
 
 
 alias dosbox="dosbox -conf $XDG_CONFIG_HOME/dosbox/dosbox.conf"
+
+# Nixos Rebuilding
 alias rbs="reconfig switch"
 alias rbb="reconfig build"
 
@@ -147,11 +135,10 @@ reconfig() {
 
 # Autostart Hyprland after all environmental Variables have been declared
 if [ -z $DISPLAY ] && [ "$(tty)" = "/dev/tty1" ]; then
-#  export WLR_DRM_DEVICES=/dev/dri/card0
   exec Hyprland
 fi
 
-export QSYS_ROOTDIR="/home/flyingstitchman/.cache/paru/clone/quartus-free/pkg/quartus-free-quartus/opt/intelFPGA/21.1/quartus/sopc_builder/bin"
+export QSYS_ROOTDIR="~/.cache/paru/clone/quartus-free/pkg/quartus-free-quartus/opt/intelFPGA/21.1/quartus/sopc_builder/bin"
 
 # Nix Direnv Support
 eval "$(direnv hook zsh)"

packages/default.nix

@@ -157,6 +157,8 @@ in
     fonts.packages = lib.attrVals [
       "noto-fonts"
       "noto-fonts-emoji"
+      "noto-fonts-cjk-sans"
+      "noto-fonts-cjk-serif"
       "liberation_ttf"
       "ipafont"
     ] pkgs ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts);

users/stitchynyan/default.nix

@@ -68,10 +68,13 @@
     inputMethod = {
       enable = true;
       type = "fcitx5";
-      fcitx5.addons = with pkgs; [
+      fcitx5 = {
+        waylandFrontend = true;
+        addons = with pkgs; [
           fcitx5-mozc
-        fcitx5-nord
+          fcitx5-fluent
         ];
       };
     };
+  };
 }