From 49deabf581f9c88cf0f38127ef04e70c7a81b87c Mon Sep 17 00:00:00 2001 From: stitchy Date: Sat, 8 Mar 2025 22:24:22 +0000 Subject: [PATCH 1/4] chore(zsh): sort aliases and remove comments 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/zshrc | 48 +++++++++++++++++++----------------------------- 1 file changed, 19 insertions(+), 29 deletions(-) diff --git a/config/zshrc b/config/zshrc index 439315c..cd1d0bc 100755 --- a/config/zshrc +++ b/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 myip="curl ifconfig.me" +alias c='clear' +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 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 ls='eza' alias make="make -j 20" -alias cd="z" -alias imv="imv -b aa77bb" -alias find="fd" -alias tree="eza --tree" -alias icat="kitty +kitten icat" +alias mountUSB="mount ~/ExternalDrive" # Automagically mount and unmount my flashdrive +alias myip="curl ifconfig.me" alias qsus="NIXPKGS_ALLOW_UNFREE=1 nix-shell -p quartus-prime-lite -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/fe7ab74a86d78ba00d144aa7a8da8c71a200c563.tar.gz" - -# thanks fire :3 -alias c='clear' -alias lg='lazygit' -# Future fire, this is for a meme. -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' -} +alias ssh="TERM=xterm ssh" #Fix foot issue in ssh +alias tree="eza --tree" +alias umountUSB="umount ~/ExternalDrive" +alias unityAvi="~/Documents/Unity/Editors/2019.4.31f1/Editor/Unity -projectPath ~/ExternalDrive/Unity\ Projects/Avatar\ 3.0\ 2019" +alias v="nvim" # Launch neovim with 'v' # Automatically get new programs for autocompletion @@ -102,10 +95,6 @@ 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" @@ -138,6 +127,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 +138,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)" From 961481549f14dd5fec255234bf9c37cafef0703a Mon Sep 17 00:00:00 2001 From: stitchy Date: Sat, 8 Mar 2025 22:45:52 +0000 Subject: [PATCH 2/4] feat(fcitx): proper themeing and fix wayland issues --- config/hypr/hyprland.conf | 9 +++++---- config/zshrc | 3 --- users/stitchynyan/default.nix | 11 +++++++---- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf index ca9a8ee..a7c6887 100755 --- a/config/hypr/hyprland.conf +++ b/config/hypr/hyprland.conf @@ -54,12 +54,13 @@ decoration { noise=.03 vibrancy=.2 vibrancy_darkness=0.5 + input_methods=true } - # Other - rounding=15 - inactive_opacity=.8 - fullscreen_opacity=1 multiplier + # Other + rounding=15 + inactive_opacity=.8 + fullscreen_opacity=1 multiplier } animations { diff --git a/config/zshrc b/config/zshrc index cd1d0bc..f513bde 100755 --- a/config/zshrc +++ b/config/zshrc @@ -99,9 +99,6 @@ eval "$(zoxide init zsh)" #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 diff --git a/users/stitchynyan/default.nix b/users/stitchynyan/default.nix index 46da119..5b13f72 100644 --- a/users/stitchynyan/default.nix +++ b/users/stitchynyan/default.nix @@ -68,10 +68,13 @@ inputMethod = { enable = true; type = "fcitx5"; - fcitx5.addons = with pkgs; [ - fcitx5-mozc - fcitx5-nord - ]; + fcitx5 = { + waylandFrontend = true; + addons = with pkgs; [ + fcitx5-mozc + fcitx5-fluent + ]; + }; }; }; } From 23d668669753eb22de387d6a9708c19d59107238 Mon Sep 17 00:00:00 2001 From: stitchy Date: Sat, 8 Mar 2025 22:47:23 +0000 Subject: [PATCH 3/4] fix(font): allow reading chinese characters --- packages/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/default.nix b/packages/default.nix index 2a11ce0..556cf8c 100644 --- a/packages/default.nix +++ b/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); From 341db7911eb36bf16961c9491d7d8284f5b6d7de Mon Sep 17 00:00:00 2001 From: stitchy Date: Sat, 8 Mar 2025 22:47:45 +0000 Subject: [PATCH 4/4] fix(mailsync): incorrect indent --- users/stitchynyan/home.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/users/stitchynyan/home.nix b/users/stitchynyan/home.nix index cb80be6..e85f8f3 100644 --- a/users/stitchynyan/home.nix +++ b/users/stitchynyan/home.nix @@ -111,7 +111,7 @@ in mailsync = { Unit = { Description = "Syncs email"; - After = [ "network-online.target" ]; + After = [ "network-online.target" ]; }; Service = { Type = "oneshot";