diff --git a/flake.lock b/flake.lock index b5eb6f3..6666f7e 100644 --- a/flake.lock +++ b/flake.lock @@ -122,11 +122,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1738919824, - "narHash": "sha256-FvaTbPs4O4NmE71xjb/lNSsNAkyXUnm7NU/bY86oUws=", + "lastModified": 1739067033, + "narHash": "sha256-On2apbig9LjjSJDDzyCUZkxdWoQIBOavaG02vh693PQ=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "d1a312c524fe9f1a6836fc3fd63c6fd09f795abb", + "rev": "6c02db1d65ff3c8d1a871c50bd2cdf3b4822fafd", "type": "github" }, "original": { @@ -466,11 +466,11 @@ ] }, "locked": { - "lastModified": 1738878603, - "narHash": "sha256-fmhq8B3MvQLawLbMO+LWLcdC2ftLMmwSk+P29icJ3tE=", + "lastModified": 1739051380, + "narHash": "sha256-p1QSLO8DJnANY+ppK7fjD8GqfCrEIDjso1CSRHsXL7Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "433799271274c9f2ab520a49527ebfe2992dcfbd", + "rev": "5af1b9a0f193ab6138b89a8e0af8763c21bbf491", "type": "github" }, "original": { @@ -543,11 +543,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1738884029, - "narHash": "sha256-1ec7lPpnAadqcg3Yetq4Ci+Pt1yonjrwZqi1rtEvKBA=", + "lastModified": 1739022633, + "narHash": "sha256-CaXRW9kDAcf1QIxjOF5ffMW0JkZWSrNv0QGBvd26EkY=", "ref": "refs/heads/main", - "rev": "1a13827425dbf4e93f5054fd7ad5325894bf1a3d", - "revCount": 17366, + "rev": "b60314f32eb02417463392b6276d456ad853ccc5", + "revCount": 17381, "type": "git", "url": "https://git@git.lix.systems/lix-project/lix" }, @@ -698,11 +698,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1738743987, - "narHash": "sha256-O3bnAfsObto6l2tQOmQlrO6Z2kD6yKwOWfs7pA0CpOc=", + "lastModified": 1739034224, + "narHash": "sha256-Mj/8jDzh1KNmUhWqEeVlW3hO9MZkxqioJGnmR7rivaE=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "ae406c04577ff9a64087018c79b4fdc02468c87c", + "rev": "0b6f96a6b9efcfa8d3cc8023008bcbcd1b9bc1a4", "type": "github" }, "original": { @@ -905,11 +905,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1738680400, - "narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=", + "lastModified": 1739020877, + "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "799ba5bffed04ced7067a91798353d360788b30d", + "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", "type": "github" }, "original": { @@ -984,11 +984,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1738680400, - "narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=", + "lastModified": 1739020877, + "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "799ba5bffed04ced7067a91798353d360788b30d", + "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", "type": "github" }, "original": { @@ -1277,11 +1277,11 @@ ] }, "locked": { - "lastModified": 1738680491, - "narHash": "sha256-8X7tR3kFGkE7WEF5EXVkt4apgaN85oHZdoTGutCFs6I=", + "lastModified": 1738953846, + "narHash": "sha256-yrK3Hjcr8F7qS/j2F+r7C7o010eVWWlm4T1PrbKBOxQ=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "64dbb922d51a42c0ced6a7668ca008dded61c483", + "rev": "4f09b473c936d41582dd744e19f34ec27592c5fd", "type": "github" }, "original": { diff --git a/hmModules/emacs/init.el b/hmModules/emacs/init.el index fa728b8..ba64445 100644 --- a/hmModules/emacs/init.el +++ b/hmModules/emacs/init.el @@ -926,8 +926,15 @@ This is meant to be an helper to be called from the window manager." (use-package gptel :custom - (gptel-api-key (lambda () (require 'f) (f-read-text (getenv "OPENAI_API_KEY_PATH")))) - (gptel-model 'gpt-4o) + ;; (gptel-model 'deepseek/deepseek-chat) + (gptel-model 'qwen/qwen-max) + (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"))) + :stream t + :models '(qwen/qwen-max deepseek/deepseek-chat)) + ) (gptel-default-mode 'org-mode) (gptel-org-branching-context nil) ;; this is cool but I don't feel comfortable with it :config @@ -963,9 +970,7 @@ This is meant to be an helper to be called from the window manager." (defun ccr/start-chatgpt () ;; Used from outside Emacs by emacsclient --eval (display-buffer (gptel "*ChatGPT*")) (set-frame-name "floating") - ;; (delete-other-windows) - ;; (add-hook 'kill-buffer-hook 'delete-frame nil 't) - ) ;; destroy frame on exit + ) ) (use-package mixed-pitch diff --git a/hmModules/zoom/default.nix b/hmModules/zoom/default.nix new file mode 100644 index 0000000..78c6b5d --- /dev/null +++ b/hmModules/zoom/default.nix @@ -0,0 +1,4 @@ +{ pkgs, ... }: +{ + home.packages = [ pkgs.zoom-us ]; +} diff --git a/hosts/picard/default.nix b/hosts/picard/default.nix index eea6cd0..104a454 100644 --- a/hosts/picard/default.nix +++ b/hosts/picard/default.nix @@ -94,6 +94,7 @@ "sdrangel" "discord" "ib-tws" + "zoom" ]; extraGroups = [ "plugdev" ]; backupPaths = [ ]; diff --git a/modules/xdg/default.nix b/modules/xdg/default.nix index 8aaabf7..3dc5b50 100644 --- a/modules/xdg/default.nix +++ b/modules/xdg/default.nix @@ -8,12 +8,16 @@ xdg-desktop-portal-gtk xdg-desktop-portal-hyprland xdg-desktop-portal-gnome + xdg-desktop-portal + xdg-desktop-portal-kde ]; extraPortals = with pkgs; [ xdg-desktop-portal-wlr xdg-desktop-portal-gtk xdg-desktop-portal-hyprland xdg-desktop-portal-gnome + xdg-desktop-portal + xdg-desktop-portal-kde ]; xdgOpenUsePortal = true; wlr.enable = true; diff --git a/secrets/chatgpt-token.age b/secrets/chatgpt-token.age index 65223f0..c6e9bed 100644 --- a/secrets/chatgpt-token.age +++ b/secrets/chatgpt-token.age @@ -1,35 +1,25 @@ age-encryption.org/v1 -> ssh-rsa /AagBw -CHOWHa5s0WUIFzH4QDtMuvOqc3c8pchXXlC+pfVlzcW8y/cqGzpELv1QbvPWfeGm -iKARA1bNGsCND9YZeTfYHaQ2GqEoQBFCNCZe6p+KnEevND9Ol4H1PyxU91C9Ld5E -UfAuaX0ullFLkk13wZWzvPb5zqpXzHA7O9uwg8yLia95f4UIj0i3pTQugJOIhUhH -yIAcD0RNCSK63IHiDgqAXmy/CieBg9fDv0SZEHEXHLuu24jQaWr9LY3jhzoKmXeZ -I6BJSAdkR9liyGeyuLmhY+wRr5ZDilY1nrdrPpQ3/W/6QL2nMbXHZJB/x5P+l1TV -m2q0MeaKOgM0NaRjBNqlBuqrMkNnRc5ELWOAs2462e/a4ykwEIAj+7wKcAhpaXQT -x80zL4xNNUb/ZK7+uwnQosk+NQbMHeVOEE1+gtOwrkluPEF4JdaayKSSvdzW7h9X -Kg0Deo3RUK44rhdKrLNi4QI5NBzBzn00RbrdW6gK+I3Q6k5o6PPzZfxjrVRN0iOi -ZaMK7FsJeOMA/xXu7MZpF8vJl04TD+sHIL8yzCnTAe9KsT/bW+NS3EZwMD4llZxA -1KFD+4e9ha2rkJQYhvWSTsEIgecGTvgFa0e4hnOZNu5CS/QRmal67gGef0+PV3Ss -Nikkg9K/6RZ1rutSdR8P3xrUlJB/GN6DYUaI3MGNhSA --> ssh-rsa QHr3/A -qsMwyVOMLUdxP6k+9tEUuV5HxZCsSwq+lEKBFbAwNV2dGA4sC+B0itsRVPdPnmSv -Gq2dlw4ATSi7403o3wGIp8h5spCeK627ev2CLCU4bqwCRD9wXNJUjf0wMH5hkq7J -pqaEgd31BHTytbEIkR5FYCGzZouPYZqSxbbKYuowKnDOxo26nxMcTyK14bDEpQuo -uPQx6bgXoMFQhU3g/Ky9pOE6za0QOgeX8EW9V2xjcsw+N9l2X48CE5CORx8ZytTS -zCB4MCfiSw1uaORygEoLKKYJ+7JUwUrcoLp3LfxtFMYnUQEGzYac++07si178xGH -w7B3qSTTBF203MxJET04Ns7qgx6cZx7c1k0cXQshr96mvoMvhdvz3fh3LrYGND5l -z7kgjlcZqvxsZ8drNLpVmHc8tou7PuYx0iJV42uhkWguQjl+xOiIIgIOsbw/aumy -RXdg2fgPgbZJbmkxlMgMV0Ml+XRSwWajc98qb/PkSBWT/EefBHODwsFNl5w8Nxfd -Dr2RCMDkxOnTMO0JASMdrG8cE8iSg6C3YhTjAYIQ1ObndlPTiz8dlo2jMKnwv5/k -8N5b2Qwyf+UL7sKnHrY5bF4TAOPeHqcvUD8wAHhE7KYDk+/d6UoQ0BByfqX1mJ/H -f2ZGIHbezYNGTZV2pgz3nCUV8hdOH4H4Ee5Yur0EdbQ --> ssh-ed25519 /yLdGQ 2Ks9W5MlblwIlf0uxZjtNmMqwOmF4NWlHI6KU8z6uTM -QMZVdDi6lwO6FtayG9tD71aGY5x6DZ3XdbSbxjQZkfU --> ssh-ed25519 q+UPnA DWCcAGeQNyyMhkgkX144+dBK/fX8+IWD38gLdJ0izi0 -TAKrqabgBbdeh+XINayMoXWM/Dwvf3h5xRzJu3pVhDw --> ssh-ed25519 /WmILg u+/Y59Upn76Zcfz230MdLKKTFfWVHwW6cgNxGQ6YelI -4tgWqorMWBXXUzrj3PzcJNUlmMw69PJwZ9MEHR2mN5E --> ssh-ed25519 8jLrqw x8WAPZY7Yi/3NZgZ4huRePeXBW9lgXlIEPbEVTfoABQ -rTcFw+WySD/4gmR8dWlnQkxZcxIQzxDqhSIS6AKoO7M ---- KsEdL+jGLGm61R7KZw/x3NUdpUl/k//nvQcSbfhSHLU -E.5sSȩr:¨, M>!2(*S>I$H1@ OTI~5VRg3bߗj(YJI!IZU/ZP3R~,Ju:U愕=*j-\KIn(x:ײi񻜁b u3.[Kp+~`RhR3a \ No newline at end of file +EADjmWkMsTJpO1ZVUgQcxwJXv2FwYlCr82g8OEjjjryynm6RW4YFBn0qTWgi65Mn +0GZMJ5kHWtMgAB56czDA9oLa4BnI4sSMmHeNmpcaeHgb4J1G82xZod33PuFmIiMo +uYCzzWk5CDjhoIHeWI1vjDS0ThHABpYkkfdUX2zjxTz81b+iBzbYVDowtQnvWc60 +mN3Jnn3xhEXlhjODINfb4+T2+SqbnMmh1p6JGwX4XlwoOUt12GT+3orBlhDJwv+7 +nXe+7+XDFyJWxElfU36cbT2i5wa2lh2HdwcC0d5H9kaLjcmnm9n6UQv2f2rYLoZO +HeTWIOT9OmWKYEMFPYjw4NpFGsdNMliuULzzcTFJLSf3nzqp5EuuFIrigJ9+yNI5 +GZqFH4miSj5eZzrArG8SrFsrU9BumWGqDYSTCVch5M/xEpLH+9cbT5x5s8EYU8XS +ahuzvFb+/j/vB+GXDy+2VIQV1JceGgcmmAP2XsJqo+RbkWX/JtyTT44Ykb5JCvs2 +DWwqbv9kOZy7t3seQ88UJLDAjBBJPeMuOjxuJqJ1VUkAPSYQniwjhoCs5WFXYaut +Y5BmrCt3O8AZT88EGMXp3PQluXyA8phqDVd0P1vfb86TL4XFqZE/FdxfYZQnSFn9 ++tftqzpCqgXfCZMOkZ2NI3ecCvwj0wSgY6ZBcQ1iECc +-> ssh-ed25519 /yLdGQ t7sawj3lqbUPA2u3VATxAvuz99yXGL78uZNdztvD0WU +i9ug1OvGsaSD6rtZ6PJY//v40C2PVIGAKm6lTa+cx7w +-> ssh-ed25519 q+UPnA E6yWvWZqk8b/qyOO2eKABF9yr+4cNsPP42t5CUMYqBQ +Wu3n4UuPht8ICr6UBpTbNQam6Yk08Cbxqcc8fq5MpMw +-> ssh-ed25519 /WmILg UXeCTXz6O8XqsHgxwgH9cb0JE/63JiRKSJ7StDQScj0 +X3vG2l4Y+g26QWiJ3i4xNk9rkFtYZU1DTX2oiJZw4Gg +-> ssh-ed25519 8jLrqw IDNAAZSwRBm4xpfw9o1hgSyl3tBkpFRXNSY95XxBYi8 +Y7HkEAdtyWloEZJMSbiAGcd3PxtGlvl/X/mSiQja7Po +--- cHL2AidE24yaO8uXDsBtD+AYyrY3cPF5GxKM3JSKg5M +ȣ;lZ"۔ͱhEhb +5VꀍznHH-~ +Lt8*čv2dj`?C'>pA)3f:.u \ No newline at end of file