From 708a9f26d2ec7e49254129eec6e6cabb2b7f96d9 Mon Sep 17 00:00:00 2001
From: Janis Hutz <development@janishutz.com>
Date: Mon, 10 Aug 2026 08:11:00 +0200
Subject: [PATCH] feat!: improved fish aliases

---
 README.md               | 29 +++++++++++++++++++++--------
 config/fish/config.fish |  9 +--------
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index d4c00f9..5a28b2c 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,8 @@ or something else entirely. DankMaterialShell is a stop-gap solution, which, alb
 doesn't go well with my ethos of using non-slop programs.
 Luckily, I can keep most of my configs when moving to something else, because I will be using Matugen
 
+Furthermore, my system may migrate to NixOS by early September 2026, to finally have my laptop and desktop configs synced properly
+
 
 ## Features
 - DankMaterialShell 
@@ -31,11 +33,22 @@ Luckily, I can keep most of my configs when moving to something else, because I
 
 
 ## TODOs
-- [ ] Migrate status bar to QuickShell
-- [ ] Rewrite Hyprland configs using lua
-- [ ] Waylogout still needed?
-- [ ] Add the formatter configs back in
-- [ ] Add the scripts back in
-- [ ] Finish decman configuration to copy all the files
-- [ ] Custom yazi theme
-- [ ] Notifier
+- [ ] Migrate status bar to QuickShell (eventually)?
+- [ ] Migrate back to Waybar
+- [X] Rewrite Hyprland configs using lua
+- [X] Waylogout still needed?
+- [X] Add the formatter configs back in
+- [X] Add the scripts back in
+- [ ] ~Finish decman configuration to copy all the files~
+- [X] Custom yazi theme
+- [ ] Notifier (swaync??)
+- [ ] Launcher (hyprlauncher??)
+- [ ] dgop as hw monitor
+- [ ] No need for nm-applet (even with waybar -> nmcli or nmtui)
+- [ ] Adapt the GTK, etc config from DMS for my own design
+- [ ] Update neovim design
+- [ ] Nix config
+- [ ] home-manager or what for dotfiles management on nix?
+- [ ] Yazi more directory links
+- [ ] Hyprland keybind panel?
+- [ ] Migrate to zsh (or another POSIX compliant shell)
diff --git a/config/fish/config.fish b/config/fish/config.fish
index be543fc..a3cac87 100755
--- a/config/fish/config.fish
+++ b/config/fish/config.fish
@@ -1,20 +1,12 @@
 alias ls='ls -l --color'
 alias ll='ls -la --color'
 alias v='nvim'
-alias i='vimiv'
 alias c='clear'
 alias cv='clear && nvim'
-alias zs='zathura-sandbox'
-alias z='zathura'
-alias bt='bashtop'
 alias fm='thunar .'
 alias gl='git ls-files --others --exclude-standard'
 alias gm='git ls-files -m'
-alias gpu='git push'
 alias gp='git pull'
-alias gpr='git pull --rebase'
-alias gc='git commit -a -m'
-alias ga='git add ./*'
 alias cfh='nvim ~/projects/system/dotfiles/config/hypr/'
 alias cfn='nvim ~/projects/system/nvim/'
 alias cff='nvim ~/projects/system/dotfiles/config/fish/'
@@ -26,6 +18,7 @@ alias p='nvimpager -p'
 alias latexdocs='zathura ~/projects/latex/docs/docs.pdf &>> /dev/null & disown'
 alias gccerr='gcc -Wall -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99'
 alias linecount='cloc --vcs git .'
+alias rm='trash -v'
 
 # Add custom scripts to path
 fish_add_path -P ~/projects/system/dotfiles/scripts/