Compare commits

..

4 commits

Author SHA1 Message Date
56a4433161 flake.lock: Update
All checks were successful
EVAL aarch64-linux.sisko
BUILD aarch64-linux.sisko
UPLOAD aarch64-linux.sisko
DOWNLOAD aarch64-linux.sisko
CACHIX aarch64-linux.sisko
ATTIC aarch64-linux.sisko
/ test (push) Successful in 22m19s
Flake lock file updates:

• Updated input 'catppuccin':
    'github:catppuccin/nix/0ba11b12be81f0849a89ed17ab635164ea8f0112' (2025-05-24)
  → 'github:catppuccin/nix/3a42cd79c647360ee8742659e42aeec0947dd3b4' (2025-06-06)
• Updated input 'disko':
    'github:nix-community/disko/a894f2811e1ee8d10c50560551e50d6ab3c392ba' (2025-05-26)
  → 'github:nix-community/disko/dfa4d1b9c39c0342ef133795127a3af14598017a' (2025-06-09)
• Updated input 'dream2nix':
    'github:nix-community/dream2nix/6fd6d9188f32efd1e1656b3c3e63a67f9df7b636' (2025-05-19)
  → 'github:nix-community/dream2nix/e92dacdc57acaa6b2ae79592c1a62c2340931410' (2025-06-02)
• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/0fba546d9aa235fc726fe9c8c3bb703e918c14c4' (2025-05-27)
  → 'github:nix-community/emacs-overlay/3bb5d2b3966b1a79258daf1ec62963698cef90d9' (2025-06-09)
• Updated input 'emacs-overlay/nixpkgs':
    'github:NixOS/nixpkgs/62b852f6c6742134ade1abdd2a21685fd617a291' (2025-05-25)
  → 'github:NixOS/nixpkgs/3e3afe5174c561dee0df6f2c2b2236990146329f' (2025-06-07)
• Updated input 'emacs-overlay/nixpkgs-stable':
    'github:NixOS/nixpkgs/f09dede81861f3a83f7f06641ead34f02f37597f' (2025-05-23)
  → 'github:NixOS/nixpkgs/ed29f002b6d6e5e7e32590deb065c34a31dc3e91' (2025-06-06)
• Updated input 'flakeParts':
    'github:hercules-ci/flake-parts/c621e8422220273271f52058f618c94e405bb0f5' (2025-04-01)
  → 'github:hercules-ci/flake-parts/9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569' (2025-06-08)
• Updated input 'flakeParts/nixpkgs-lib':
    'github:nix-community/nixpkgs.lib/e4822aea2a6d1cdd36653c134cacfd64c97ff4fa' (2025-03-30)
  → 'github:nix-community/nixpkgs.lib/656a64127e9d791a334452c6b6606d17539476e2' (2025-06-01)
• Updated input 'homeManager':
    'github:nix-community/home-manager/f5b12be834874f7661db4ced969a621ab2d57971' (2025-05-28)
  → 'github:nix-community/home-manager/35e1f5a7c29f2b05e8f53177f6b5c71108c5f4c3' (2025-06-09)
• Updated input 'lanzaboote':
    'github:nix-community/lanzaboote/2e425f3da6ce7f5b34fa6eaf7a2a7f78dbabcc85' (2025-05-12)
  → 'github:nix-community/lanzaboote/00292388ad3b497763b81568d6ee5e1c4a2bcf85' (2025-06-09)
• Updated input 'lanzaboote/crane':
    'github:ipetkov/crane/dfd9a8dfd09db9aad544c4d3b6c47b12562544a5' (2025-05-03)
  → 'github:ipetkov/crane/323b5746d89e04b22554b061522dfce9e4c49b18' (2025-06-03)
• Updated input 'lanzaboote/flake-compat':
    'github:edolstra/flake-compat/ff81ac966bb2cae68946d5ed5fc4994f96d0ffec' (2024-12-04)
  → 'github:edolstra/flake-compat/9100a0f413b0c601e0533d1d94ffd501ce2e7885' (2025-05-12)
