From f24695b1b0b281dd04475db7cb5963a2ffdc6387 Mon Sep 17 00:00:00 2001 From: albert Date: Sat, 5 Oct 2024 10:10:56 +0200 Subject: [PATCH] Manual flake update and testing for logseq on desktop --- flake.lock | 132 +++++++++++++------------- nixos/hosts/nixos-desktop/default.nix | 12 +++ 2 files changed, 78 insertions(+), 66 deletions(-) diff --git a/flake.lock b/flake.lock index 9bdb5d55..bb4e3ede 100644 --- a/flake.lock +++ b/flake.lock @@ -185,11 +185,11 @@ ] }, "locked": { - "lastModified": 1727531434, - "narHash": "sha256-b+GBgCWd2N6pkiTkRZaMFOPztPO4IVTaclYPrQl2uLk=", + "lastModified": 1727977578, + "narHash": "sha256-DBORKcmQ7ZjA4qE1MsnF1MmZSokOGrw4W9vTCioOv2U=", "owner": "nix-community", "repo": "disko", - "rev": "b709e1cc33fcde71c7db43850a55ebe6449d0959", + "rev": "574400001b3ffe555c7a21e0ff846230759be2ed", "type": "github" }, "original": { @@ -342,11 +342,11 @@ ] }, "locked": { - "lastModified": 1725234343, - "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -403,11 +403,11 @@ ] }, "locked": { - "lastModified": 1724857454, - "narHash": "sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk=", + "lastModified": 1727854478, + "narHash": "sha256-/odH2nUMAwkMgOS2nG2z0exLQNJS4S2LfMW0teqU7co=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "4509ca64f1084e73bc7a721b20c669a8d4c5ebe6", + "rev": "5f58871c9657b5fc0a7f65670fe2ba99c26c1d79", "type": "github" }, "original": { @@ -506,11 +506,11 @@ ] }, "locked": { - "lastModified": 1720042825, - "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=", + "lastModified": 1726989464, + "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", "owner": "nix-community", "repo": "home-manager", - "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073", + "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", "type": "github" }, "original": { @@ -568,11 +568,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1727453186, - "narHash": "sha256-nZRCfVEZ9osWXsCD0xCpU66M8JkabMTukBzPRrD/CTA=", + "lastModified": 1728017225, + "narHash": "sha256-lLV+OMkMeFqTEmoIZhpWtw6H+ebghupckhrCO+K0MdU=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "3390ff2632d0d8a14c92473db60fa52bf881f979", + "rev": "cb63dc934ba512b2d56d89b94c5da7894f6a7809", "type": "github" }, "original": { @@ -593,11 +593,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1725379389, - "narHash": "sha256-qS1H/5/20ewJIXmf8FN2A5KTOKKU9elWvCPwdBi1P/U=", + "lastModified": 1727792571, + "narHash": "sha256-KBzRQVE1j2vrSg8WfYJ+vEvFBC25+2VsFSK7VL2kc1M=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "e7bd94e0b5ff3c1e686f2101004ebf4fcea9d871", + "rev": "e2365a1d8dccdcf4bca5111672e80df67d90957d", "type": "github" }, "original": { @@ -612,11 +612,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1727007123, - "narHash": "sha256-B2WqDa4Sd7EVrGfxnVSCL39yOKWqn14vhhTGlbtd+48=", + "lastModified": 1727710043, + "narHash": "sha256-NpTnTg8oOVvntlTi/t8BUe5msrMmkiZFiOW22fc7B+g=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "e4bb2b4962e79814c38862dce5eca90af3de6a3c", + "rev": "d03a5f88a345d26ca13918071d42dcc960233183", "type": "github" }, "original": { @@ -633,11 +633,11 @@ ] }, "locked": { - "lastModified": 1725189302, - "narHash": "sha256-IhXok/kwQqtusPsoguQLCHA+h6gKvgdCrkhIaN+kByA=", + "lastModified": 1727707210, + "narHash": "sha256-8XZp5XO2FC6INZEZ2WlwErtvFVpl45ACn8CJ2hfTA0Y=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "7c4b53a7d9f3a3df902b3fddf2ae245ef20ebcda", + "rev": "f61d5f2051a387a15817007220e9fb3bbead57b3", "type": "github" }, "original": { @@ -713,11 +713,11 @@ }, "nixlib": { "locked": { - "lastModified": 1726966855, - "narHash": "sha256-25ByioeOBFcnitO5lM/Mufnv/u7YtHEHEM8QFuiS40k=", + "lastModified": 1727571693, + "narHash": "sha256-b7sFVeqMtz8xntCL3tBY3O8suTg5PeF53LTL3eCcKyc=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "575704ff85d3a41dc5bfef7b55380cbc7b87f3c2", + "rev": "bb58a3bf239e03fca9d51062e2fe028a4ea5a3d1", "type": "github" }, "original": { @@ -734,11 +734,11 @@ ] }, "locked": { - "lastModified": 1727312535, - "narHash": "sha256-exnTgS6OBYvEa8v5x8UsLQK2ERdDFwXNFQHoT2cqycY=", + "lastModified": 1727917377, + "narHash": "sha256-eefXdEPUMuhiV6Vy3ASSyApCseE9OoKDgL/G6qenw/4=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "f31447cd3f8e54674bd1675969e97e6043a309bc", + "rev": "9ae128172f823956e54947fe471bc6dfa670ecb4", "type": "github" }, "original": { @@ -749,11 +749,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1727595438, - "narHash": "sha256-bAvkJYuZKeDwW/J/Ga/axplEbYbQhq6jdQBVdGcpuO8=", + "lastModified": 1728056216, + "narHash": "sha256-IrO06gFUDTrTlIP3Sz+mRB6WUoO2YsgMtOD3zi0VEt0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "8e8c6cbad12ef805268b4e380a7298fbc275898d", + "rev": "b7ca02c7565fbf6d27ff20dd6dbd49c5b82eef28", "type": "github" }, "original": { @@ -765,11 +765,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1726755586, - "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=", + "lastModified": 1727802920, + "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e", + "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", "type": "github" }, "original": { @@ -781,11 +781,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1726966855, - "narHash": "sha256-25ByioeOBFcnitO5lM/Mufnv/u7YtHEHEM8QFuiS40k=", + "lastModified": 1727571693, + "narHash": "sha256-b7sFVeqMtz8xntCL3tBY3O8suTg5PeF53LTL3eCcKyc=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "575704ff85d3a41dc5bfef7b55380cbc7b87f3c2", + "rev": "bb58a3bf239e03fca9d51062e2fe028a4ea5a3d1", "type": "github" }, "original": { @@ -828,11 +828,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1727348695, - "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", + "lastModified": 1727802920, + "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", + "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", "type": "github" }, "original": { @@ -849,11 +849,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1727472280, - "narHash": "sha256-SKMFwHkYYldzzZQbquB7FUyfrB43D/BGH3xeZ8hfFCc=", + "lastModified": 1727812556, + "narHash": "sha256-U9cEs2W0eLvIS0kEMBGP8eZMdrpoHqynByth/mu2Nvc=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "811af6abf4990f27919f39319f8950a4f2f57aab", + "rev": "a40e6b047b6166aed5fab801e99a8d6b980d4680", "type": "github" }, "original": { @@ -864,11 +864,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1727540905, - "narHash": "sha256-40J9tW7Y794J7Uw4GwcAKlMxlX2xISBl6IBigo83ih8=", + "lastModified": 1727907660, + "narHash": "sha256-QftbyPoieM5M50WKUMzQmWtBWib/ZJbHo7mhj5riQec=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fbca5e745367ae7632731639de5c21f29c8744ed", + "rev": "5966581aa04be7eff830b9e1457d56dc70a0b798", "type": "github" }, "original": { @@ -911,11 +911,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1725001927, - "narHash": "sha256-eV+63gK0Mp7ygCR0Oy4yIYSNcum2VQwnZamHxYTNi+M=", + "lastModified": 1727672256, + "narHash": "sha256-9/79hjQc9+xyH+QxeMcRsA6hDyw6Z9Eo1/oxjvwirLk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6e99f2a27d600612004fbd2c3282d614bfee6421", + "rev": "1719f27dd95fd4206afb9cec9f415b539978827e", "type": "github" }, "original": { @@ -969,11 +969,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1725350106, - "narHash": "sha256-TaMMlI2KPJ3wCyxJk6AShOLhNuTeabHCnvYRkLBlEFs=", + "lastModified": 1728083208, + "narHash": "sha256-jaoWQm2+oAUDU1ft+RWrxcgc/4lHGE0AkZlIBiVjQiQ=", "owner": "nix-community", "repo": "nixvim", - "rev": "0f2c31e6a57a83ed4e6fa3adc76749620231055d", + "rev": "e246bd57da2a09b18b0667f7de40dc1c55a94667", "type": "github" }, "original": { @@ -985,11 +985,11 @@ }, "nur": { "locked": { - "lastModified": 1727596560, - "narHash": "sha256-222fcWG6s13RXuAK711nbrHs6wOb3UORXJ/vt3rCM60=", + "lastModified": 1728085948, + "narHash": "sha256-hCpm2XhGN/OsE4BZp+J1TTGeTcHNe+mca1zaFq7LMpw=", "owner": "nix-community", "repo": "NUR", - "rev": "6acf80f88c3f8fbf4f95f5df7a936a488a7bca12", + "rev": "74808acd5ce51758868b42eaedc8a608c3006c73", "type": "github" }, "original": { @@ -1006,11 +1006,11 @@ ] }, "locked": { - "lastModified": 1727463368, - "narHash": "sha256-5glMknkwQejUrKy28iy/kCFlSMwHcVyf/whmxqD0ggk=", + "lastModified": 1727917089, + "narHash": "sha256-XWNBGf8Z03sqA5/m99X6XTFbHGNuVx1gMaMQJbdDIrY=", "owner": "pjones", "repo": "plasma-manager", - "rev": "29ad64f0ac4ae84710dfeb1d37572d95c94cbfd8", + "rev": "bc14b17bff1557de8f103172508f896a87bb9cdb", "type": "github" }, "original": { @@ -1092,11 +1092,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1727423009, - "narHash": "sha256-+4B/dQm2EnORIk0k2wV3aHGaE0WXTBjColXjj7qWh10=", + "lastModified": 1727734513, + "narHash": "sha256-i47LQwoGCVQq4upV2YHV0OudkauHNuFsv306ualB/Sw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "127a96f49ddc377be6ba76964411bab11ae27803", + "rev": "3198a242e547939c5e659353551b0668ec150268", "type": "github" }, "original": { @@ -1194,11 +1194,11 @@ ] }, "locked": { - "lastModified": 1724833132, - "narHash": "sha256-F4djBvyNRAXGusJiNYInqR6zIMI3rvlp6WiKwsRISos=", + "lastModified": 1727984844, + "narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "3ffd842a5f50f435d3e603312eefa4790db46af5", + "rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64", "type": "github" }, "original": { diff --git a/nixos/hosts/nixos-desktop/default.nix b/nixos/hosts/nixos-desktop/default.nix index 772828cb..4b69b99c 100644 --- a/nixos/hosts/nixos-desktop/default.nix +++ b/nixos/hosts/nixos-desktop/default.nix @@ -96,4 +96,16 @@ # Other pkgs.android-udev-rules ]; + nixpkgs.overlays = [ + (final: prev: { + logseq = prev.logseq.overrideAttrs (oldAttrs: { + postFixup = '' + makeWrapper ${prev.electron_27}/bin/electron $out/bin/${oldAttrs.pname} \ + --add-flags $out/share/${oldAttrs.pname}/resources/app \ + --add-flags "--use-gl=desktop" \ + --prefix LD_LIBRARY_PATH : "${prev.lib.makeLibraryPath [ prev.stdenv.cc.cc.lib ]}" + ''; + }); + }) + ]; }