diff --git a/flake.nix b/flake.nix
index bb305b9..96da302 100644
--- a/flake.nix
+++ b/flake.nix
@@ -49,7 +49,7 @@
         ./modules/motd.nix
         ./modules/postgres.nix
         ./modules/fail2ban.nix
-        ./modules/nix-settings.nix
+        ./modules/nix/settings.nix
         ./modules/adguard.nix
         ./modules/git.nix
         ./modules/github-runner.nix
@@ -94,7 +94,13 @@
           ./users/kopatz.nix
           ./modules/graphical/plasma.nix
           ./modules/graphical/shared.nix
-          ./modules/nix-settings.nix
+          ./modules/nix/settings.nix
+          ./modules/nix/index.nix
+          ./modules/nix/ld.nix
+          ./modules/gpg.nix
+          ./modules/flatpak.nix
+          ./modules/wooting.nix
+          ./modules/support/ntfs.nix
           ./systems/pc/configuration.nix
           agenix.nixosModules.default
           home-manager.nixosModules.home-manager
diff --git a/modules/flatpak.nix b/modules/flatpak.nix
new file mode 100644
index 0000000..e63b2ac
--- /dev/null
+++ b/modules/flatpak.nix
@@ -0,0 +1,3 @@
+{
+      services.flatpak.enable = true;
+}
diff --git a/modules/gpg.nix b/modules/gpg.nix
new file mode 100644
index 0000000..ebd5617
--- /dev/null
+++ b/modules/gpg.nix
@@ -0,0 +1,13 @@
+{pkgs, ...}:
+{
+  #services.pcscd.enable = true;
+
+  programs.gnupg.agent = {
+    enable = true;
+    enableSSHSupport = true;
+    pinentryFlavor = "qt";
+  };
+  #environment.systemPackages = with pkgs; [
+  #  pinentry-curses
+ # ];
+}
diff --git a/modules/nix/index.nix b/modules/nix/index.nix
new file mode 100644
index 0000000..e8e93b3
--- /dev/null
+++ b/modules/nix/index.nix
@@ -0,0 +1,7 @@
+{
+    programs.command-not-found.enable = false;
+    programs.nix-index = {
+        enable = true;
+        enableZshIntegration=true;
+    };
+}
diff --git a/modules/nix/ld.nix b/modules/nix/ld.nix
new file mode 100644
index 0000000..4ff6916
--- /dev/null
+++ b/modules/nix/ld.nix
@@ -0,0 +1,3 @@
+{
+  programs.nix-ld.enable = true;
+}
diff --git a/modules/nix-settings.nix b/modules/nix/settings.nix
similarity index 100%
rename from modules/nix-settings.nix
rename to modules/nix/settings.nix
diff --git a/modules/support/ntfs.nix b/modules/support/ntfs.nix
new file mode 100644
index 0000000..4f09762
--- /dev/null
+++ b/modules/support/ntfs.nix
@@ -0,0 +1,3 @@
+{
+  boot.supportedFilesystems = [ "ntfs" ];
+}
diff --git a/modules/wooting.nix b/modules/wooting.nix
new file mode 100644
index 0000000..eec4356
--- /dev/null
+++ b/modules/wooting.nix
@@ -0,0 +1,11 @@
+{ pkgs, ...}:
+{
+  services.udev.extraRules = ''
+    SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", TAG+="uaccess"
+    SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", TAG+="uaccess"
+  '';  
+  
+  environment.systemPackages = with pkgs; [
+    wootility
+  ];
+}
diff --git a/users/anon.nix b/users/anon.nix
index fda5f03..f075a6e 100644
--- a/users/anon.nix
+++ b/users/anon.nix
@@ -17,7 +17,7 @@ in
     useUserPackages = true;
     users.${user} = {
       programs.git.enable = true;
-        programs.direnv = {
+      programs.direnv = {
         enable = true;
         enableZshIntegration = true;
         nix-direnv.enable = true;
diff --git a/users/kopatz.nix b/users/kopatz.nix
index fe16284..aa23b93 100644
--- a/users/kopatz.nix
+++ b/users/kopatz.nix
@@ -34,6 +34,11 @@ in
         };
       };
       programs.git.enable = true;
+      programs.direnv = {
+        enable = true;
+        enableZshIntegration = true;
+        nix-direnv.enable = true;
+      };
       home.stateVersion = "23.05";
     };
   };