• Updated input 'lanzaboote/flake-parts':
    'github:hercules-ci/flake-parts/c621e8422220273271f52058f618c94e405bb0f5' (2025-04-01)
  → 'github:hercules-ci/flake-parts/9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569' (2025-06-08)
• Updated input 'lanzaboote/pre-commit-hooks-nix':
    'github:cachix/pre-commit-hooks.nix/fa466640195d38ec97cf0493d6d6882bc4d14969' (2025-05-06)
  → 'github:cachix/pre-commit-hooks.nix/80479b6ec16fefd9c1db3ea13aeb038c60530f46' (2025-05-16)
• Updated input 'lanzaboote/rust-overlay':
    'github:oxalica/rust-overlay/5b07506ae89b025b14de91f697eba23b48654c52' (2025-05-12)
  → 'github:oxalica/rust-overlay/e7876c387e35dc834838aff254d8e74cf5bd4f19' (2025-06-09)
• Updated input 'lix':
    'git+https://git@git.lix.systems/lix-project/lix?ref=refs/heads/main&rev=fda93021ca8bf43de1e43c223b439b41c3990e4c' (2025-05-27)
  → 'git+https://git@git.lix.systems/lix-project/lix?ref=refs/heads/main&rev=b70bbbe680ff5f5ab6e35a21a091d0f845278cda' (2025-06-07)
• Updated input 'mobile-nixos':
    'github:NixOS/mobile-nixos/6e249e58b5d8166738ebcfd401f05f7496049dd3' (2025-05-25)
  → 'github:NixOS/mobile-nixos/ae83121feab618142c910c407fb6b686849cdaf2' (2025-06-07)
• Updated input 'nixosHardware':
    'github:NixOS/nixos-hardware/11f2d9ea49c3e964315215d6baa73a8d42672f06' (2025-05-22)
  → 'github:NixOS/nixos-hardware/4602f7e1d3f197b3cb540d5accf5669121629628' (2025-06-06)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/62b852f6c6742134ade1abdd2a21685fd617a291' (2025-05-25)
  → 'github:NixOS/nixpkgs/3e3afe5174c561dee0df6f2c2b2236990146329f' (2025-06-07)
• Updated input 'treefmt-nix':
    'github:numtide/treefmt-nix/1f3f7b784643d488ba4bf315638b2b0a4c5fb007' (2025-05-26)
  → 'github:numtide/treefmt-nix/a05be418a1af1198ca0f63facb13c985db4cb3c5' (2025-06-06)
2025-06-09 15:35:42 +00:00
c03cbcdc0e
Disable element and enable unison and jellyfin on kirk
All checks were successful
EVAL aarch64-linux.sisko
/ test (push) Successful in 1m22s
2025-06-04 15:05:17 +02:00
f302514403
Add aider/aidermacs
All checks were successful
EVAL aarch64-linux.sisko
BUILD aarch64-linux.sisko
UPLOAD aarch64-linux.sisko
DOWNLOAD aarch64-linux.sisko
CACHIX aarch64-linux.sisko
ATTIC aarch64-linux.sisko
/ test (push) Successful in 1m29s
2025-06-04 15:01:04 +02:00
cea95102f7
Rename secret chatgpt-token to openrouter-api-key 2025-06-04 15:00:28 +02:00
8 changed files with 75 additions and 63 deletions

110
flake.lock generated
View file

