diff --git a/home/david/configurations/Tytonidae/default.nix b/home/david/configurations/Tytonidae/default.nix
index 65d0535..bce66c6 100644
--- a/home/david/configurations/Tytonidae/default.nix
+++ b/home/david/configurations/Tytonidae/default.nix
@@ -32,6 +32,7 @@
     sops.enable = true;
     mpv.enable = true;
     kvm.enable = true;
+    atuin.enable = true;
   };
 
   david = {
diff --git a/home/modules/atuin.nix b/home/modules/atuin.nix
new file mode 100644
index 0000000..51bc8c8
--- /dev/null
+++ b/home/modules/atuin.nix
@@ -0,0 +1,39 @@
+{ lib, config, ... }:
+let
+  cfg = config.youthlic.programs.atuin;
+in
+{
+  options = {
+    youthlic.programs.atuin = {
+      enable = lib.mkEnableOption "atuin";
+    };
+  };
+  config = lib.mkMerge [
+    (lib.mkIf cfg.enable {
+      programs.atuin = {
+        daemon = {
+          enable = true;
+          logLevel = "trace";
+        };
+        enable = true;
+        settings = {
+          auto_sync = true;
+          update_check = false;
+          style = "full";
+          history_filter = [
+            "^ .*"
+          ];
+          enter_accept = false;
+          keymap_mode = "vim-insert";
+          sync.records = true;
+        };
+      };
+    })
+    (lib.mkIf config.youthlic.programs.fish.enable {
+      programs.atuin.enableFishIntegration = true;
+    })
+    (lib.mkIf config.youthlic.programs.bash.enable {
+      programs.atuin.enableBashIntegration = true;
+    })
+  ];
+}
diff --git a/home/modules/default.nix b/home/modules/default.nix
index 60fb448..32be00d 100644
--- a/home/modules/default.nix
+++ b/home/modules/default.nix
@@ -25,6 +25,7 @@
       ./waybar.nix
       ./mpv.nix
       ./kvm.nix
+      ./atuin.nix
     ];
 
   options = {
diff --git a/secrets/general.yaml b/secrets/general.yaml
index e6da571..6288c42 100644
--- a/secrets/general.yaml
+++ b/secrets/general.yaml
@@ -1,3 +1,4 @@
+atuin-key: ENC[AES256_GCM,data:AB0Uu5VLt78lwXbfCX73lcqkdwjA7IZjFs3A+J3lFbUi0NWDwBQOXU5G8mZCzzt0rbeUPHT9gnKYMTeocdH8L+q3zvef/GJ105GlC6hmu5+Oc7AWZiYDT5YemBUhlVSzSqxohgZK/X/9xcpbsBbLxjc4iTPrz+dv7kRziEJV+6HiEAb4/bHJzkg8CNwndr9jtEkAMUl3OEE=,iv:VnwlepLQgHrDsmdWUdpipl3pSwFD2CxXq0v8N8edwrg=,tag:k7jCpZSXkvKL80I01bRLmg==,type:str]
 ssh-private-key:
     tytonidae: ENC[AES256_GCM,data:I1RF/umtOGAuSVoLfwDnN2DG+w1yWqPkhZzM61y5XRSxF2Xq5C/iUJGWeCc+1Hwbw+oEMnm2e57m79Uke0LIJJrw//kRMqNOewQtx2xHkNSscWKCIANoNiDdhlOnB0r0BfXObr0xEu/69ST11lupPGIGQiWhjT1BY7c4NhAhhzfThttQCwznfrX3SfLu4p2Akg6p8QmRcU6h9kox+PK1Im+h956W0dYVnIe4ePZ3NGitQll9hxLxM+agnxF9wDDO+4pQ3i8aadbxLr8ug/boEhBy/e+sOKqzboAiWpuDjfQRUxklz0IxBihK8z6J/AHgXusxs70EdUDKf5sH7RIi95poYqJdl6bKToSCJtuM7JQ/eNTUjHvUZlRvlXSZG4iNypUYTOxSHTFGH7rA0wNeE0sMXkaTfJHD5utZDjxibICW1+BYXam8mTKWhXMUyfAL2bLMRmshxRB81bPnik08axpzJ22oSxZ1AfPz5I98zn/o0bDlAPTRetImQtSN181WrRHCCVUMe4wZIfgQvVryFgfPU06gqztgU2DB22QphXXysHn4p3jbAF3Hqvgq0f+iNXoh6NJLaUD+i7xb,iv:nSTfnDbaS9DZL2WhVgcu8qIPkYH1Zws58yvcIeSZCzk=,tag:JJV7vJylaFOYdVjyeeOt9g==,type:str]
     akun: ENC[AES256_GCM,data:d04sdY1cvJuOPSq9H2lT26jrUFSA1sHz1i9jj+XtXGeagQyc4XaknTmfC3EDfvNghoizZWZ/Ma+BfIvnlWDBFqhkGhdhB7X8PnI9rySOfkMmOk2HXHtvP4GfSy2oQ4BMRfYX2N9TcViascnXA9MRsetDjD3fhiCKkZ+2H/sthxw38JgK95O74lFCze7sc4ZzK/RhXaBkLFrQpMdqnGBYpH9wuHiQSlFxBQ0jHJDUeOSxOdCanw2xfdkJnNe5dKRweoYp4Mtit2C3DRdaT3lMQ/SQjfEhUs/0TIXyunoWE7nX5tUN2F2s/FtkPMU5lpiW1x+kntMBBfY9TA+r4CyH4lkhFit+DsIkPfdUZGzSquQAHHWzDzS5vXnKTf8NFCzHIeoQzegkf4JS+CWf51Iy15FfWy+Pd6CmxLikAQnGTixGDa7LMqOV48BhZ5it/hJmrzg0FMkNFeeJW/s9YvCNMae8lMt/0K+N+pUD/Ud8VJnIxP4MmWGKRwNNFHivGuZjtKCJR9agf1N7NPBDDqV7HRDYAfxa2sPozWZ5ZGGGlsmINeymNk10aY4ovRs/6CcRWw2gPspNuxvqb9HQ7r/cQFmGhLYpkliRLpFM/skLCHA=,iv:YVPvHL4nxqJMR8PE+hraS0piboGYXqyljgGcBHqG38g=,tag:HSab+C3Xd5wMzyomF9dGMA==,type:str]
@@ -28,8 +29,8 @@ sops:
             RjdOK1RiRHRzTGd1dDlUTEVRVzBtQk0K5vtopA4dhLODrVlUnegm9f5DwSvOKuIS
             bIPHM5FarLGRXTXs09vKW5LFKo3BOm9N4Zc6q4cV7Pdp5+AZEEp/0Q==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2025-01-22T07:19:00Z"
-    mac: ENC[AES256_GCM,data:MxpnDNf/Us5WOFKwRZbKJRaHNmyazlC5giGn8iveBwKV9v+cqIg80pt8N9DPHETEnzsIUoDBe3i1qYCx5cV84zPAg8aoW3yeYAEVkk/ZzueXtETnxNrR+anulh0oi7L9cj5Kr1+L3TulCg1RdXHSGGuop/p2unzKhsf318wJo28=,iv:m1uN0ZFErnk9NCjYRW9Wg0WeFRdfbhSFGS5XoVaZgc4=,tag:rE4wvNyaTgcNSGwCpa2DUg==,type:str]
+    lastmodified: "2025-01-23T15:12:36Z"
+    mac: ENC[AES256_GCM,data:1zGSr1B2pPKRhF6CUSS0bpM378tBwCsl6/r9uxUanQpj5b1pUiJ+IGro5ZBKd4UqFnqrQDiAXRfLWEuthGrE4ufHp3VibGUP+HXmri6rRTqOzewAsUgnvEGtmlWeCmeMyKipHlvGl/kiJCuog3UcogHbhGAckJeyetdHVqrQRlg=,iv:tI3pgJbYHXIGL9EfkYxv/dNTifLxRHmmc5XYxOdRB6I=,tag:lgqfjkRkHAqdDLI6DpWwRA==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.9.3