diff --git a/configs/graphics.nix b/configs/graphics.nix
index a7c614e..1a6f439 100644
--- a/configs/graphics.nix
+++ b/configs/graphics.nix
@@ -4,7 +4,7 @@
     enable = true;
     layout = commaSep [ "de" "gr" "ru" ];
     xkbVariant = commaSep [ "T3" "polytonic" "phonetic_winkeys" ];
-    xkbOptions = commaSep [ "compose:caps" "terminate:ctrl_alt_bksp" "grp:win_space_toggle" ];
+    xkbOptions = commaSep [ "compose:caps" "terminate:ctrl_alt_bksp" "grp:ctrls_toggle" ];
     libinput.enable = true;
     xautolock = {
       enable = true;
diff --git a/configs/shells.nix b/configs/shells.nix
index eb04a53..62912bd 100644
--- a/configs/shells.nix
+++ b/configs/shells.nix
@@ -19,7 +19,6 @@
       setopt MULTIOS
       setopt CORRECT
       setopt AUTO_NAME_DIRS
-      setopt PUSHD_MINUS PUSHD_TO_HOME AUTO_PUSHD
       export KEYTIMEOUT=1
       bindkey -v
       bindkey '^w' backward-kill-word
diff --git a/systems/catullus/config.nix b/systems/catullus/configuration.nix
similarity index 100%
rename from systems/catullus/config.nix
rename to systems/catullus/configuration.nix
diff --git a/systems/catullus/physical.nix b/systems/catullus/hardware-configuration.nix
similarity index 100%
rename from systems/catullus/physical.nix
rename to systems/catullus/hardware-configuration.nix