diff --git a/groups/yezelhlev/programs.nix b/groups/yezelhlev/programs.nix
index ed3b410..ec7d9b6 100644
--- a/groups/yezelhlev/programs.nix
+++ b/groups/yezelhlev/programs.nix
@@ -10,60 +10,58 @@
   # ======================
   # sudo nixos-rebuild switch --flake .
   environment.systemPackages = with upkgs; [
-    # CLI tools
-    git
     wget
-    unzip
-    p7zip
-    kitty # terminal
-    starship # shell customizer
-    btop-cuda # system monitoring
-    croc # e2ee file transfer
-    chawan # tui browser cha <url>
-    shellcheck # sh warning
-    calcure # calendar app TODO: remove & fork calendar.vim
-
-    # editors
     lunarvim
     vscode
-
-    # languages
+    python3
+    p7zip
+    unzip
+    chawan # tui browser cha <url>
+    git
     gcc
     gdb
     glibc.static
-    python3
     nixfmt
 
-    # window management
+    kitty # terminal
     wayland
 
-    # programs 
-    vivaldi # vivaldi install requires qt5
-    zen # TODO: switch to better browser
+    emacs # calander/todo list
+
+    nemo # file browser
+    monophony # yt music tryout
+
     vesktop # discord-canary
     equibop # equibop 3.1.7
-    element-desktop # element 4 matrix
-    monophony # yt music tryout
-    syncplay
-    qbittorrent
+
+    vivaldi # vivaldi install requires qt5
+    qt5.qtbase
+
+    starship # shell customizer
+
     libreoffice-qt # libreoffice
-    notepad-next # notepad++
-    # notepadqq # TODO: which is better?
-    sqlitebrowser
-    bottles # windows emulation
-
-    # dependencies 
-    qt5.qtbase # vivaldi + others
-    libsForQt5.qtstyleplugin-kvantum # libs for Qt5
-    libsForQt5.qt5ct
-    libsForQt5.qt5.qtbase
-
-    hunspell # spellcheck for libreoffice
+    hunspell
     hunspellDicts.uk_UA
     hunspellDicts.th_TH
     openjdk
 
-    ffmpeg-full # mpv + syncplay
+    notepad-next # notepad++
+    sqlitebrowser
+
+    ffmpeg-full
     yt-dlp
+    qbittorrent
+
+    bottles # windows emulation
+
+    element-desktop # element 4 matrix
+
+    libsForQt5.qtstyleplugin-kvantum # libs for Qt5
+    libsForQt5.qt5ct
+    libsForQt5.qt5.qtbase
+    btop-cuda
+
+    croc
+    syncplay
   ];
 }
diff --git a/homes/modules/vim/nixcats.nix b/homes/modules/vim/nixcats.nix
index b45a388..32b54cc 100644
--- a/homes/modules/vim/nixcats.nix
+++ b/homes/modules/vim/nixcats.nix
@@ -85,7 +85,6 @@ in
               nvim-web-devicons
               base16-nvim
               mini-nvim
-              calendar-vim
 
               (pkgs.vimUtils.buildVimPlugin {
                 pname = "candyland-nvim";