Compare commits

..

7 commits

Author SHA1 Message Date
a709966def flake.lock: Update
All checks were successful
EVAL x86_64-linux.picard
BUILD x86_64-linux.picard
UPLOAD x86_64-linux.picard
DOWNLOAD x86_64-linux.picard
CACHIX x86_64-linux.picard
ATTIC x86_64-linux.picard
/ test (push) Successful in 23m31s
Flake lock file updates:

• Updated input 'catppuccin':
    'github:catppuccin/nix/5e303e8d7e251868fa79f83bbda69da90aa62402' (2025-03-21)
  → 'github:catppuccin/nix/07beb389d69a52c4dd5895da9553463c3740a26a' (2025-04-04)
• Updated input 'catppuccin/nixpkgs':
    'github:NixOS/nixpkgs/b6eaf97c6960d97350c584de1b6dcff03c9daf42' (2025-03-18)
  → 'github:NixOS/nixpkgs/2c8d3f48d33929642c1c12cd243df4cc7d2ce434' (2025-04-02)
• Updated input 'disko':
    'github:nix-community/disko/0d8c6ad4a43906d14abd5c60e0ffe7b587b213de' (2025-03-12)
  → 'github:nix-community/disko/329d3d7e8bc63dd30c39e14e6076db590a6eabe6' (2025-04-02)
• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/5c22a2387d4ac1e1d64d66489e7d3ecb0a30cbcd' (2025-03-27)
  → 'github:nix-community/emacs-overlay/ac8af15c5f586879c08cd257b69749f791d94e68' (2025-04-07)
• Updated input 'emacs-overlay/nixpkgs':
    'github:NixOS/nixpkgs/698214a32beb4f4c8e3942372c694f40848b360d' (2025-03-25)
  → 'github:NixOS/nixpkgs/42a1c966be226125b48c384171c44c651c236c22' (2025-04-05)
• Updated input 'emacs-overlay/nixpkgs-stable':
    'github:NixOS/nixpkgs/d02d88f8de5b882ccdde0465d8fa2db3aa1169f7' (2025-03-25)
  → 'github:NixOS/nixpkgs/7819a0d29d1dd2bc331bec4b327f0776359b1fa6' (2025-04-05)
• Updated input 'flakeParts':
    'github:hercules-ci/flake-parts/f4330d22f1c5d2ba72d3d22df5597d123fdb60a9' (2025-03-07)
  → 'github:hercules-ci/flake-parts/c621e8422220273271f52058f618c94e405bb0f5' (2025-04-01)
• Updated input 'flakeParts/nixpkgs-lib':
    'github:nix-community/nixpkgs.lib/147dee35aab2193b174e4c0868bd80ead5ce755c' (2025-03-02)
  → 'github:nix-community/nixpkgs.lib/e4822aea2a6d1cdd36653c134cacfd64c97ff4fa' (2025-03-30)
• Updated input 'homeManager':
    'github:nix-community/home-manager/171915bfce41018528fda9960211e81946d999b7' (2025-03-27)
  → 'github:nix-community/home-manager/f463902a3f03e15af658e48bcc60b39188ddf734' (2025-04-07)
• Updated input 'lix':
    'git+https://git@git.lix.systems/lix-project/lix?ref=refs/heads/main&rev=b52db5e7c120fdf67e914ba9fec648a461e08614' (2025-03-28)
  → 'git+https://git@git.lix.systems/lix-project/lix?ref=refs/heads/main&rev=2ef4b69760af183792a740f425eb371a6aeb0009' (2025-04-06)
• Updated input 'mobile-nixos':
    'github:NixOS/mobile-nixos/8956d72cf8fa9110dcc5fcbc537adee45a8014f5' (2025-03-04)
  → 'github:NixOS/mobile-nixos/6679fd7a8dd4ccf4aa538b82216723861cfe61a2' (2025-04-05)
• Updated input 'nixosHardware':
    'github:NixOS/nixos-hardware/ecaa2d911e77c265c2a5bac8b583c40b0f151726' (2025-03-24)
  → 'github:NixOS/nixos-hardware/de6fc5551121c59c01e2a3d45b277a6d05077bc4' (2025-03-31)
