diff --git a/classes/desktop/vm.nix b/classes/desktop/vm.nix
deleted file mode 100644
index d923a08..0000000
--- a/classes/desktop/vm.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  virtualisation.libvirtd.enable = true;
-  programs.virt-manager.enable = true;
-}
diff --git a/classes/desktop/wine.nix b/classes/desktop/wine.nix
deleted file mode 100644
index 632cc98..0000000
--- a/classes/desktop/wine.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  environment.systemPackages = [pkgs.wineWowPackages.stableFull];
-}
diff --git a/common/gitui.nix b/common/gitui.nix
new file mode 100644
index 0000000..e7d891e
--- /dev/null
+++ b/common/gitui.nix
@@ -0,0 +1,5 @@
+{pkgs, ...}: {
+  environment.systemPackages = [
+    pkgs.gitui
+  ];
+}
diff --git a/classes/desktop/helix.nix b/common/helix.nix
similarity index 87%
rename from classes/desktop/helix.nix
rename to common/helix.nix
index 4582e43..873e007 100644
--- a/classes/desktop/helix.nix
+++ b/common/helix.nix
@@ -8,7 +8,7 @@
 in {
   environment.systemPackages = [package];
 
-  environment.variables = let
+  environment.sessionVariables = let
     exe = builtins.baseNameOf (lib.getExe package);
   in {
     EDITOR = exe;
diff --git a/common/yazi.nix b/common/yazi.nix
new file mode 100644
index 0000000..2ae4438
--- /dev/null
+++ b/common/yazi.nix
@@ -0,0 +1,3 @@
+{
+  programs.yazi.enable = true;
+}
diff --git a/common/zellij.nix b/common/zellij.nix
new file mode 100644
index 0000000..c97e1f7
--- /dev/null
+++ b/common/zellij.nix
@@ -0,0 +1,5 @@
+{pkgs, ...}: {
+  environment.systemPackages = [
+    pkgs.zellij
+  ];
+}
diff --git a/flake.lock b/flake.lock
index e7d0d52..0e076e8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -80,11 +80,11 @@
         "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1734441494,
-        "narHash": "sha256-/SZXjdKlo6NgVR+/RT0eYCUUJLcQndy7lIl2Bc0qjlY=",
+        "lastModified": 1734605856,
+        "narHash": "sha256-RfNqLS5f9s3aiRZIOjSbM8Vz7x2dT/7zwJhyt9TLEmE=",
         "owner": "cachix",
         "repo": "devenv",
-        "rev": "bdc1a2cefdda8f89e31b1a0f3771786ba9e5d052",
+        "rev": "f81cf7dc4cbfa46de11618af94e5983c5e600d8c",
         "type": "github"
       },
       "original": {
@@ -338,11 +338,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1734404414,
-        "narHash": "sha256-c/7bsbMcVMb8c4wiLA142ZQfL08U8qYJROGf9NCkfQE=",
+        "lastModified": 1734720291,
+        "narHash": "sha256-a0ArHOrz4X3TK0fwXs67lBwlNPG2y78LBTf9lUJxo54=",
         "owner": "lilyinstarlight",
         "repo": "nixos-cosmic",
-        "rev": "a364e6a5e9eb93253daf93c747b150e31e09b13c",
+        "rev": "b5f8f498a70d4ca6fd33772cab9d0cc8f8cf611d",
         "type": "github"
       },
       "original": {
@@ -381,11 +381,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1734083684,
-        "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=",
+        "lastModified": 1734323986,
+        "narHash": "sha256-m/lh6hYMIWDYHCAsn81CDAiXoT3gmxXI9J987W5tZrE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84",
+        "rev": "394571358ce82dff7411395829aa6a3aad45b907",
         "type": "github"
       },
       "original": {
@@ -461,11 +461,11 @@
     },
     "nixpkgs_6": {
       "locked": {
-        "lastModified": 1734119587,
-        "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=",
+        "lastModified": 1734424634,
+        "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5",
+        "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33",
         "type": "github"
       },
       "original": {
@@ -498,11 +498,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1734316514,
-        "narHash": "sha256-0aLx44yMblcOGpfFXKCzp2GhU5JaE6OTvdU+JYrXiUc=",
+        "lastModified": 1734575524,
+        "narHash": "sha256-BxQ/4JuHEi0zRjF0P8B5xnbXOLulgsK2gfwVRXGZ4a4=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "83ee8ff74d6294a7657320f16814754c4594127b",
+        "rev": "573c674a3ad06e8a525263185ebef336a411d1d5",
         "type": "github"
       },
       "original": {