@ -26,11 +26,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1748080874,
"narHash": "sha256-sUebEzAkrY8Aq5G0GHFyRddmRNGP/a2iTtV7ISNvi/c=",
"lastModified": 1749223974,
"narHash": "sha256-/GAQYRW1duU81KG//2wI9ax8EkHVG/e1UOD97NdwLOY=",
"owner": "catppuccin",
"repo": "nix",
"rev": "0ba11b12be81f0849a89ed17ab635164ea8f0112",
"rev": "3a42cd79c647360ee8742659e42aeec0947dd3b4",
"type": "github"
},
"original": {
@ -41,11 +41,11 @@
},
"crane": {
"locked": {
"lastModified": 1746291859,
"narHash": "sha256-DdWJLA+D5tcmrRSg5Y7tp/qWaD05ATI4Z7h22gd1h7Q=",
"lastModified": 1748970125,
"narHash": "sha256-UDyigbDGv8fvs9aS95yzFfOKkEjx1LO3PL3DsKopohA=",
"owner": "ipetkov",
"repo": "crane",
"rev": "dfd9a8dfd09db9aad544c4d3b6c47b12562544a5",
"rev": "323b5746d89e04b22554b061522dfce9e4c49b18",
"type": "github"
},
"original": {
@ -83,11 +83,11 @@
]
},
"locked": {
"lastModified": 1748832438,
"narHash": "sha256-/CtyLVfNaFP7PrOPrTEuGOJBIhcBKVQ91KiEbtXJi0A=",
"lastModified": 1749436314,
"narHash": "sha256-CqmqU5FRg5AadtIkxwu8ulDSOSoIisUMZRLlcED3Q5w=",
"owner": "nix-community",
"repo": "disko",
"rev": "58d6e5a83fff9982d57e0a0a994d4e5c0af441e4",
"rev": "dfa4d1b9c39c0342ef133795127a3af14598017a",
"type": "github"
},
"original": {
@ -122,11 +122,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1748941793,
"narHash": "sha256-HncwK05hos0Z5SSjVF5CtZjwMTn56xjWq08fRIdKBms=",
"lastModified": 1749461020,
"narHash": "sha256-EmVW3BNzwpMemCy50+nx8rK+q7U3ioXX3ErhXQFiHEg=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "78278b770d2c83657657da569544cf20eccee0ef",
"rev": "3bb5d2b3966b1a79258daf1ec62963698cef90d9",
"type": "github"
},
"original": {
@ -170,11 +170,11 @@
"flake-compat_3": {
"flake": false,
"locked": {
"lastModified": 1733328505,
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
"lastModified": 1747046372,
"narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
"rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
"type": "github"
},
"original": {
@ -191,11 +191,11 @@
]
},
"locked": {
"lastModified": 1743550720,
"narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
"lastModified": 1749398372,
"narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "c621e8422220273271f52058f618c94e405bb0f5",
"rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569",
"type": "github"
},
"original": {
@ -245,11 +245,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1748821116,
"narHash": "sha256-F82+gS044J1APL0n4hH50GYdPRv/5JWm34oCJYmVKdE=",
"lastModified": 1749398372,
"narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "49f0870db23e8c1ca0b5259734a02cd9e1e371a1",
"rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569",
"type": "github"
},
"original": {
@ -387,11 +387,11 @@
]
},
"locked": {
"lastModified": 1748925027,
"narHash": "sha256-BJ0qRIdvt5aeqm3zg/5if7b5rruG05zrSX3UpLqjDRk=",
"lastModified": 1749479111,
"narHash": "sha256-0cn4NGnYR3n0m8FPrt+pW817Cedi4vwOw3SgJaTcdcg=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "cb809ec1ff15cf3237c6592af9bbc7e4d983e98c",
"rev": "35e1f5a7c29f2b05e8f53177f6b5c71108c5f4c3",
"type": "github"
},
"original": {
@ -448,11 +448,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1747056319,
"narHash": "sha256-qSKcBaISBozadtPq6BomnD+wIYTZIkiua3UuHLaD52c=",
"lastModified": 1749471908,
"narHash": "sha256-uGfPqd43KTomeIVWUzHu3hGLWFsqYibhWLt2OaRic28=",
"owner": "nix-community",
"repo": "lanzaboote",
"rev": "2e425f3da6ce7f5b34fa6eaf7a2a7f78dbabcc85",
"rev": "00292388ad3b497763b81568d6ee5e1c4a2bcf85",
"type": "github"
},
"original": {
@ -464,11 +464,11 @@
"lix": {
"flake": false,
"locked": {
"lastModified": 1748893954,
"narHash": "sha256-Vj1GHarIzlJI3We5KnYcAQlSjn++fx7/lKRaiIVz3tg=",
"lastModified": 1749302831,
"narHash": "sha256-s+dF/43F7a2VwGidUxNVyAjpd7paBpEAJ7cfpwH93k4=",
"ref": "refs/heads/main",
"rev": "019b17f4e93c098f99a9bc691be1f1c4df026c7d",
"revCount": 17982,
"rev": "b70bbbe680ff5f5ab6e35a21a091d0f845278cda",
"revCount": 17997,
"type": "git",
"url": "https://git@git.lix.systems/lix-project/lix"
},
@ -505,11 +505,11 @@
"mobile-nixos": {
"flake": false,
"locked": {
"lastModified": 1748200777,
"narHash": "sha256-ELbQ7Apk0QzfhO8WjQIqEBuN2bEnGQHNxeiOSx/mU38=",
"lastModified": 1749321409,
"narHash": "sha256-MDTCCPQzPM/XNDCz+qqkgrPGARRryn/DHRA45Wc28/E=",
"owner": "NixOS",
"repo": "mobile-nixos",
"rev": "6e249e58b5d8166738ebcfd401f05f7496049dd3",
"rev": "ae83121feab618142c910c407fb6b686849cdaf2",
"type": "github"
},
"original": {
@ -569,11 +569,11 @@
},
"nixosHardware": {
"locked": {
"lastModified": 1748942041,
"narHash": "sha256-HEu2gTct7nY0tAPRgBtqYepallryBKR1U8B4v2zEEqA=",
"lastModified": 1749195551,
"narHash": "sha256-W5GKQHgunda/OP9sbKENBZhMBDNu2QahoIPwnsF6CeM=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "fc7c4714125cfaa19b048e8aaf86b9c53e04d853",
"rev": "4602f7e1d3f197b3cb540d5accf5669121629628",
"type": "github"
},
"original": {
@ -647,11 +647,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1748810746,
"narHash": "sha256-1na8blYvU1F6HLwx/aFjrhUqpqZ0SCsnqqW9n2vXvok=",
"lastModified": 1749173751,
"narHash": "sha256-ENY3y3v6S9ZmLDDLI3LUT8MXmfXg/fSt2eA4GCnMVCE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "78d9f40fd6941a1543ffc3ed358e19c69961d3c1",
"rev": "ed29f002b6d6e5e7e32590deb065c34a31dc3e91",
"type": "github"
},
"original": {
@ -711,11 +711,11 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1748693115,
"narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=",
"lastModified": 1749285348,
"narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc",
"rev": "3e3afe5174c561dee0df6f2c2b2236990146329f",
"type": "github"
},
"original": {
@ -742,11 +742,11 @@
},
"nixpkgs_6": {
"locked": {
"lastModified": 1748693115,
"narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=",
"lastModified": 1749285348,
"narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc",
"rev": "3e3afe5174c561dee0df6f2c2b2236990146329f",
"type": "github"
},
"original": {
@ -821,11 +821,11 @@
]
},
"locked": {
"lastModified": 1746537231,
"narHash": "sha256-Wb2xeSyOsCoTCTj7LOoD6cdKLEROyFAArnYoS+noCWo=",
"lastModified": 1747372754,
"narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "fa466640195d38ec97cf0493d6d6882bc4d14969",
"rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46",
"type": "github"
},
"original": {
@ -906,11 +906,11 @@
]
},
"locked": {
"lastModified": 1747017456,
"narHash": "sha256-C/U12fcO+HEF071b5mK65lt4XtAIZyJSSJAg9hdlvTk=",
"lastModified": 1749436897,
"narHash": "sha256-OkDtaCGQQVwVFz5HWfbmrMJR99sFIMXHCHEYXzUJEJY=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "5b07506ae89b025b14de91f697eba23b48654c52",
"rev": "e7876c387e35dc834838aff254d8e74cf5bd4f19",
"type": "github"
},
"original": {
@ -1009,11 +1009,11 @@
]
},
"locked": {
"lastModified": 1748243702,
"narHash": "sha256-9YzfeN8CB6SzNPyPm2XjRRqSixDopTapaRsnTpXUEY8=",
"lastModified": 1749194973,
"narHash": "sha256-eEy8cuS0mZ2j/r/FE0/LYBSBcIs/MKOIVakwHVuqTfk=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "1f3f7b784643d488ba4bf315638b2b0a4c5fb007",
"rev": "a05be418a1af1198ca0f63facb13c985db4cb3c5",
"type": "github"
},
"original": {

View file

@ -12,7 +12,7 @@ in
{
systemd.user.sessionVariables = {
EDITOR = lib.mkForce "emacsclient -c";
OPENAI_API_KEY_PATH = age.secrets.chatgpt-token.path;
OPENROUTER_API_KEY_PATH = age.secrets.openrouter-api-key.path;
};
programs.emacs = {
enable = true;
@ -50,6 +50,7 @@ in
math-preview
emacs-lsp-booster
texlive.combined.scheme-full
aider-chat-full
]
++ (with hunspellDicts; [
en_US-large

View file

@ -1032,13 +1032,22 @@ This is meant to be an helper to be called from the window manager."
(:map org-mode-map
(("M-p" . org-download-clipboard))))
(use-package aidermacs
:bind (("C-c A" . aidermacs-transient-menu))
:init
(require 'f)
(setenv "OPENROUTER_API_KEY" (f-read-text (getenv "OPENROUTER_API_KEY_PATH")))
:custom
(aidermacs-use-architect-mode t)
(aidermacs-default-model "openrouter/deepseek/deepseek-chat-v3-0324"))
(use-package gptel
:custom
(gptel-model 'google/gemini-2.5-flash-preview)
(gptel-backend (gptel-make-openai "OpenRouter"
:host "openrouter.ai"
:endpoint "/api/v1/chat/completions"
:key (lambda () (require 'f) (f-read-text (getenv "OPENAI_API_KEY_PATH")))
:key (lambda () (require 'f) (f-read-text (getenv "OPENROUTER_API_KEY_PATH")))
:stream t
:models '(google/gemini-2.5-flash-preview))
)

View file

@ -33,7 +33,7 @@
];
secrets = {
"deltaflyer-wireguard-private-key" = { };
"chatgpt-token".owner = "ccr";
"openrouter-api-key".owner = "ccr";
};
};
@ -54,7 +54,7 @@
];
secrets = {
"kirk-wireguard-private-key" = { };
"chatgpt-token".owner = "ccr";
"openrouter-api-key".owner = "ccr";
"cachix-personal-token".owner = "ccr";
"git-workspace-tokens".owner = "ccr";
"autistici-password".owner = "ccr";
@ -81,7 +81,7 @@
];
secrets = {
"picard-wireguard-private-key" = { };
"chatgpt-token".owner = "ccr";
"openrouter-api-key".owner = "ccr";
"cachix-personal-token".owner = "ccr";
"git-workspace-tokens".owner = "ccr";
"autistici-password".owner = "ccr";
@ -143,7 +143,7 @@
];
secrets = {
"pike-wireguard-private-key" = { };
"chatgpt-token".owner = "ccr";
"openrouter-api-key".owner = "ccr";
"cachix-personal-token".owner = "ccr";
"git-workspace-tokens".owner = "ccr";
"autistici-password".owner = "ccr";

View file

@ -46,7 +46,6 @@
"helix"
"shell"
"zellij"
"element"
"firefox"
"gpg"
"mpv"
@ -75,6 +74,8 @@
"zmkbatx"
"moonlight"
"gimp"
"unison"
"jellyfin"
];
extraGroups = [ "plugdev" ];
backupPaths = [ ];

View file

@ -208,6 +208,7 @@ let
visual-replace
org-super-agenda
tidal
aidermacs
# org-re-reveal # FIXME very not nice hash mismatch when building
]
)

View file

@ -84,7 +84,7 @@ with keys.users;
ccr-ssh
sisko
];
"chatgpt-token.age".publicKeys = [
"openrouter-api-key.age".publicKeys = [
ccr-ssh
kirk
mothership