• Updated input 'treefmt-nix':
    'github:numtide/treefmt-nix/29a3d7b768c70addce17af0869f6e2bd8f5be4b7' (2025-03-27)
  → 'github:numtide/treefmt-nix/815e4121d6a5d504c0f96e5be2dd7f871e4fd99d' (2025-04-04)
2025-04-07 15:01:21 +00:00
72782ebb87
Use gptel tools
All checks were successful
EVAL x86_64-linux.picard
BUILD x86_64-linux.picard
UPLOAD x86_64-linux.picard
DOWNLOAD x86_64-linux.picard
CACHIX x86_64-linux.picard
ATTIC x86_64-linux.picard
/ test (push) Successful in 15m7s
2025-04-06 17:23:36 +02:00
b58c3c4d31
Use gemini 2025-04-06 17:23:00 +02:00
dc30a6a437
gptel shortcuts 2025-04-06 17:22:11 +02:00
8f73eca404
Disable eshell-atuin 2025-04-06 17:21:58 +02:00
f546beea17
Use meow-tree-sitter 2025-04-06 17:21:45 +02:00
d0e16f75f7
Sign git commits with id_ed25519 instead of id_rsa 2025-04-06 17:21:17 +02:00
3 changed files with 81 additions and 19 deletions

26
flake.lock generated
View file

