diff --git a/modules/git.nix b/modules/git.nix
index b6ed408..1d0bf47 100644
--- a/modules/git.nix
+++ b/modules/git.nix
@@ -56,6 +56,7 @@ let
     "gm" = "git merge";
     "gma" = "git merge --abort";
     "gp" = "git push";
+    "gpa" = "git push --all";
     "gpf!" = "git push --force";
     "gpoat" = "git push origin --all && git push origin --tags";
     "gpu" = "git push upstream";
diff --git a/modules/kakoune.nix b/modules/kakoune.nix
index ddcf818..82a99d8 100644
--- a/modules/kakoune.nix
+++ b/modules/kakoune.nix
@@ -16,7 +16,7 @@ let
         })
     ] ++ [
       # editorconfig-core-c
-      # python3.pkgs.editorconfig # TODO: fix dependencies
+      python3.pkgs.editorconfig
     ] ++ (
       lib.optionals (pkgs.devEnvironment.enableCpp) [
         clang-tools
diff --git a/modules/pro_audio.nix b/modules/pro_audio.nix
index 9d816a4..9a461d7 100644
--- a/modules/pro_audio.nix
+++ b/modules/pro_audio.nix
@@ -1,7 +1,6 @@
 { pkgs, ... }:
 let
   variables = {
-
     DSSI_PATH = "$HOME/.dssi:$HOME/.nix-profile/lib/dssi:/run/current-system/sw/lib/dssi";
     LADSPA_PATH = "$HOME/.ladspa:$HOME/.nix-profile/lib/ladspa:/run/current-system/sw/lib/ladspa";
     LV2_PATH = "$HOME/.lv2:$HOME/.nix-profile/lib/lv2:/run/current-system/sw/lib/lv2";
@@ -30,7 +29,6 @@ in
     # talentedhack
     # tunefish
     # x42-plugins
-
   ];
 
   home.sessionVariables = variables;
diff --git a/nixos/thor.nix b/nixos/thor.nix
index 0e598a5..a0f7a53 100644
--- a/nixos/thor.nix
+++ b/nixos/thor.nix
@@ -47,6 +47,7 @@
     bluetooth.enable = true;
     enableRedistributableFirmware = true;
     pulseaudio.enable = false;
+    # nvidia.modesetting.enable = true;
   };
 
   i18n.defaultLocale = "it_IT.UTF-8";
@@ -113,7 +114,7 @@
         enable = true;
         support32Bit = true;
       };
-      # media-session.enable = true;
+      media-session.enable = true;
     };
     power-profiles-daemon.enable = true;
     smartd = { enable = true; notifications.x11.enable = true; };
@@ -144,12 +145,13 @@
           useQtScaling = true;
         };
       };
-      # displayManager.gdm = { enable = true; wayland = false; };
+      # displayManager.gdm = { enable = true; nvidiaWayland = true; };
       displayManager.sddm.enable = true;
       layout = "us";
       videoDrivers = [ "nvidia" ];
       xkbOptions = "eurosign:e";
     };
+    # gnome.gnome-remote-desktop.enable = true;
     zerotierone = { enable = true; joinNetworks = [ "8056c2e21cf9c753" ]; };
   };
 
@@ -187,6 +189,7 @@
         extraPkgs = pkgs: with pkgs; [ icu ];
       };
     };
+    # cudaSupport = true;
   };
   nix = {
     package = pkgs.nixFlakes;
diff --git a/thor.nix b/thor.nix
index 3f8e5ff..095be58 100644
--- a/thor.nix
+++ b/thor.nix
@@ -54,10 +54,18 @@
       element-desktop
       evolution
       file
-      firefox
+      # firefox
+      freecad
       gallery-dl
       gnome.gnome-calendar
       gnome.geary
+      gnomeExtensions.appindicator
+      gnomeExtensions.caffeine
+      gnomeExtensions.dash-to-dock
+      # gnomeExtensions.dynamic-panel-transparency
+      gnomeExtensions.just-perfection
+      gnomeExtensions.gtile
+      gnomeExtensions.vitals
       google-chrome
       gucharmap
       handbrake
@@ -111,6 +119,7 @@
           ];
         }
       )
+
     ];
   };
 
@@ -134,12 +143,13 @@
     ./modules/grobi.nix
     ./modules/info.nix
     ./modules/java.nix
-    # ./modules/joystickwake.nix
+    ./modules/joystickwake.nix
     ./modules/jq.nix
     ./modules/kakoune.nix
     # ./modules/keepassxc.nix
     ./modules/keychain.nix
-    ./modules/latex.nix
+    ./modules/kitty.nix
+    # ./modules/latex.nix
     ./modules/lf.nix
     ./modules/lorri.nix
     ./modules/man.nix
@@ -152,7 +162,7 @@
     ./modules/onedrive.nix
     # ./modules/picom.nix
     # ./modules/polybar.nix
-    ./modules/pycharm.nix
+    # ./modules/pycharm.nix
     ./modules/gtk_theme.nix
     ./modules/rofi.nix
     ./modules/rofimoji.nix