diff --git a/home-manager/sajenim/features/cli/default.nix b/home-manager/sajenim/features/cli/default.nix
index 2e5f40c..9aec608 100644
--- a/home-manager/sajenim/features/cli/default.nix
+++ b/home-manager/sajenim/features/cli/default.nix
@@ -1,15 +1,22 @@
-{pkgs, ...}: {
+{
+  inputs,
+  pkgs,
+  ...
+}: {
   imports = [
     ./git.nix
     ./mpd.nix
-    ./nvim.nix
-    ./remarkable.nix
     ./ssh.nix
-    ./zsh.nix
   ];
 
-  home.packages = with pkgs; [
-    pulsemixer
-    unstable.qmk
-  ];
+  home.packages = with pkgs;
+    [
+      mum
+      pulsemixer
+      unstable.qmk
+      unstable.rmapi
+    ]
+    ++ [
+      inputs.remarks.packages.${pkgs.system}.default
+    ];
 }
diff --git a/home-manager/sajenim/features/cli/nvim.nix b/home-manager/sajenim/features/cli/nvim.nix
deleted file mode 100644
index ec42d69..0000000
--- a/home-manager/sajenim/features/cli/nvim.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  inputs,
-  pkgs,
-  ...
-}: {
-  home.packages = [
-    # Toolchain
-    pkgs.direnv
-    pkgs.gcc
-    pkgs.pandoc
-    pkgs.python313Full
-    pkgs.texliveFull
-
-
-    # Install our nixvim configuration for neovim.
-    inputs.nixvim.packages.${pkgs.system}.default
-  ];
-}
diff --git a/home-manager/sajenim/features/cli/remarkable.nix b/home-manager/sajenim/features/cli/remarkable.nix
deleted file mode 100644
index ac72c24..0000000
--- a/home-manager/sajenim/features/cli/remarkable.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  pkgs,
-  inputs,
-  ...
-}: {
-  # This module is for the ReMarkable tablet, which is a Linux-based e-reader
-  home.packages = [
-    # Allows access to the ReMarkable Cloud API
-    pkgs.unstable.rmapi
-    # Converts ReMarkable files to PDF
-    inputs.remarks.packages.${pkgs.system}.default
-  ];
-}
diff --git a/home-manager/sajenim/features/editor/default.nix b/home-manager/sajenim/features/editor/default.nix
new file mode 100644
index 0000000..9613e12
--- /dev/null
+++ b/home-manager/sajenim/features/editor/default.nix
@@ -0,0 +1,16 @@
+{
+  inputs,
+  pkgs,
+  ...
+}: {
+  home.packages = with pkgs;
+    [
+      gcc
+      pandoc
+      python313Full
+      texliveFull
+    ]
+    ++ [
+      inputs.nixvim.packages.${pkgs.system}.default
+    ];
+}
diff --git a/home-manager/sajenim/fuchsia.nix b/home-manager/sajenim/fuchsia.nix
index fd84f49..37e984c 100644
--- a/home-manager/sajenim/fuchsia.nix
+++ b/home-manager/sajenim/fuchsia.nix
@@ -1,7 +1,9 @@
 {...}: {
   imports = [
     ./global
+    ./features/cli
     ./features/desktop
+    ./features/editor
     ./features/games
     ./features/printing
     ./features/university
diff --git a/home-manager/sajenim/global/default.nix b/home-manager/sajenim/global/default.nix
index 61e1725..02bc257 100644
--- a/home-manager/sajenim/global/default.nix
+++ b/home-manager/sajenim/global/default.nix
@@ -1,6 +1,6 @@
 {outputs, ...}: {
   imports = [
-    ../features/cli
+    ./zsh.nix
   ];
 
   nixpkgs = {
diff --git a/home-manager/sajenim/features/cli/zsh.nix b/home-manager/sajenim/global/zsh.nix
similarity index 79%
rename from home-manager/sajenim/features/cli/zsh.nix
rename to home-manager/sajenim/global/zsh.nix
index db0ddea..ae4948c 100644
--- a/home-manager/sajenim/features/cli/zsh.nix
+++ b/home-manager/sajenim/global/zsh.nix
@@ -14,16 +14,18 @@
       enable = true;
     };
     enableCompletion = true;
+
+    # Configuration directory
     dotDir = ".config/zsh";
 
-    # Aliases
     shellAliases = {
+      # Single letter aliases
       c = "clear";
+      v = "nvim";
+
+      # Double letter aliases
       la = "ls -a";
       ll = "ls -l";
-      tt = "wezterm cli set-tab-title ";
-      mount-backup = "sshfs viridian:/srv/shares/sajenim /home/sajenim/.backup";
-      mount-turing = "sshfs turing:/home/jwils254 /home/sajenim/.turing";
     };
 
     # Install plugins
@@ -43,7 +45,6 @@
     initContent = ''
       eval "$(direnv hook zsh)"
       source ${pkgs.zsh-vi-mode}/share/zsh-vi-mode/zsh-vi-mode.plugin.zsh
-      path+=('/home/sajenim/.repositories/sysadmin.sh/bin')
       bindkey "^[[1;5C" forward-word
       bindkey "^[[1;5D" backward-word
       export PATH
diff --git a/nixos/fuchsia/configuration.nix b/nixos/fuchsia/configuration.nix
index 3a395d5..5b660c4 100644
--- a/nixos/fuchsia/configuration.nix
+++ b/nixos/fuchsia/configuration.nix
@@ -33,12 +33,6 @@
     adb.enable = true;
   };
 
-  # Manage linux containers
-  virtualisation.docker = {
-    enable = true;
-    liveRestore = false;
-  };
-
   # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
   system.stateVersion = "24.05";
 }
diff --git a/nixos/viridian/configuration.nix b/nixos/viridian/configuration.nix
index a6e4b7e..0ac433a 100644
--- a/nixos/viridian/configuration.nix
+++ b/nixos/viridian/configuration.nix
@@ -27,7 +27,7 @@
         80   # http
         443  # https
         6600 # mpd
-        6667 # inspircd
+        6697 # inspircd
       ];
     };
   };
@@ -35,6 +35,8 @@
   # Configure programs
   programs = {
     zsh.enable = true;
+    # Load and unload environment variables
+    direnv.enable = true;
   };
 
   # Manage linux containers