aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--flake.nix2
-rw-r--r--inputs.nix3
-rw-r--r--modules/by-name/at/atuin/module.nix44
-rw-r--r--modules/by-name/at/atuin/secrets/encryption_key.age27
-rw-r--r--modules/by-name/at/atuin/secrets/user_id.age13
-rw-r--r--npins/sources.json12
-rw-r--r--secrets.nix1
-rw-r--r--unflake.nix5
8 files changed, 72 insertions, 35 deletions
diff --git a/flake.nix b/flake.nix
index a5ada983..7aa74923 100644
--- a/flake.nix
+++ b/flake.nix
@@ -35,6 +35,7 @@
templates = sources.loadFlake "templates";
# my binaries
qmk_firmware = sources.loadFlake "qmk_firmware";
+ turtle = sources.loadFlake "turtle";
system = "x86_64-linux";
@@ -78,6 +79,7 @@
externalBinaries = {
inherit
qmk_firmware
+ turtle
;
};
diff --git a/inputs.nix b/inputs.nix
index 7d89fb55..4485d8e2 100644
--- a/inputs.nix
+++ b/inputs.nix
@@ -23,6 +23,9 @@ in {
"library" = {
url = "git+https://git.foss-syndicate.org/vhack.eu/nix-library?ref=prime";
};
+ "turtle" = {
+ url = "git+https://git.foss-syndicate.org/bpeetz/forks/atuin?ref=main";
+ };
"nix-index-database" = {
url = "github:nix-community/nix-index-database/main";
};
diff --git a/modules/by-name/at/atuin/module.nix b/modules/by-name/at/atuin/module.nix
index 78a4332c..e55e358e 100644
--- a/modules/by-name/at/atuin/module.nix
+++ b/modules/by-name/at/atuin/module.nix
@@ -10,6 +10,8 @@
{
config,
lib,
+ externalBinaries,
+ system,
...
}: let
cfg = config.soispha.programs.atuin;
@@ -21,11 +23,19 @@ in {
};
config = lib.mkIf cfg.enable {
- age.secrets.atuin_encryption_key = lib.mkIf cfg.enableAge {
- file = ./secrets/encryption_key.age;
- mode = "700";
- owner = "soispha";
- group = "users";
+ age.secrets = {
+ atuin_encryption_key = lib.mkIf cfg.enableAge {
+ file = ./secrets/encryption_key.age;
+ mode = "700";
+ owner = "soispha";
+ group = "users";
+ };
+ user_id = lib.mkIf cfg.enableAge {
+ file = ./secrets/user_id.age;
+ mode = "700";
+ owner = "soispha";
+ group = "users";
+ };
};
soispha.programs.zsh.integrations.atuin = ./atuin.zsh;
@@ -34,24 +44,21 @@ in {
programs.atuin = {
enable = true;
+ package = externalBinaries.turtle.packages.${system}.default;
+
daemon.enable = true;
# We can do this on our own.
enableZshIntegration = false;
settings = {
- key_path = lib.mkMerge [
- (lib.mkIf cfg.enableAge "${config.age.secrets.atuin_encryption_key.path}")
- (lib.mkIf (!cfg.enableAge)
- "${config.home-manager.users.soispha.xdg.dataHome}/atuin/atuin_secret_key.key")
- ];
-
sync = lib.mkIf cfg.enableAge {
- # The v2 sync API
- records = true;
+ encryption_key_path = "${config.age.secrets.atuin_encryption_key.path}";
+ user_id_path = "${config.age.secrets.atuin_user_id.path}";
+
+ auto = true;
+ address = "https://atuin-sync.vhack.eu";
};
- auto_sync = lib.mkIf cfg.enableAge true;
- sync_address = lib.mkIf cfg.enableAge "https://atuin-sync.vhack.eu";
logs = {
enabled = true;
@@ -78,9 +85,6 @@ in {
vim_normal = "blink-block";
};
- # Who wants software, that automatically calls home?!
- update_check = false;
-
stats = {
# This overrides the default value.
ignored_commands = [];
@@ -92,10 +96,6 @@ in {
"n" = "select-previous";
"s" = "cursor-right";
};
-
- # I currently don't want a sync deamon or a dotfiles manager running.
- dotfiles.enable = false;
- ai.enabled = false;
};
};
};
diff --git a/modules/by-name/at/atuin/secrets/encryption_key.age b/modules/by-name/at/atuin/secrets/encryption_key.age
index 4c2bb7b4..a69db402 100644
--- a/modules/by-name/at/atuin/secrets/encryption_key.age
+++ b/modules/by-name/at/atuin/secrets/encryption_key.age
@@ -1,15 +1,16 @@
-----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBqT1Y2RU9hQmkxWEoveitY
-dDEzQU85QkVXOCsxS3JFb0xKMngrT08xMGswCkJzcm9GanVUbytKcmI1U1lzWVM0
-eGV5OUcwU2M4UGlzZ3ZpQUJtYUJxcTQKLT4gc3NoLWVkMjU1MTkgelpFb25nIElC
-OExoMzVpV0U3czZ2aUp3a0ZDcUlTQnFhallxOTdhTE1YdnFrWVdPRzQKQmN6L1Z4
-S0ZWeWNSREFhMExMa0FOdWhnUTI5bXptVnU5SDFQZkk1R00vdwotPiBzc2gtZWQy
-NTUxOSA3SGZGVXcgbm1LZ1VwRDdjRFh0SCtTT1I2ZDFsSmhsZzVBcHMxSXhWQlNM
-cFVpU2kwRQpEUStYQVJiWSt1THA5ZEJlL2NnQ2NwZTlWWEVtYkpjb09RckxkaWdP
-djFvCi0+ICktZ3JlYXNlIGsgZnRHZHhEIDxVLQo4SkZtRm8vTEJnYVRnZXAwK3Yv
-eUQ0TGdYRVpOTmozSE52MlFqeG1HalVWb1JmZ2k5ZVJFNVpBUGdyMnlVZwotLS0g
-UjI2WVhtU0lITzVMSU1Nc2RKcnJXZVUreWxnZXoxZnBRL0xpUmd3dDhtNArERqzQ
-//hB8CunQlwCCYnISj6FaQphnWz8E3sIyi3FqH2ww9MQ4RzbVqLOOKgg4wVWRC8Y
-RmFWPl1SfJoA8DIPoTEgqQZseB+PT7CYHo4LEwrpkcQ5cndOI2JbO+HzZdk9H+tM
-GbsggKI=
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB1NkNRQUdYekxZaEF3WTdC
+ZDBndHBMZUVPM2dObDcvazBjaXlQT3QrUmtVCkc1TUhMd1h1YWxtaXNncGZSODg0
+QWtUTDhybFltaDBVWTE3VVBoeUtubzQKLT4gc3NoLWVkMjU1MTkgelpFb25nIHEy
+VGRMeUZDSUlGRmE0NzlnWSsvY3VHVmRxR1NpNGRmS1ZRWG9TcFdaQmsKcjhKb1VG
+V2tNZkdXTXhSb25ETUplYlZWaHU0Y0grYUtjSVVHVzhmMzV5TQotPiBzc2gtZWQy
+NTUxOSA3SGZGVXcgTTBhcUJISVVRVU1hNk5VZkNTNUZHUzY1TSs4a2ZNYytIdVVG
+TG5mRjhBawpRVG50Wkl2S2NKdUxTeVhiOTJ0RG00NCswQ01jV1lYbVpYNC90N3V1
+WXZRCi0+IDEoIS1ncmVhc2UgSUZzazpsRCBCbi0gWQpxMUJtNk13ZHptVjladTAz
+U2IxRjIyK0wvY3k1T3JiQ1ZFNlMvU0t3TWNyN09SVVlWc2FIQU9lZDZ0azIwT29z
+CjRFREVXdGozNVhKWlE5L3NxTGdDZFVvL2NDYlpRTWtrd1J0cFZwcm9OVW1Vb1pz
+SnptUWdvZ3E4VThHOXZRCi0tLSBUeW0zYnNVZkRYWDJoTTV0V2QveWpIY0p0UmxP
+UXlSNHNPbllBYitjTWpVCgUpBZTJYd2sFY9GvDwJMKt0WVrDZVE2PF5jAww8Ml/w
+rEycAm/dmIiMV5mfKOdU0aHNMl6RM/7PLHSa4G+wIRRrKQkoNcu8cqOziBRWgSOn
+JKxVFCdwlEgAo+J+qtRHkwitjOJ0ce6OOg==
-----END AGE ENCRYPTED FILE-----
diff --git a/modules/by-name/at/atuin/secrets/user_id.age b/modules/by-name/at/atuin/secrets/user_id.age
new file mode 100644
index 00000000..8bfc370d
--- /dev/null
+++ b/modules/by-name/at/atuin/secrets/user_id.age
@@ -0,0 +1,13 @@
+-----BEGIN AGE ENCRYPTED FILE-----
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB4cmN5R1haeElTZnhmNHha
+MERLd2M0V2k1UFU2NlMzU0NWNlVVNEM5c1VBCnZqUktBUFF4eEsvUUwrQkJmclhz
+WTJuMktGV09XK0x3WkQ4b0dwd0FGOXcKLT4gc3NoLWVkMjU1MTkgelpFb25nIDhE
+dlQyMXJRVmI1MnRBMjAydEJHdE1TNGxlWTRoSGlYUS9Pb1Mrd1BOM2cKaE8vdHM2
+aUZKclVzcHdMaCtiWnVkMWhGZm1ubG5DRGZ4VG41V0VCL1ZyVQotPiBzc2gtZWQy
+NTUxOSA3SGZGVXcgMlFIUDBhL2tkcndlT0JyelVzeEJMV0orcHp3WGN1dFU5aytj
+NUMwaFMwRQpjYkJpZmQrL1JxOUxPcXE3TEdyYko2YmI2UkdibWpIaUk0TEV2ZzAz
+NlJFCi0+IFBRaHdiLWdyZWFzZSAuZ08tXCBURjBMQS4KTVFGcUJpaFdrMDdCU0Vm
+R0F0UWR4cU96WWNCSzR3Ci0tLSBkeWRKdk1tQ2t4WnR6aVczejNhRnhISEE0YkZq
+U2VEd2I3SjQvbHN0WS9RChDEY9Z7GS4vCEtNetRMX1eLrOY9G+D4SGYcEOXqgrKq
+V1q/nnUtKj8qw3X0bfesuBKfz4DsO7t9IjfCn/nFIU4ifFtR
+-----END AGE ENCRYPTED FILE-----
diff --git a/npins/sources.json b/npins/sources.json
index c3ff6cb0..51c061a0 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -14,6 +14,18 @@
"url": "https://codeberg.org/bpeetz/flake-templates/archive/0294fb03df7c265f8fae24a9e775d69a953bbf03.tar.gz",
"hash": "sha256-rI1qMFzbXVjfEvmf2OS4upnibXpL21its6cCXqhz86o="
},
+ "unflake_git_https---git-foss-syndicate-org-bpeetz-forks-atuin_ref_main": {
+ "type": "Git",
+ "repository": {
+ "type": "Git",
+ "url": "https://git.foss-syndicate.org/bpeetz/forks/atuin"
+ },
+ "branch": "main",
+ "submodules": false,
+ "revision": "478ccf2b33ee06f43a27378992280b8f62de6531",
+ "url": null,
+ "hash": "sha256-h7Madx8B9ECeQcpoN79eI2l4+QSSD9o5Sl8vMNRcvxY="
+ },
"unflake_git_https---git-foss-syndicate-org-bpeetz-qmk_layout_ref_prime": {
"type": "Git",
"repository": {
diff --git a/secrets.nix b/secrets.nix
index fc5a9249..443ed562 100644
--- a/secrets.nix
+++ b/secrets.nix
@@ -14,6 +14,7 @@ let
apzu = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBivF5b6PyxsR/t+4Qg4IEDXHVXrjmZpslTUNXpvcVbO";
in {
"modules/by-name/at/atuin/secrets/encryption_key.age".publicKeys = [soispha tiamat apzu];
+ "modules/by-name/at/atuin/secrets/user_id.age".publicKeys = [soispha tiamat apzu];
"modules/by-name/ta/taskwarrior/secrets/sync_server_encryption_key.age".publicKeys = [soispha tiamat apzu];
diff --git a/unflake.nix b/unflake.nix
index b095e8cd..0f4bd7ec 100644
--- a/unflake.nix
+++ b/unflake.nix
@@ -98,6 +98,9 @@ let
nixpkgs = "unflake_github_nixos_nixpkgs_ref_nixos-25-05";
systems = "unflake_github_nix-systems_default";
};
+ unflake_git_https---git-foss-syndicate-org-bpeetz-forks-atuin_ref_main = {
+ nixpkgs = "unflake_github_nixos_nixpkgs_ref_nixos-unstable-small";
+ };
unflake_git_https---git-lix-systems-lix-project-flake-compat_ref_main = {
};
unflake_git_https---codeberg-org-bpeetz-flake-templates_ref_prime = {
@@ -159,6 +162,7 @@ let
unflake_github_numtide_treefmt-nix = inject "unflake_github_numtide_treefmt-nix" "flake.nix" "";
unflake_github_oxalica_rust-overlay = inject "unflake_github_oxalica_rust-overlay" "flake.nix" "";
unflake_github_ryantm_agenix_ref_main = inject "unflake_github_ryantm_agenix_ref_main" "flake.nix" "";
+ unflake_git_https---git-foss-syndicate-org-bpeetz-forks-atuin_ref_main = inject "unflake_git_https---git-foss-syndicate-org-bpeetz-forks-atuin_ref_main" "flake.nix" "";
unflake_git_https---git-lix-systems-lix-project-flake-compat_ref_main = inject "unflake_git_https---git-lix-systems-lix-project-flake-compat_ref_main" "flake.nix" "";
unflake_git_https---codeberg-org-bpeetz-flake-templates_ref_prime = inject "unflake_git_https---codeberg-org-bpeetz-flake-templates_ref_prime" "flake.nix" "";
unflake_git_https---git-foss-syndicate-org-bpeetz-qmk_layout_ref_prime = inject "unflake_git_https---git-foss-syndicate-org-bpeetz-qmk_layout_ref_prime" "flake.nix" "";
@@ -180,6 +184,7 @@ let
qmk_firmware = universe.unflake_git_https---git-foss-syndicate-org-bpeetz-qmk_layout_ref_prime;
templates = universe.unflake_git_https---codeberg-org-bpeetz-flake-templates_ref_prime;
treefmt-nix = universe.unflake_github_numtide_treefmt-nix_ref_main;
+ turtle = universe.unflake_git_https---git-foss-syndicate-org-bpeetz-forks-atuin_ref_main;
};
in inputs // {
withInputs = fn: let outputs = fn (inputs // { inherit self; }); self = outputs // {
generated by cgit v1.3.1 (git 2.54.0) at 2026-06-14 08:02:16 +0000