From fac1b66cca754afcee3751e17404edbf15d0533e Mon Sep 17 00:00:00 2001 From: GitHub Date: Fri, 5 Jul 2024 08:19:23 +0000 Subject: [PATCH 01/10] Automatic Update --- flake.lock | 18 +++++++++--------- packages/matrix/matrix-media-repo/source.json | 10 +++++----- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/flake.lock b/flake.lock index 30e08dc6..3691f839 100644 --- a/flake.lock +++ b/flake.lock @@ -410,11 +410,11 @@ ] }, "locked": { - "lastModified": 1720045378, - "narHash": "sha256-lmE7B+QXw7lWdBu5GQlUABSpzPk3YBb9VbV+IYK5djk=", + "lastModified": 1720135141, + "narHash": "sha256-1GHh1/WO+f42TXxb1WiZFMuepM7ITA9iT+6yJBbBNsY=", "owner": "nix-community", "repo": "home-manager", - "rev": "0a30138c694ab3b048ac300794c2eb599dc40266", + "rev": "c514e862cd5705e51edb6fe8d01146fdeec661f2", "type": "github" }, "original": { @@ -657,11 +657,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1720068098, - "narHash": "sha256-nuRe1MHPIZPnCnRnpFLn+wpYmsuWy5HzrRE6zdpTtPo=", + "lastModified": 1720166922, + "narHash": "sha256-XFCFj8ySJb8TMvGl0kq4Y97p4jXoxIau0SBzMy2vRns=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1aacb218f03f16293be0e70af7a9fe9a9608d5d2", + "rev": "8eb4a19de38348ff9ac78eb43bfe2ec1d243b221", "type": "github" }, "original": { @@ -707,11 +707,11 @@ ] }, "locked": { - "lastModified": 1720059535, - "narHash": "sha256-h/O3PoV3KvQG4tC5UpANBZOsptAZCzEGiwyi+3oSpYc=", + "lastModified": 1720145907, + "narHash": "sha256-mNO3vfM43+w4Bp+zMC8Dkf4ktLpYYRpk9tAOp4iumio=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "8deeed2dfa21837c7792b46b6a9b2e73f97b472b", + "rev": "5ad2d5884b9b16319c9c5ca4e80a5b8606b083ae", "type": "github" }, "original": { diff --git a/packages/matrix/matrix-media-repo/source.json b/packages/matrix/matrix-media-repo/source.json index 83c02a9b..26559030 100644 --- a/packages/matrix/matrix-media-repo/source.json +++ b/packages/matrix/matrix-media-repo/source.json @@ -1,10 +1,10 @@ { "url": "https://github.com/turt2live/matrix-media-repo", - "rev": "e60dde718205a1078e9000daada06f199f615910", - "date": "2024-07-03T22:25:11Z", - "path": "/nix/store/d06pgnsdpx42p908kg88k285j2s03iv4-matrix-media-repo", - "sha256": "09ajyf3hqbc1g658k1cby62fja80c67cx75xx8bnlrbl7a5d14wk", - "hash": "sha256-k5PQijp0ZWoX6r2czo5hACnphPGLhYmKeYEtDIfzUiU=", + "rev": "38fe7e84c4ecad0de89c49948ae57df5f6ac0dd0", + "date": "2024-07-04T10:08:55-06:00", + "path": "/nix/store/f4wwgl5gad32z8742s33w11w97pky1lj-matrix-media-repo", + "sha256": "019qx4m75yb7nbqci93rx90c17cvkbcp52rr638cs3s9jvfh4559", + "hash": "sha256-qRQC3ZZJD83QMDmLctmam53AQOp5pMjwsmf5cirpOAU=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, From 5eb91585be65f974f1a4d1e10d25d38a432830c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Fri, 5 Jul 2024 16:26:31 +0200 Subject: [PATCH 02/10] fix snapper --- config/rainbow-resort.nix | 10 +++++----- config/thinkrac.nix | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/config/rainbow-resort.nix b/config/rainbow-resort.nix index 706558a1..e00e1aa6 100644 --- a/config/rainbow-resort.nix +++ b/config/rainbow-resort.nix @@ -52,11 +52,11 @@ }; services.snapper.configs.main = { SUBVOLUME = "/"; - TIMELINE_LIMIT_HOURLY = "5"; - TIMELINE_LIMIT_DAILY = "7"; - TIMELINE_LIMIT_WEEKLY = "4"; - TIMELINE_LIMIT_MONTHLY = "12"; - TIMELINE_LIMIT_YEARLY = "0"; + TIMELINE_LIMIT_HOURLY = 5; + TIMELINE_LIMIT_DAILY = 7; + TIMELINE_LIMIT_WEEKLY = 4; + TIMELINE_LIMIT_MONTHLY = 12; + TIMELINE_LIMIT_YEARLY = 0; }; services.beesd.filesystems.root = { spec = "/"; diff --git a/config/thinkrac.nix b/config/thinkrac.nix index 58498d2e..967cdec2 100644 --- a/config/thinkrac.nix +++ b/config/thinkrac.nix @@ -45,11 +45,11 @@ }; services.snapper.configs.main = { SUBVOLUME = "/"; - TIMELINE_LIMIT_HOURLY = "5"; - TIMELINE_LIMIT_DAILY = "7"; - TIMELINE_LIMIT_WEEKLY = "4"; - TIMELINE_LIMIT_MONTHLY = "12"; - TIMELINE_LIMIT_YEARLY = "0"; + TIMELINE_LIMIT_HOURLY = 5; + TIMELINE_LIMIT_DAILY = 7; + TIMELINE_LIMIT_WEEKLY = 4; + TIMELINE_LIMIT_MONTHLY = 12; + TIMELINE_LIMIT_YEARLY = 0; }; services.beesd.filesystems.root = { spec = "/"; From f7d9a2f820c8d5429df316c83eea6aaa1fb232ae Mon Sep 17 00:00:00 2001 From: GitHub Date: Fri, 5 Jul 2024 18:14:09 +0000 Subject: [PATCH 03/10] Automatic Update --- flake.lock | 30 +++++++++---------- packages/matrix/matrix-media-repo/source.json | 10 +++---- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/flake.lock b/flake.lock index 30e08dc6..c0c1630f 100644 --- a/flake.lock +++ b/flake.lock @@ -410,11 +410,11 @@ ] }, "locked": { - "lastModified": 1720045378, - "narHash": "sha256-lmE7B+QXw7lWdBu5GQlUABSpzPk3YBb9VbV+IYK5djk=", + "lastModified": 1720167120, + "narHash": "sha256-K9JYdlPiyaXp33JRg7CT8rMwH56e4ncXSsXW/YKnNXc=", "owner": "nix-community", "repo": "home-manager", - "rev": "0a30138c694ab3b048ac300794c2eb599dc40266", + "rev": "bbe6e94737289c8cb92d4d8f9199fbfe4f11c0ba", "type": "github" }, "original": { @@ -552,11 +552,11 @@ ] }, "locked": { - "lastModified": 1719710498, - "narHash": "sha256-+yqI1zvk1jNcNTWA3CGnp5N2jSXr/q/CggYZYvGsdNc=", + "lastModified": 1720185178, + "narHash": "sha256-9KJ7KXQYDhnAfPIAvYYAEFW+85Gk9gm5W1pMoE/VMFg=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "774908e566a0b3b702219fdf90a5ed4551b3688d", + "rev": "6caa391790442baea22260296041429fb365e0ce", "type": "github" }, "original": { @@ -657,11 +657,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1720068098, - "narHash": "sha256-nuRe1MHPIZPnCnRnpFLn+wpYmsuWy5HzrRE6zdpTtPo=", + "lastModified": 1720202458, + "narHash": "sha256-TJm/p0qv0ShJh68KnY+e5n85Lcz7y+bF7i+7fvhpnjk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1aacb218f03f16293be0e70af7a9fe9a9608d5d2", + "rev": "e0bacc930ff5feca2706f61b2b153617c315bc27", "type": "github" }, "original": { @@ -707,11 +707,11 @@ ] }, "locked": { - "lastModified": 1720059535, - "narHash": "sha256-h/O3PoV3KvQG4tC5UpANBZOsptAZCzEGiwyi+3oSpYc=", + "lastModified": 1720145907, + "narHash": "sha256-mNO3vfM43+w4Bp+zMC8Dkf4ktLpYYRpk9tAOp4iumio=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "8deeed2dfa21837c7792b46b6a9b2e73f97b472b", + "rev": "5ad2d5884b9b16319c9c5ca4e80a5b8606b083ae", "type": "github" }, "original": { @@ -730,11 +730,11 @@ ] }, "locked": { - "lastModified": 1719873517, - "narHash": "sha256-D1dxZmXf6M2h5lNE1m6orojuUawVPjogbGRsqSBX+1g=", + "lastModified": 1720187017, + "narHash": "sha256-Zq+T1Bvd0ShZB9XM+bP0VJK3HjsSVQBLolkaCLBQnfQ=", "owner": "Mic92", "repo": "sops-nix", - "rev": "a11224af8d824935f363928074b4717ca2e280db", + "rev": "1b11e208cee97c47677439625dc22e5289dcdead", "type": "github" }, "original": { diff --git a/packages/matrix/matrix-media-repo/source.json b/packages/matrix/matrix-media-repo/source.json index 83c02a9b..26559030 100644 --- a/packages/matrix/matrix-media-repo/source.json +++ b/packages/matrix/matrix-media-repo/source.json @@ -1,10 +1,10 @@ { "url": "https://github.com/turt2live/matrix-media-repo", - "rev": "e60dde718205a1078e9000daada06f199f615910", - "date": "2024-07-03T22:25:11Z", - "path": "/nix/store/d06pgnsdpx42p908kg88k285j2s03iv4-matrix-media-repo", - "sha256": "09ajyf3hqbc1g658k1cby62fja80c67cx75xx8bnlrbl7a5d14wk", - "hash": "sha256-k5PQijp0ZWoX6r2czo5hACnphPGLhYmKeYEtDIfzUiU=", + "rev": "38fe7e84c4ecad0de89c49948ae57df5f6ac0dd0", + "date": "2024-07-04T10:08:55-06:00", + "path": "/nix/store/f4wwgl5gad32z8742s33w11w97pky1lj-matrix-media-repo", + "sha256": "019qx4m75yb7nbqci93rx90c17cvkbcp52rr638cs3s9jvfh4559", + "hash": "sha256-qRQC3ZZJD83QMDmLctmam53AQOp5pMjwsmf5cirpOAU=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, From a934ac49d36f5114cb17db492abf1073b715e831 Mon Sep 17 00:00:00 2001 From: GitHub Date: Sat, 6 Jul 2024 18:12:39 +0000 Subject: [PATCH 04/10] Automatic Update --- flake.lock | 30 +++++++------- packages/matrix/matrix-media-repo/source.json | 10 ++--- .../matrix/mautrix-whatsapp/gomod2nix.toml | 40 +++++++++---------- packages/matrix/mautrix-whatsapp/source.json | 10 ++--- 4 files changed, 45 insertions(+), 45 deletions(-) diff --git a/flake.lock b/flake.lock index 30e08dc6..d963af32 100644 --- a/flake.lock +++ b/flake.lock @@ -410,11 +410,11 @@ ] }, "locked": { - "lastModified": 1720045378, - "narHash": "sha256-lmE7B+QXw7lWdBu5GQlUABSpzPk3YBb9VbV+IYK5djk=", + "lastModified": 1720188602, + "narHash": "sha256-lC3byBmhVZFzWl/dCic8+cKUEEAXAswWOYjq4paFmbo=", "owner": "nix-community", "repo": "home-manager", - "rev": "0a30138c694ab3b048ac300794c2eb599dc40266", + "rev": "e3582e5151498bc4d757e8361431ace8529e7bb7", "type": "github" }, "original": { @@ -552,11 +552,11 @@ ] }, "locked": { - "lastModified": 1719710498, - "narHash": "sha256-+yqI1zvk1jNcNTWA3CGnp5N2jSXr/q/CggYZYvGsdNc=", + "lastModified": 1720185178, + "narHash": "sha256-9KJ7KXQYDhnAfPIAvYYAEFW+85Gk9gm5W1pMoE/VMFg=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "774908e566a0b3b702219fdf90a5ed4551b3688d", + "rev": "6caa391790442baea22260296041429fb365e0ce", "type": "github" }, "original": { @@ -657,11 +657,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1720068098, - "narHash": "sha256-nuRe1MHPIZPnCnRnpFLn+wpYmsuWy5HzrRE6zdpTtPo=", + "lastModified": 1720289262, + "narHash": "sha256-VN+xu3KaySTt8PdfBYpqauX+xFZrpp7zDOkObav5deQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1aacb218f03f16293be0e70af7a9fe9a9608d5d2", + "rev": "e1e0b0f2c0a2fa36c546c5d40261284bd4d7ee3a", "type": "github" }, "original": { @@ -707,11 +707,11 @@ ] }, "locked": { - "lastModified": 1720059535, - "narHash": "sha256-h/O3PoV3KvQG4tC5UpANBZOsptAZCzEGiwyi+3oSpYc=", + "lastModified": 1720232258, + "narHash": "sha256-eR5glZHS2bLpzUgTDhWGm04j+j5KMYKoDsY5DXAiuKQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "8deeed2dfa21837c7792b46b6a9b2e73f97b472b", + "rev": "05ccbe21233d4e9110fc6428d2c3d74b430c3c69", "type": "github" }, "original": { @@ -730,11 +730,11 @@ ] }, "locked": { - "lastModified": 1719873517, - "narHash": "sha256-D1dxZmXf6M2h5lNE1m6orojuUawVPjogbGRsqSBX+1g=", + "lastModified": 1720187017, + "narHash": "sha256-Zq+T1Bvd0ShZB9XM+bP0VJK3HjsSVQBLolkaCLBQnfQ=", "owner": "Mic92", "repo": "sops-nix", - "rev": "a11224af8d824935f363928074b4717ca2e280db", + "rev": "1b11e208cee97c47677439625dc22e5289dcdead", "type": "github" }, "original": { diff --git a/packages/matrix/matrix-media-repo/source.json b/packages/matrix/matrix-media-repo/source.json index 83c02a9b..eb905216 100644 --- a/packages/matrix/matrix-media-repo/source.json +++ b/packages/matrix/matrix-media-repo/source.json @@ -1,10 +1,10 @@ { "url": "https://github.com/turt2live/matrix-media-repo", - "rev": "e60dde718205a1078e9000daada06f199f615910", - "date": "2024-07-03T22:25:11Z", - "path": "/nix/store/d06pgnsdpx42p908kg88k285j2s03iv4-matrix-media-repo", - "sha256": "09ajyf3hqbc1g658k1cby62fja80c67cx75xx8bnlrbl7a5d14wk", - "hash": "sha256-k5PQijp0ZWoX6r2czo5hACnphPGLhYmKeYEtDIfzUiU=", + "rev": "33caaac42d1f7b1a6afac5f2dd3c39f1054f25ad", + "date": "2024-07-05T13:42:42-06:00", + "path": "/nix/store/vf2w9zzx9qcri4q4wa3g2xbs9mizk4b0-matrix-media-repo", + "sha256": "0gd0dqbqrncxgbq35g6d5vxqw86dbzbcm1b9nqbfjvhsp5b2l515", + "hash": "sha256-JRQqVrkabukWtmmFytZfzSCO+y7NvDLwep3ZjBduoD0=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/packages/matrix/mautrix-whatsapp/gomod2nix.toml b/packages/matrix/mautrix-whatsapp/gomod2nix.toml index 9d6b7688..93f74369 100644 --- a/packages/matrix/mautrix-whatsapp/gomod2nix.toml +++ b/packages/matrix/mautrix-whatsapp/gomod2nix.toml @@ -2,8 +2,8 @@ schema = 3 [mod] [mod."filippo.io/edwards25519"] - version = "v1.0.0" - hash = "sha256-APnPAcmItvtJ5Zsy863lzR2TjEBF9Y66TY1e4M1ap98=" + version = "v1.1.0" + hash = "sha256-9ACANrgWZSd5HYPfDZHY8DVbPSC9LOMgy8deq3rDOoc=" [mod."github.com/beorn7/perks"] version = "v1.0.1" hash = "sha256-h75GUqfwJKngCJQVE5Ao5wnO3cfKD9lSIteoLp/3xJ4=" @@ -71,41 +71,41 @@ schema = 3 version = "v1.2.5" hash = "sha256-OYGNolkmL7E1Qs2qrQ3IVpQp5gkcHNU/AB/z2O+Myps=" [mod."github.com/yuin/goldmark"] - version = "v1.7.2" - hash = "sha256-0rjUJP5WJy6227Epkgm/UHU9xzvrOAvYW+Y3EC+MkTE=" + version = "v1.7.4" + hash = "sha256-1L0gZyD+AguN8GBy17rs54eFZv7LTU5dcttULEJRabI=" [mod."go.mau.fi/libsignal"] - version = "v0.1.0" - hash = "sha256-hSZQkw/0eV5Y0pj1N+idYuKb/jtiw/qTfaOGdYCXmn0=" + version = "v0.1.1-0.20240705162345-47e713a595ab" + hash = "sha256-Dv9uBYPpSMOPacao1VqJ1DFhpvsU+HDiIAKL0BY8BEc=" [mod."go.mau.fi/util"] - version = "v0.5.0" - hash = "sha256-Gpg/orzKd3emcQecqc++y3xDp43oC8owDljiiBNIxpQ=" + version = "v0.5.1-0.20240702170310-bd1da3c069eb" + hash = "sha256-04fZMIfda0VmnHJKhdicCfCvwO1WpV6EundKsH9u6MI=" [mod."go.mau.fi/webp"] version = "v0.1.0" hash = "sha256-KIP/Onw0t/o10oBuvmRQDff7GF8G5lsMaDXpe0fjvNg=" [mod."go.mau.fi/whatsmeow"] - version = "v0.0.0-20240619210240-329c2336a6f1" - hash = "sha256-J4taRK1xJMdrbQt9c5s6ncGvCtFpuGWGtaApY4BD49c=" + version = "v0.0.0-20240706081318-bd4d4e8f74f6" + hash = "sha256-QDM9c6BNvmk4vRZVQQSV96t69W0o6rmXhFaqEn2j630=" [mod."go.mau.fi/zeroconfig"] version = "v0.1.2" hash = "sha256-xf4p2Z5Pl9In3ne9BVmy7YvtooSRBzqxP4Pl2jdVN8w=" [mod."golang.org/x/crypto"] - version = "v0.24.0" - hash = "sha256-wpxJApwSmmn9meVdpFdOU0gzeJbIXcKuFfYUUVogSss=" + version = "v0.25.0" + hash = "sha256-traLAylqoBwGIh0Z1fuEhNjbGgQBItgVjtZYdYr0zzQ=" [mod."golang.org/x/exp"] version = "v0.0.0-20240613232115-7f521ea00fb8" hash = "sha256-QRK52QHPPhj+JIcQbd4/hI5ceEbKu3e9mR57XxocwOE=" [mod."golang.org/x/image"] - version = "v0.17.0" - hash = "sha256-tH5e4+0ero5B5/r5TwzxQZhnfCecQvmoles3UW24X/c=" + version = "v0.18.0" + hash = "sha256-g9N/y4asXG1lctPJ1KEf8XIjeJi/mQ43EXUa8HTj/zQ=" [mod."golang.org/x/net"] - version = "v0.26.0" - hash = "sha256-WfY33QERNbcIiDkH3+p2XGrAVqvWBQfc8neUt6TH6dQ=" + version = "v0.27.0" + hash = "sha256-GrlN5isYeEVrPZVAHK0MDQatttbnyfSPoWJHj0xqhjk=" [mod."golang.org/x/sync"] version = "v0.7.0" hash = "sha256-2ETllEu2GDWoOd/yMkOkLC2hWBpKzbVZ8LhjLu0d2A8=" [mod."golang.org/x/sys"] - version = "v0.21.0" - hash = "sha256-gapzPWuEqY36V6W2YhIDYR49sEvjJRd7bSuf9K1f4JY=" + version = "v0.22.0" + hash = "sha256-RbG0XaXGGlErCsl2agvUxMnrkRwdbJLmriYT1H24FwA=" [mod."golang.org/x/text"] version = "v0.16.0" hash = "sha256-hMTO45upjEuA4sJzGplJT+La2n3oAfHccfYWZuHcH+8=" @@ -122,5 +122,5 @@ schema = 3 version = "v1.0.0" hash = "sha256-fYc/WwqE0ev0dvnu5qGmHJsYiSTuWeOTiAVzmQIKWyY=" [mod."maunium.net/go/mautrix"] - version = "v0.19.0-beta.1.0.20240619204109-68d8ab6896fd" - hash = "sha256-jvlKfDTJyctVu3Mn18wZxCm0XrnW39lLGD87h7zmeKs=" + version = "v0.19.0-beta.1.0.20240706071202-017ca6222317" + hash = "sha256-shbH1x0pCpM2n9VvSU7JaPetR5EMH9IWU+xC2dx31/0=" diff --git a/packages/matrix/mautrix-whatsapp/source.json b/packages/matrix/mautrix-whatsapp/source.json index e8acf9c6..17a0b968 100644 --- a/packages/matrix/mautrix-whatsapp/source.json +++ b/packages/matrix/mautrix-whatsapp/source.json @@ -1,10 +1,10 @@ { "url": "https://github.com/mautrix/whatsapp", - "rev": "c72d7cb8d51f22a92b6b41821888490417f718ac", - "date": "2024-06-20T00:06:16+03:00", - "path": "/nix/store/3151w9b8n84pkn4gvwfbwa0wzv7i5q17-whatsapp", - "sha256": "0388gy5snw7wy8kp5wagvqdymy07w2kh5f5s671k9qnlj76s0kcf", - "hash": "sha256-jk2gzZHU4jTDMbq4AqfgB/jqG95P8XIn8vxwq4t/CA0=", + "rev": "46c8af02b4d8591ff2806e6b90ea85990f2b1690", + "date": "2024-07-06T11:19:51+03:00", + "path": "/nix/store/sz34jxjxzy38s7qb1zbnqxwhfar8xx7f-whatsapp", + "sha256": "145l27gfxrhy68a35d3iin4mzl0vqcwyk3nggcs5l4lyv7z5pcqz", + "hash": "sha256-H7Nb/tmeElo0e8+O6TnDG9BfiY1xtDIUMh7m7t4RtJA=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, From a362e000253e7f26cd75e91d43f4e3d24ce780a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Sat, 6 Jul 2024 21:48:07 +0200 Subject: [PATCH 05/10] downgrade plover to python 3.11 --- overlays/default.nix | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/overlays/default.nix b/overlays/default.nix index 7f35c61a..97225a58 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -41,22 +41,22 @@ inputs: system: self: prev: let papermc = self.callPackage ../packages/minecraft/papermc {}; python-plover-stroke = self.python3Packages.callPackage ../packages/plover/plover-stroke.nix {}; python-rtf-tokenize = self.python3Packages.callPackage ../packages/python/rtf-tokenize.nix {}; - plover = self.python3Packages.callPackage ../packages/plover/plover {}; - plover-plugins-manager = self.python3Packages.callPackage ../packages/plover/plover-plugins-manager.nix {}; - python-simplefuzzyset = self.python3Packages.callPackage ../packages/python/simplefuzzyset.nix {}; - plover-plugin-emoji = self.python3Packages.callPackage ../packages/plover/plover-emoji.nix {}; - plover-plugin-tapey-tape = self.python3Packages.callPackage ../packages/plover/plover-tapey-tape.nix {}; - plover-plugin-yaml-dictionary = self.python3Packages.callPackage ../packages/plover/plover-yaml-dictionary.nix {}; - plover-plugin-python-dictionary = self.python3Packages.callPackage ../packages/plover/plover-python-dictionary.nix {}; - plover-plugin-stenotype-extended = self.python3Packages.callPackage ../packages/plover/plover-stenotype-extended.nix {}; - plover-plugin-machine-hid = self.python3Packages.callPackage ../packages/plover/plover-machine-hid.nix {}; - plover-plugin-rkb1-hid = self.python3Packages.callPackage ../packages/plover/plover-rkb1-hid.nix {}; - plover-plugin-dotool-output = self.python3Packages.callPackage ../packages/plover/plover-dotool-output.nix {}; - plover-plugin-dict-commands = self.python3Packages.callPackage ../packages/plover/plover-dict-commands.nix {}; - plover-plugin-last-translation = self.python3Packages.callPackage ../packages/plover/plover-last-translation.nix {}; - plover-plugin-modal-dictionary = self.python3Packages.callPackage ../packages/plover/plover-modal-dictionary.nix {}; - plover-plugin-stitching = self.python3Packages.callPackage ../packages/plover/plover-stitching.nix {}; - plover-plugin-lapwing-aio = self.python3Packages.callPackage ../packages/plover/plover-lapwing-aio.nix {}; + plover = self.python311Packages.callPackage ../packages/plover/plover {}; + plover-plugins-manager = self.python311Packages.callPackage ../packages/plover/plover-plugins-manager.nix {}; + python-simplefuzzyset = self.python311Packages.callPackage ../packages/python/simplefuzzyset.nix {}; + plover-plugin-emoji = self.python311Packages.callPackage ../packages/plover/plover-emoji.nix {}; + plover-plugin-tapey-tape = self.python311Packages.callPackage ../packages/plover/plover-tapey-tape.nix {}; + plover-plugin-yaml-dictionary = self.python311Packages.callPackage ../packages/plover/plover-yaml-dictionary.nix {}; + plover-plugin-python-dictionary = self.python311Packages.callPackage ../packages/plover/plover-python-dictionary.nix {}; + plover-plugin-stenotype-extended = self.python311Packages.callPackage ../packages/plover/plover-stenotype-extended.nix {}; + plover-plugin-machine-hid = self.python311Packages.callPackage ../packages/plover/plover-machine-hid.nix {}; + plover-plugin-rkb1-hid = self.python311Packages.callPackage ../packages/plover/plover-rkb1-hid.nix {}; + plover-plugin-dotool-output = self.python311Packages.callPackage ../packages/plover/plover-dotool-output.nix {}; + plover-plugin-dict-commands = self.python311Packages.callPackage ../packages/plover/plover-dict-commands.nix {}; + plover-plugin-last-translation = self.python311Packages.callPackage ../packages/plover/plover-last-translation.nix {}; + plover-plugin-modal-dictionary = self.python311Packages.callPackage ../packages/plover/plover-modal-dictionary.nix {}; + plover-plugin-stitching = self.python311Packages.callPackage ../packages/plover/plover-stitching.nix {}; + plover-plugin-lapwing-aio = self.python311Packages.callPackage ../packages/plover/plover-lapwing-aio.nix {}; plover-dict-didoesdigital = self.callPackage ../packages/plover/didoesdigital-dictionary.nix {}; miifox-net = self.python3Packages.callPackage ../packages/web/miifox-net.nix {}; old-homepage = self.callPackage ../packages/web/old-homepage.nix {}; From 70793f1d4e6feab7e23c00272d6eee037ee705be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Sat, 6 Jul 2024 22:02:43 +0200 Subject: [PATCH 06/10] remove leaderf --- config/programs/vim/modules/ux/leaderf.nix | 84 ---------------------- 1 file changed, 84 deletions(-) delete mode 100644 config/programs/vim/modules/ux/leaderf.nix diff --git a/config/programs/vim/modules/ux/leaderf.nix b/config/programs/vim/modules/ux/leaderf.nix deleted file mode 100644 index 3faa205e..00000000 --- a/config/programs/vim/modules/ux/leaderf.nix +++ /dev/null @@ -1,84 +0,0 @@ -{pkgs, ...}: { - output.plugins = with pkgs.vimPlugins; [LeaderF]; - vim.g = { - Lf_UseCache = 0; - Lf_UseMemoryCache = 0; - Lf_WildIgnore = { - dir = [".git" "__pycache__" ".DS_Store"]; - file = [ - "*.exe" - "*.dll" - "*.so" - "*.o" - "*.pyc" - "*.jpg" - "*.png" - "*.gif" - "*.svg" - "*.ico" - "*.db" - "*.tgz" - "*.tar.gz" - "*.gz" - "*.zip" - "*.bin" - "*.pptx" - "*.xlsx" - "*.docx" - "*.pdf" - "*.tmp" - "*.wmv" - "*.mkv" - "*.mp4" - "*.rmvb" - "*.ttf" - "*.ttc" - "*.otf" - "*.mp3" - "*.aac" - ]; - }; - Lf_DefaultMode = "FullPath"; - Lf_UseVersionControlTool = 0; - Lf_DefaultExternalTool = "rg"; - Lf_ShowHidden = 1; - Lf_ShortcutF = ""; - Lf_ShortcutB = ""; - Lf_WorkingDirectoryMode = "a"; - }; - - vim.keybindings.keybindings."" = { - f = { - f = { - command = "Leaderf file --popup"; - options.silent = true; - label = "Search files"; - }; - g = { - command = "Leaderf rg --no-messages --popup"; - options.silent = true; - label = "Grep files"; - }; - h = { - command = "Leaderf help --popup"; - options.silent = true; - label = "Search help"; - }; - t = { - command = "Leaderf bufTag --popup"; - options.silent = true; - label = "Search tags in buffer"; - }; - b = { - command = "Leaderf buffer --popup"; - options.silent = true; - label = "Switch buffers"; - }; - r = { - command = "Leaderf mru --popup --absolute-path"; - options.silent = true; - label = "search recent files"; - }; - }; - }; -} From a8e52674a8c6a54899cf83b684f941b9a7f09d03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Sun, 7 Jul 2024 07:16:36 +0200 Subject: [PATCH 07/10] =?UTF-8?q?don=E2=80=99t=20override=20nixpkgs=20for?= =?UTF-8?q?=20admin-fe?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flake.lock | 31 ++++++++++++++++++++++--------- flake.nix | 2 +- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index 937e084e..9ee5fa9c 100644 --- a/flake.lock +++ b/flake.lock @@ -9,9 +9,7 @@ "flake-parts": [ "flake-parts" ], - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1719818359, @@ -426,7 +424,7 @@ "hydra": { "inputs": { "nix": "nix", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1703324631, @@ -625,16 +623,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1701615100, - "narHash": "sha256-7VI84NGBvlCTduw2aHLVB62NvCiZUlALLqBe5v684Aw=", + "lastModified": 1720327833, + "narHash": "sha256-h2mSZQdEpWR3Bqvk7TXehtRWW4UTRqAW7mVSywaP56w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e9f06adb793d1cca5384907b3b8a4071d5d7cb19", + "rev": "3cb3b8cbb90f79aa4d82a4680a0036a1fdc482da", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", "repo": "nixpkgs", "type": "github" } @@ -656,6 +653,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1701615100, + "narHash": "sha256-7VI84NGBvlCTduw2aHLVB62NvCiZUlALLqBe5v684Aw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e9f06adb793d1cca5384907b3b8a4071d5d7cb19", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1720292880, "narHash": "sha256-ku4meQS7rusQM8Fwa4MWk8kxLda3Hjei141qoW4xFUo=", @@ -694,7 +707,7 @@ "nix-neovim": "nix-neovim", "nixos-hardware": "nixos-hardware", "nixos-vscode-server": "nixos-vscode-server", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "rust-overlay": "rust-overlay", "sops-nix": "sops-nix", "systems": "systems_2" diff --git a/flake.nix b/flake.nix index 6581bf5f..5314963b 100644 --- a/flake.nix +++ b/flake.nix @@ -8,7 +8,7 @@ rec { url = "github:DarkKirb/admin-fe"; inputs.devshell.follows = "devshell"; inputs.flake-parts.follows = "flake-parts"; - inputs.nixpkgs.follows = "nixpkgs"; + #inputs.nixpkgs.follows = "nixpkgs"; }; akkoma = { url = "github:DarkKirb/akkoma"; From 03fbac1db033fec505487b0681e26504081705a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Sun, 7 Jul 2024 09:35:56 +0200 Subject: [PATCH 08/10] disable ollama --- config/rainbow-resort.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/rainbow-resort.nix b/config/rainbow-resort.nix index 52c1c4c6..5a466db6 100644 --- a/config/rainbow-resort.nix +++ b/config/rainbow-resort.nix @@ -106,7 +106,7 @@ services.k3s.role = lib.mkForce "agent"; services.ollama = { - enable = true; + #enable = true; # broken. lol acceleration = "rocm"; # Thank you amd for not supporting 11.0.1 environmentVariables.HCC_AMDGPU_TARGET = "gfx1100"; From 7d36238a28ad4625f2a4abf037d3973dbc52834f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Sun, 7 Jul 2024 09:37:52 +0200 Subject: [PATCH 09/10] disable picard --- config/home-manager/base.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/home-manager/base.nix b/config/home-manager/base.nix index b28e5d58..e95fc8a3 100644 --- a/config/home-manager/base.nix +++ b/config/home-manager/base.nix @@ -83,7 +83,7 @@ desktop: {pkgs, ...}: { yt-dlp oxipng jpegoptim - picard + #picard easytag alejandra ] From 62c09324c18ac4ff645b21b4830d52c475ed298d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Sun, 7 Jul 2024 14:40:03 +0200 Subject: [PATCH 10/10] fix --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 9ee5fa9c..e5366ad3 100644 --- a/flake.lock +++ b/flake.lock @@ -408,11 +408,11 @@ ] }, "locked": { - "lastModified": 1720289319, - "narHash": "sha256-E3CjSsXNDWYqoNjrKQLPdEZDLR+mVI9HMa+jY//FjBY=", + "lastModified": 1720327769, + "narHash": "sha256-kAsg3Lg4YKKpGw+f1W2s5hzjP8B0y/juowvjK8utIag=", "owner": "nix-community", "repo": "home-manager", - "rev": "10486e6b311b3c5ae1c3477fee058704cea7cb4a", + "rev": "6b7ce96f34b324e4e104abc30d06955d216bac71", "type": "github" }, "original": { @@ -550,11 +550,11 @@ ] }, "locked": { - "lastModified": 1720185178, - "narHash": "sha256-9KJ7KXQYDhnAfPIAvYYAEFW+85Gk9gm5W1pMoE/VMFg=", + "lastModified": 1720315345, + "narHash": "sha256-B7CRTjGf0Nll2RouHAzLsOt5L0u04JTN4vetrGXXmUk=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "6caa391790442baea22260296041429fb365e0ce", + "rev": "96379e6b4d1f234ffd4bbe684d83a3d08a3dd2a7", "type": "github" }, "original": { @@ -623,11 +623,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1720327833, - "narHash": "sha256-h2mSZQdEpWR3Bqvk7TXehtRWW4UTRqAW7mVSywaP56w=", + "lastModified": 1719784303, + "narHash": "sha256-1oFvvCsNrg6fkx6LLFtDlcM7zdOXXKIVERjXHWbBPE4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3cb3b8cbb90f79aa4d82a4680a0036a1fdc482da", + "rev": "94526f7efe69352df04ad659a5d0327045feeaa9", "type": "github" }, "original": { @@ -670,11 +670,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1720292880, - "narHash": "sha256-ku4meQS7rusQM8Fwa4MWk8kxLda3Hjei141qoW4xFUo=", + "lastModified": 1720350862, + "narHash": "sha256-LzvQlroqrYaCuT3AVdRAFu0SA+f4UmGnls5I4hgmKs0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "974ef78455ae5806cf23b764c73f22ec757fdcd6", + "rev": "b9d0607ec182f6e20882af96b4062e0ca30a5c96", "type": "github" }, "original": { @@ -720,11 +720,11 @@ ] }, "locked": { - "lastModified": 1720232258, - "narHash": "sha256-eR5glZHS2bLpzUgTDhWGm04j+j5KMYKoDsY5DXAiuKQ=", + "lastModified": 1720318855, + "narHash": "sha256-w3CCVK9LJ5aznXGkO1IyAlbvMNJfyA+dBF7Z1Zwx1LA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "05ccbe21233d4e9110fc6428d2c3d74b430c3c69", + "rev": "3eed08a074cd2000884a69d448d70da2843f7103", "type": "github" }, "original": { @@ -743,11 +743,11 @@ ] }, "locked": { - "lastModified": 1720187017, - "narHash": "sha256-Zq+T1Bvd0ShZB9XM+bP0VJK3HjsSVQBLolkaCLBQnfQ=", + "lastModified": 1720321395, + "narHash": "sha256-kcI8q9Nh8/CSj0ygfWq1DLckHl8IHhFarL8ie6g7OEk=", "owner": "Mic92", "repo": "sops-nix", - "rev": "1b11e208cee97c47677439625dc22e5289dcdead", + "rev": "c184aca4db5d71c3db0c8cbfcaaec337a5d065ea", "type": "github" }, "original": {