From 20fbfcc9ce0334609bc07a18f0229bf7f730c4a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Madeleine=20Sydney=20=C5=9Alaga?= Date: Sat, 5 Sep 2026 03:44:33 -0600 Subject: [PATCH] upgrade --- flake.lock | 297 ++++++++++-------- .../users/msyds/emacs/lisp/syd/clojure.el | 4 +- .../home/users/msyds/emacs/lisp/syd/direnv.el | 5 +- .../home/users/msyds/emacs/lisp/syd/eshell.el | 1 - .../home/users/msyds/emacs/lisp/syd/evil.el | 11 +- .../users/msyds/emacs/lisp/syd/instaparse.el | 11 + .../home/users/msyds/emacs/lisp/syd/lsp.el | 2 +- .../home/users/msyds/emacs/lisp/syd/scheme.el | 4 +- modules/home/users/msyds/firefox.nix | 4 +- modules/nixos/nixpkgs.nix | 5 + 10 files changed, 203 insertions(+), 141 deletions(-) create mode 100644 modules/home/users/msyds/emacs/lisp/syd/instaparse.el diff --git a/flake.lock b/flake.lock index 0fbc26f..3a61277 100644 --- a/flake.lock +++ b/flake.lock @@ -76,11 +76,11 @@ ] }, "locked": { - "lastModified": 1787524125, - "narHash": "sha256-P48TOQdIbB0PKMn4FTk6X0utbf0LemNlJ+bFcSbveGA=", + "lastModified": 1792020613, + "narHash": "sha256-31skutSMYGBAvGK5vs6wPGXAV4s0ietf1doMynL9FfI=", "owner": "9001", "repo": "copyparty", - "rev": "9de090265f8d063056320f41d984830839017a2f", + "rev": "8b4593c9a286791eb5dc40862fa24198cea4def7", "type": "github" }, "original": { @@ -89,16 +89,33 @@ "type": "github" } }, + "dank-qml-common": { + "flake": false, + "locked": { + "lastModified": 1791392812, + "narHash": "sha256-id6Y5XNO5K3KfXSOsEYVUwiq1ygYGNX5LeKSgHM3GR8=", + "owner": "AvengeMedia", + "repo": "dank-qml-common", + "rev": "1ae722232da7110d26cd2c355b6615e078e94197", + "type": "github" + }, + "original": { + "owner": "AvengeMedia", + "ref": "stable-1.6", + "repo": "dank-qml-common", + "type": "github" + } + }, "disko": { "inputs": { "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1781152676, - "narHash": "sha256-RxWs5ND31KzTG7wvMM+PMfUjyNpmIEr999lqNARaM5o=", + "lastModified": 1789770686, + "narHash": "sha256-uZkBR7yHdIKUFB5SZdfgh1qkGfI3XmYmI/lTiquxbck=", "owner": "nix-community", "repo": "disko", - "rev": "ff8702b4de27f72b4c78573dfb89ec74e36abdf1", + "rev": "725ea35e410ad83be4931d1bff7e090eacaf3563", "type": "github" }, "original": { @@ -109,17 +126,18 @@ }, "dms": { "inputs": { + "dank-qml-common": "dank-qml-common", "flake-compat": "flake-compat", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1785111455, - "narHash": "sha256-aTNuC9NDBnYAeEtFsleeUwmGX3AZlKOutbl+LQRPkmQ=", + "lastModified": 1791395223, + "narHash": "sha256-yDBOoDewH8LwfsZrG4x5vaCstmp6w2vV70j9hC6dIuk=", "owner": "AvengeMedia", "repo": "DankMaterialShell", - "rev": "069ddab041c738236a8910e4c39b65d9628d3018", + "rev": "4a87e8227daf0840b3376fd5e7f891f5900165a6", "type": "github" }, "original": { @@ -135,11 +153,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1787979720, - "narHash": "sha256-HlZp8BnRkHxx7p7fcCeW67/VYzjJAzyFRmrvZqiISEU=", + "lastModified": 1792180742, + "narHash": "sha256-6dCXuiEEn1cIyvWKmbTSrqw//J6dQXXZ3dgAS3/eNG8=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "0f8471b870c51c3ed6dcd09c01e88bb0f790da01", + "rev": "aa5307a6eeefa515511dfdca4972b8ed3fcf0130", "type": "github" }, "original": { @@ -181,24 +199,6 @@ } }, "flake-parts": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1785627969, - "narHash": "sha256-4dtXQk/NMePegK/nWp5NSeuZKLATItOq61lpEvmXqGw=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "427bf4bd9435fdf21321c8cc628c24efc14c0f7a", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "nur", @@ -219,7 +219,7 @@ "type": "github" } }, - "flake-parts_3": { + "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "stylix", @@ -331,11 +331,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1787797243, - "narHash": "sha256-8+Q7NOB7RPajRjA4pbCDLzqH+MTjnG9x6LUPLfL2joA=", + "lastModified": 1792098797, + "narHash": "sha256-u4DIIZgznEGzByxXrxWCXK19VcMtTBmi/M9gZ7Jk9bM=", "owner": "nix-community", "repo": "home-manager", - "rev": "99c9ec63390f1d8c14d95d9e8b17cc29cfbd4e11", + "rev": "640725978b99076e18e069f6e7d2959124584f8f", "type": "github" }, "original": { @@ -365,6 +365,28 @@ "type": "github" } }, + "home-manager_3": { + "inputs": { + "nixpkgs": [ + "nixcord", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1790996401, + "narHash": "sha256-f+kOxEmOUnQazVAmGg0i8hzwgd1kX/geY+k/Dpheye8=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "db7d5e2332710f5abb088f6b5de927d7f9511b35", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-26.05", + "repo": "home-manager", + "type": "github" + } + }, "impermanence": { "inputs": { "home-manager": "home-manager_2", @@ -394,11 +416,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1787937511, - "narHash": "sha256-y8G4daKwwkm28VIQ6esMN2qg5u66Kqb4TwMs90STnQc=", + "lastModified": 1792134012, + "narHash": "sha256-YK8MkJnjeOePSoLXuQigqf4bg/BePOEFcB9EGIOL5gE=", "owner": "epireyn", "repo": "niri-flake", - "rev": "16c59792de64470ad162d0ff080e3b3318ffaa5c", + "rev": "09a0fe71fa9e558caa93cc8425647079651b886e", "type": "github" }, "original": { @@ -427,11 +449,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1787337984, - "narHash": "sha256-BNZUEVR2H96hCKENNKoLSSTFT8W4smp7v94hJc4Ehfc=", + "lastModified": 1792041402, + "narHash": "sha256-1hapcTetO24oDgicjSNATQDHm7l5odiXk0XuaFosNJk=", "owner": "niri-wm", "repo": "niri", - "rev": "dd75865f547f0eac0e9b6c4d86d2cd00c0744252", + "rev": "45739bc072f9875a674d335ae724f10d3b35c665", "type": "github" }, "original": { @@ -440,6 +462,28 @@ "type": "github" } }, + "nix-darwin": { + "inputs": { + "nixpkgs": [ + "nixcord", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1783744694, + "narHash": "sha256-2cp6N3rrwnGYLTx9l6N+NI+kwrCWxvJUbj5WJhvB29A=", + "owner": "nix-darwin", + "repo": "nix-darwin", + "rev": "c3e90c89649b07d1a96e4b9dd6cd0d6e44b91a74", + "type": "github" + }, + "original": { + "owner": "nix-darwin", + "ref": "nix-darwin-26.05", + "repo": "nix-darwin", + "type": "github" + } + }, "nixarr": { "inputs": { "nixpkgs": [ @@ -467,17 +511,19 @@ }, "nixcord": { "inputs": { - "flake-parts": "flake-parts", + "home-manager": "home-manager_3", + "nix-darwin": "nix-darwin", "nixpkgs": "nixpkgs_6", - "nixpkgs-nixcord": "nixpkgs-nixcord", + "nixpkgs-ci": "nixpkgs-ci", + "nixpkgs-packages": "nixpkgs-packages", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1787932216, - "narHash": "sha256-OPJDo+mIHErjQL/uaclMFvgSkQeInH2MFGxT93+VXps=", + "lastModified": 1792199114, + "narHash": "sha256-A5nYKj95EkIjGBbnVnnubVa21seBH/e89SUV0aNFLYw=", "owner": "KaylorBen", "repo": "nixcord", - "rev": "5b36c9187cabf90cb1659045c354cd6a0dd349ff", + "rev": "b8b71963c2e7ede8106fca249e3eef0fed96c69d", "type": "github" }, "original": { @@ -491,11 +537,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1787144466, - "narHash": "sha256-HHfv2/HkNSKbbSyU9iD/g8lbP6r4tl33sSw1W4rXCk0=", + "lastModified": 1791721963, + "narHash": "sha256-BYhx89XJltnRyQeuDKHVL5eSqbbfAcOKuDts7QRsrxQ=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "0471accf8d0a8210b31d947497d179ecc99e0021", + "rev": "60a624466c08787ee8303393b7d4752d1826f14f", "type": "github" }, "original": { @@ -520,44 +566,39 @@ "type": "github" } }, - "nixpkgs-lib": { + "nixpkgs-ci": { "locked": { - "lastModified": 1785031560, - "narHash": "sha256-OmshNvn2vupOFpYinLUu+1Dnpu4n7Q5N3ggGVNHpkUI=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "0e79af5e3d4dcfcd676ab5ba3f95d2e3352e078c", - "type": "github" + "lastModified": 1791130267, + "narHash": "sha256-NCFqY2YC3/5pwakzk7tXNUj3sG+VImjU4EkZMacxF1w=", + "rev": "9013764fcc0ea99fa16cf7aa7decf8a5c3889dd2", + "type": "tarball", + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1085518.9013764fcc0e/nixexprs.tar.zst" }, "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" + "type": "tarball", + "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.zst" } }, - "nixpkgs-nixcord": { + "nixpkgs-packages": { "locked": { - "lastModified": 1786711500, - "narHash": "sha256-QvnceIGTBeDvDd9oCn+GvdsnkquliuwbVgpiRH68qaQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "02e08985a27c65ffd33d434eeb2e660a2e4dc84d", - "type": "github" + "lastModified": 1791130267, + "narHash": "sha256-NCFqY2YC3/5pwakzk7tXNUj3sG+VImjU4EkZMacxF1w=", + "rev": "9013764fcc0ea99fa16cf7aa7decf8a5c3889dd2", + "type": "tarball", + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1085518.9013764fcc0e/nixexprs.tar.zst" }, "original": { - "owner": "NixOS", - "ref": "nixos-26.05", - "repo": "nixpkgs", - "type": "github" + "type": "tarball", + "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.zst" } }, "nixpkgs-stable": { "locked": { - "lastModified": 1787848966, - "narHash": "sha256-7gDpu5hpq0rOYnYMcOWqSzquK4HA/xU8Xf3CjUBOOJA=", + "lastModified": 1792030654, + "narHash": "sha256-OaQwAtPMTjQiY2sT/2/62UbSPhzP/0aDnWzMm/NCiUw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d57af924f160a5084293c71c2043f058bd1cdb60", + "rev": "26f4107e47e3ad0ffd0db220469ba83b6f6d96e8", "type": "github" }, "original": { @@ -569,11 +610,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1787848966, - "narHash": "sha256-7gDpu5hpq0rOYnYMcOWqSzquK4HA/xU8Xf3CjUBOOJA=", + "lastModified": 1792030654, + "narHash": "sha256-OaQwAtPMTjQiY2sT/2/62UbSPhzP/0aDnWzMm/NCiUw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d57af924f160a5084293c71c2043f058bd1cdb60", + "rev": "26f4107e47e3ad0ffd0db220469ba83b6f6d96e8", "type": "github" }, "original": { @@ -633,11 +674,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1787736819, - "narHash": "sha256-cV5xEJJK3BvhU8rEd4mC9UsmDi5qscv/kzGPhBRC5WA=", + "lastModified": 1791956154, + "narHash": "sha256-jBYGPi4udQ9uo4KQp9m2J0546nJVQitG15gvZSaVVAs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9fbb54b33e91ee4ca368e35a78e0613c720600b3", + "rev": "55bfb4d7437bd4e09ab7cba58a43bd68eb310044", "type": "github" }, "original": { @@ -649,18 +690,15 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1787209939, - "narHash": "sha256-WvvHR4kSQLAbtouMC/ruZ5UpLwlUcY3K4FAllMN+yGk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "391b592eb44808b3bd0cb80bb71b63a5a118b8bb", - "type": "github" + "lastModified": 1790299684, + "narHash": "sha256-iK8TZqVFap2LJEfmSr4VcV5jZ1DWqEyJEh0QerRX6JE=", + "rev": "7d5589bbf421c7b6f4185371abe3c465b1b557e9", + "type": "tarball", + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1079252.7d5589bbf421/nixexprs.tar.zst" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" + "type": "tarball", + "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.zst" } }, "nixpkgs_4": { @@ -681,11 +719,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1787736819, - "narHash": "sha256-cV5xEJJK3BvhU8rEd4mC9UsmDi5qscv/kzGPhBRC5WA=", + "lastModified": 1791956154, + "narHash": "sha256-jBYGPi4udQ9uo4KQp9m2J0546nJVQitG15gvZSaVVAs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9fbb54b33e91ee4ca368e35a78e0613c720600b3", + "rev": "55bfb4d7437bd4e09ab7cba58a43bd68eb310044", "type": "github" }, "original": { @@ -697,27 +735,24 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1786711500, - "narHash": "sha256-QvnceIGTBeDvDd9oCn+GvdsnkquliuwbVgpiRH68qaQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "02e08985a27c65ffd33d434eeb2e660a2e4dc84d", - "type": "github" + "lastModified": 1791143449, + "narHash": "sha256-XvTu5S/TUsH4Jn9WRXSJfSxD7kHN4OzM/y+sKEzN8rU=", + "rev": "0d9e9b832d03ac387417e16ce1febf73b2e631e1", + "type": "tarball", + "url": "https://releases.nixos.org/nixos/26.05/nixos-26.05.11216.0d9e9b832d03/nixexprs.tar.zst" }, "original": { - "owner": "NixOS", - "ref": "nixos-26.05", - "repo": "nixpkgs", - "type": "github" + "type": "tarball", + "url": "https://channels.nixos.org/nixos-26.05/nixexprs.tar.zst" } }, "nixpkgs_7": { "locked": { - "lastModified": 1767892417, - "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=", - "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba", + "lastModified": 1789546076, + "narHash": "sha256-vWkSk5bbfTqdtMoSgD9FshACO8JCvXTFi+3cqEp0mH0=", + "rev": "b1b875982b17dabde9b4a37f3e229e74913e6db3", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre924538.3497aa5c9457/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1074753.b1b875982b17/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -726,11 +761,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1787814960, - "narHash": "sha256-PYZq1qzCJXC2zGI0mH07vrZBsw6DRBAOX0jN1pPtqOQ=", + "lastModified": 1792116957, + "narHash": "sha256-EjZqHKObBfIOeHZnMRVV87HB3pPq/WBkmRJWyFxmZu8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c27cdad491a991b11ed731760aa2ef8db0cb0410", + "rev": "f20cd90e28fe0403873f473b29e42662cd86e8c4", "type": "github" }, "original": { @@ -742,11 +777,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1782175435, - "narHash": "sha256-EMzXKmnOtBQ2MnvpiNOm7E+kOMvdPrIKaeg52Tip2Uk=", + "lastModified": 1791487292, + "narHash": "sha256-tqM7xDEsaeK1p6VvRygeZ9LkQRpUUkbRT02BHv6hnTM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "89570f24e97e614aa34aa9ab1c927b6578a43775", + "rev": "8edc0c72e3a38faf5434e40d1f19431125fe4b30", "type": "github" }, "original": { @@ -758,17 +793,17 @@ }, "nur": { "inputs": { - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1787983941, - "narHash": "sha256-TIqbEHH98OGczjrCLo2BMvYaAWt+y2rFqebaYdf+NT4=", + "lastModified": 1792201301, + "narHash": "sha256-lA9rj35dfSba0DYnyJ4YxYBVPjN80tK2gMxeElioF28=", "owner": "nix-community", "repo": "NUR", - "rev": "a64b7515ac7560f52b056e76d607b88e7ebadfdb", + "rev": "7b87d0dd1c0f60e82214092b934c504dfe3a2230", "type": "github" }, "original": { @@ -829,11 +864,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1786629091, - "narHash": "sha256-gkig4nPi1CWc4Z50GBsjE4ygSE7hMpl/TwID2an2Cck=", + "lastModified": 1792056300, + "narHash": "sha256-YU1LjDe1o2Ymg5zEiCHbmMXLkDCtxHQRiVqZ3nC5GGk=", "owner": "Mic92", "repo": "sops-nix", - "rev": "a8627b21b9107c5711c96b84f32a9a4b3d45295f", + "rev": "44931708c62937c2b1bf7953902989fa5bb9ee1b", "type": "github" }, "original": { @@ -849,7 +884,7 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_2", "gnome-shell": "gnome-shell", "nixpkgs": "nixpkgs_10", "nur": "nur_2", @@ -860,11 +895,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1787771653, - "narHash": "sha256-DkkJSBOXWV/mja5Vy8az5g1KpZlsbUwlmH0BsQhowaQ=", + "lastModified": 1791574276, + "narHash": "sha256-UMnLnZ3JlA7UTBNNNx1rNsXYoPP/cirXLCKGiQ/yDx8=", "owner": "nix-community", "repo": "stylix", - "rev": "5e3809851f486e7fc7e84b40f174c74b60ecc784", + "rev": "2856c4c6a845b9bec98828ef197abe176e4806bb", "type": "github" }, "original": { @@ -1049,11 +1084,11 @@ ] }, "locked": { - "lastModified": 1785945821, - "narHash": "sha256-NLSyTCW4K4ofhNBllt3omPasm6QpralXH1DBZOc91Dw=", + "lastModified": 1791198660, + "narHash": "sha256-f8Pye933T60vreB9u9pqfAXDyBqO13U7H0LvPsOxCIA=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "ae7910970dddc408fe6ab1c8e4b277bb21d72dc0", + "rev": "8b367b728be38d1bb7206f037c9df9989df3353a", "type": "github" }, "original": { @@ -1064,11 +1099,11 @@ }, "vpn-confinement": { "locked": { - "lastModified": 1785142579, - "narHash": "sha256-WEPxDMiKt3uGVVu/aorHnIgYYW62mEq2Q+rlN3qH6bg=", + "lastModified": 1791310298, + "narHash": "sha256-SpqEEuyrkzTqjIHwHrZE+Rs6ez2tzIeYkSY67zp6fcQ=", "owner": "Maroka-chan", "repo": "VPN-Confinement", - "rev": "b3aa71a7edfe6af748c23729d1bdec3b499741ff", + "rev": "cc37bcf5000e237709e725a9cda010a5cbce3111", "type": "github" }, "original": { @@ -1118,11 +1153,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1786221058, - "narHash": "sha256-hF2atQzapHBLX5NFqJMcKZAWHfGkKQeNu1eQr46+AGg=", + "lastModified": 1792070459, + "narHash": "sha256-qGSyMXPHiXWp9/nE5Zs1DJN5NmZFvoxaBS5Y9i7p0Pc=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "3bc915f09dd62bb2651a715114f9d140344bc6c1", + "rev": "97a89cec53eb4f8788386a574450dd94c0538754", "type": "github" }, "original": { diff --git a/modules/home/users/msyds/emacs/lisp/syd/clojure.el b/modules/home/users/msyds/emacs/lisp/syd/clojure.el index 2e07ca9..43bcd6c 100755 --- a/modules/home/users/msyds/emacs/lisp/syd/clojure.el +++ b/modules/home/users/msyds/emacs/lisp/syd/clojure.el @@ -12,6 +12,7 @@ ("\\(?:build\\|profile\\)\\.boot\\'" . clojure-mode)) :interpreter (("bb" . clojure-mode) ("nbb" . clojurescript-mode)) + :custom ((clojure-toplevel-inside-comment-form t)) :config (add-hook 'clojure-mode-hook #'syd-lisp-mode) ;; Correctly indent some popular macros. @@ -30,7 +31,8 @@ (defun syd-clojure-eval-region (beg end) (cider-eval-region beg end)) - (syd-handle '(clojure-mode clojurescript-mode cider-repl-mode) + (syd-handle '(clojure-mode clojurescript-mode cider-repl-mode + cider-clojure-interaction-mode) :docs #'cider-doc :eval-region #'syd-clojure-eval-region :load-buffer #'cider-load-buffer) diff --git a/modules/home/users/msyds/emacs/lisp/syd/direnv.el b/modules/home/users/msyds/emacs/lisp/syd/direnv.el index fb85fb2..a73e7cc 100755 --- a/modules/home/users/msyds/emacs/lisp/syd/direnv.el +++ b/modules/home/users/msyds/emacs/lisp/syd/direnv.el @@ -13,6 +13,9 @@ "e" `("Environment" . ,syd-leader-file-env-map)) :config (syd-push shackle-rules - `("*envrc*" :custom ,#'ignore))) + `("*envrc*" :custom ,#'ignore)) + (with-eval-after-load 'projection-multi + (advice-add #'projection-multi-compile + :around #'envrc-propagate-environment))) (provide 'syd/direnv) diff --git a/modules/home/users/msyds/emacs/lisp/syd/eshell.el b/modules/home/users/msyds/emacs/lisp/syd/eshell.el index bd39305..8702f63 100644 --- a/modules/home/users/msyds/emacs/lisp/syd/eshell.el +++ b/modules/home/users/msyds/emacs/lisp/syd/eshell.el @@ -127,7 +127,6 @@ if FILE-NAME has no TRAMP prefix." (cons nil file-name))) (use-package eshell - :defer t :init (defvar syd-eshell-data-dir (file-name-concat syd-data-dir "eshell")) diff --git a/modules/home/users/msyds/emacs/lisp/syd/evil.el b/modules/home/users/msyds/emacs/lisp/syd/evil.el index 21c06e3..e5c5a40 100755 --- a/modules/home/users/msyds/emacs/lisp/syd/evil.el +++ b/modules/home/users/msyds/emacs/lisp/syd/evil.el @@ -51,6 +51,11 @@ ;; refresh is forced. Quick fix! }:P (add-hook 'minibuffer-setup-hook #'evil-refresh-cursor) + ;; HACK: ensure insert-state is the default state for minibuffers. + ;; https://github.com/emacs-evil/evil/issues/2034 + (put 'evil-default-state 'permanent-local t) + (put 'evil-echo-state 'permanent-local t) + ;; Unbind 'C-k'. Normally, it inserts digraphs; I have a compose key, and ;; it's strictly less useful than Emacs' native input methods. It often gets ;; in the way of buffers with navigation, e.g. scrolling through shell/REPL @@ -62,8 +67,8 @@ (defun syd-evil-messages () (interactive) (view-echo-area-messages) - (with-current-buffer messages-buffer-name - (evil-motion-state 1))) + (with-current-buffer messages-buffer-name + (evil-motion-state 1))) (evil-ex-define-cmd "mes[sages]" #'syd-evil-messages) ;; On ESC, remove highlighted search results. @@ -72,7 +77,7 @@ Otherwise, nil." (let ((names '(evil-ex-substitute evil-ex-search))) (when (-any #'evil-ex-hl-active-p names) - (prog1 t (evil-ex-nohighlight))))) + (prog1 t (evil-ex-nohighlight))))) (add-hook 'syd-escape-hook #'syd-evil-nohl-h) (general-def diff --git a/modules/home/users/msyds/emacs/lisp/syd/instaparse.el b/modules/home/users/msyds/emacs/lisp/syd/instaparse.el new file mode 100644 index 0000000..da561a8 --- /dev/null +++ b/modules/home/users/msyds/emacs/lisp/syd/instaparse.el @@ -0,0 +1,11 @@ +;;; -*- lexical-binding: t -*- + +(require 'syd/base) + +(use-package instaparse-mode + :mode "\\.ebnf\\'" + :straight (:type git + :host github + :repo "fbauer/instaparse-mode")) + +(provide 'syd/cc) diff --git a/modules/home/users/msyds/emacs/lisp/syd/lsp.el b/modules/home/users/msyds/emacs/lisp/syd/lsp.el index a015fc4..121dea8 100644 --- a/modules/home/users/msyds/emacs/lisp/syd/lsp.el +++ b/modules/home/users/msyds/emacs/lisp/syd/lsp.el @@ -41,7 +41,7 @@ (syd-push shackle-rules `(("*lsp-help*" "*lsp-install*") - :select nil :size 0.42 :popup t :align bottom)) + :select nil :size 0.2 :popup t :align bottom)) (defun syd-lsp-handle-docs () (interactive) (save-excursion diff --git a/modules/home/users/msyds/emacs/lisp/syd/scheme.el b/modules/home/users/msyds/emacs/lisp/syd/scheme.el index 62817ab..0c36f53 100644 --- a/modules/home/users/msyds/emacs/lisp/syd/scheme.el +++ b/modules/home/users/msyds/emacs/lisp/syd/scheme.el @@ -23,6 +23,8 @@ `("*Geiser Documentation*" ,@syd-help-popup-options) `("*Geiser Debug*" ,@syd-help-popup-options))) -(use-package geiser-guile) +;; (use-package geiser-guile) +;; (use-package geiser-gauche) +(use-package geiser-chibi) (provide 'syd/scheme) diff --git a/modules/home/users/msyds/firefox.nix b/modules/home/users/msyds/firefox.nix index f8c0bc8..53eb8e6 100644 --- a/modules/home/users/msyds/firefox.nix +++ b/modules/home/users/msyds/firefox.nix @@ -224,8 +224,8 @@ in { force = true; # Precedence of search engines. order = [ "Kagi" "ddg" ]; - default = "Kagi"; - privateDefault = "Kagi"; + default = "ddg"; + privateDefault = "ddg"; engines = { "Kagi" = { urls = [{ diff --git a/modules/nixos/nixpkgs.nix b/modules/nixos/nixpkgs.nix index 8ed5edc..dfe07ea 100644 --- a/modules/nixos/nixpkgs.nix +++ b/modules/nixos/nixpkgs.nix @@ -11,6 +11,11 @@ in { config = lib.mkIf cfg.enable { nixpkgs.config.allowUnfree = true; + # Dependency of Zotero. + nixpkgs.config.permittedInsecurePackages = [ + "firefox-esr-140-bin-unwrapped-140.17.0esr" + ]; + nix = { settings = { allow-import-from-derivation = true;