@ -122,11 +122,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1743930892, "lastModified": 1743991507,
"narHash": "sha256-2efjGG9Mpz/QPZQjkeqOW/mpxf099t0NO0kK/tchWPQ=", "narHash": "sha256-sRyA1LOsRSeF8W2drXEuGU2U+actcYEKdk1f+2kDKb8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "3fb12f3aacdc18ee1f455cca300c33d5f20de175", "rev": "ac8af15c5f586879c08cd257b69749f791d94e68",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -387,11 +387,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1743948087, "lastModified": 1744008831,
"narHash": "sha256-B6cIi2ScgVSROPPlTti6len+TdR0K25B9R3oKvbw3M8=", "narHash": "sha256-g3mHJLB8ShKuMaBBZxiGuoftJ22f7Boegiw5xBUnS8E=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "ef3b2a6b602c3f1a80c6897d6de3ee62339a3eb7", "rev": "f463902a3f03e15af658e48bcc60b39188ddf734",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -464,11 +464,11 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1743933152, "lastModified": 1743964165,
"narHash": "sha256-r9ERTC2qY3S76l1KHB1/SWQjqQtrYBRmNUL3lnCF18o=", "narHash": "sha256-5vXjK5W+RIveud/Qn4OyVqrZi4pUDefKZsny33dDj+s=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "63d550938ba2a3690be987e884fe95e384708a82", "rev": "2ef4b69760af183792a740f425eb371a6aeb0009",
"revCount": 17764, "revCount": 17767,
"type": "git", "type": "git",
"url": "https://git@git.lix.systems/lix-project/lix" "url": "https://git@git.lix.systems/lix-project/lix"
}, },
@ -647,11 +647,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1743703532, "lastModified": 1743813633,
"narHash": "sha256-s1KLDALEeqy+ttrvqV3jx9mBZEvmthQErTVOAzbjHZs=", "narHash": "sha256-BgkBz4NpV6Kg8XF7cmHDHRVGZYnKbvG0Y4p+jElwxaM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bdb91860de2f719b57eef819b5617762f7120c70", "rev": "7819a0d29d1dd2bc331bec4b327f0776359b1fa6",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -214,6 +214,8 @@
:custom :custom
(meow-use-clipboard 't) (meow-use-clipboard 't)
:config :config
(require 'meow-tree-sitter)
(meow-tree-sitter-register-defaults)
(add-hook 'after-make-frame-functions (defun ccr/meow--prepare-face (_) (add-hook 'after-make-frame-functions (defun ccr/meow--prepare-face (_)
(meow--prepare-face) (meow--prepare-face)
(remove-hook 'after-make-frame-functions 'ccr/meow--prepare-face))) (remove-hook 'after-make-frame-functions 'ccr/meow--prepare-face)))
@ -698,8 +700,8 @@
:custom ((eshell-command-not-found-command "command-not-found")) :custom ((eshell-command-not-found-command "command-not-found"))
:hook ((eshell-mode . eshell-command-not-found-mode))) :hook ((eshell-mode . eshell-command-not-found-mode)))
(use-package eshell-atuin ;; (use-package eshell-atuin
:hook ((eshell-mode . eshell-atuin-mode))) ;; :hook ((eshell-mode . eshell-atuin-mode)))
(use-package eshell-syntax-highlighting (use-package eshell-syntax-highlighting
:custom :custom
@ -981,22 +983,82 @@ This is meant to be an helper to be called from the window manager."
(use-package gptel (use-package gptel
:custom :custom
(gptel-model 'qwen/qwen-max) (gptel-model 'google/gemini-2.0-flash-001)
(gptel-backend (gptel-make-openai "OpenRouter" (gptel-backend (gptel-make-openai "OpenRouter"
:host "openrouter.ai" :host "openrouter.ai"
:endpoint "/api/v1/chat/completions" :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 "OPENAI_API_KEY_PATH")))
:stream t :stream t
:models '(qwen/qwen-max deepseek/deepseek-chat)) :models '(google/gemini-2.0-flash-001))
) )
(gptel-default-mode 'org-mode) (gptel-default-mode 'org-mode)
(gptel-org-branching-context nil) ;; this is cool but I don't feel comfortable with it (gptel-org-branching-context nil) ;; this is cool but I don't feel comfortable with it
(gptel-use-tools 't)
:bind
("C-c a a" . gptel-add)
("C-c a f" . gptel-add-file)
("C-c a r" . gptel-context-remove-all)
("C-c a " . gptel-menu)
:config :config
(require 'gptel-curl) (require 'gptel-curl)
;; (add-hook 'gptel-post-response-functions 'gptel-end-of-response) ;; (add-hook 'gptel-post-response-functions 'gptel-end-of-response)
;; (add-hook 'gptel-post-stream-hook 'gptel-auto-scroll) ;; (add-hook 'gptel-post-stream-hook 'gptel-auto-scroll)
(setq gptel-tools (mapcar (lambda (tool) (apply #'gptel-make-tool tool))
'((
:name "create_file"
:function (lambda (path filename content)
(let ((full-path (expand-file-name filename path)))
(with-temp-buffer
(insert content)
(write-file full-path))
(format-read "Created file %s in %s" filename path)))
:description "Create a new file with the specified content"
:args (list '(:name "path"
:type string
:description "The directory where to create the file")
'(:name "filename"
:type string
:description "The name of the file to create")
'(:name "content"
:type string
:description "The content to write to the file"))
:category "filesystem"
)
;; (
;; :name "run_command"
;; :confirm 't
;; :function (lambda (command)
;; (shell-command-to-string command))
;; :description "Run arbitrary commands"
;; :args (list '(:name "command"
;; :type string
;; :description "The content to run e.g. 'ls *' or 'fd <pattern> <path>'"))
;; )
(
:name "get_weather"
:function (lambda (location)
(url-retrieve-synchronously "api.weather.com/..."
location unit))
:description "Get the current weather in a given location"
:args (list '(:name "location"
:type string
:description "The city and state, e.g. San Francisco, CA")
'(:name "unit"
:type string
:enum ["celsius" "farenheit"]
:description
"The unit of temperature, either 'celsius' or 'fahrenheit"
:optional t
))
)
))
)
(defun ccr/suggest-eshell-command () (defun ccr/suggest-eshell-command ()
(interactive) (interactive)
(save-excursion (save-excursion

View file

@ -27,11 +27,11 @@ in
rebase.autostash = true; rebase.autostash = true;
github.user = "aciceri"; github.user = "aciceri";
user.signingKey = "/home/${username}/.ssh/id_rsa"; user.signingKey = "/home/${username}/.ssh/id_ed25519";
gpg.format = "ssh"; gpg.format = "ssh";
commit.gpgsign = true; commit.gpgsign = true;
credential.helper = "manager"; credential.helper = "libsecret";
credential.credentialStore = "cache"; credential.credentialStore = "cache";
core = { core = {