From 3c056b4e9b398dd8fa088d81b4f0fcf3fd2f8284 Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Mon, 27 May 2024 21:19:01 +0200 Subject: [PATCH] use old fluffychat version again --- flake.lock | 115 ++++++++++++--------------- flake.nix | 4 +- nixos/homes/palo/packages/social.nix | 24 +----- nixos/machines/sterni/packages.nix | 2 +- 4 files changed, 53 insertions(+), 92 deletions(-) diff --git a/flake.lock b/flake.lock index 46922dc..12c7be7 100644 --- a/flake.lock +++ b/flake.lock @@ -139,7 +139,6 @@ "flake-parts": [ "flake-parts" ], - "git-hooks": "git-hooks", "nixos-generators": "nixos-generators", "nixos-images": "nixos-images", "nixpkgs": [ @@ -149,11 +148,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1716757238, - "narHash": "sha256-8voKL5nTtf7TX8pZvE9VMzSAzsQ+xFrDrEqvYpw2/yY=", + "lastModified": 1716834774, + "narHash": "sha256-Xl0e3GaRW4WwrginQUSm6I8TtLtc/ruSA1J3pL+5dSQ=", "ref": "refs/heads/main", - "rev": "6e9f1515d3f3a5ffb5a89a2a28d6014ea0022948", - "revCount": 2850, + "rev": "c68a8306ba21dccab642afd45c249217ca901398", + "revCount": 2872, "type": "git", "url": "https://git.clan.lol/clan/clan-core" }, @@ -190,11 +189,11 @@ ] }, "locked": { - "lastModified": 1716431128, - "narHash": "sha256-t3T8HlX3udO6f4ilLcN+j5eC3m2gqsouzSGiriKK6vk=", + "lastModified": 1716773194, + "narHash": "sha256-rskkGmWlvYFb+CXedBiL8eWEuED0Es0XR4CkJ11RQKY=", "owner": "nix-community", "repo": "disko", - "rev": "7ffc4354dfeb37c8c725ae1465f04a9b45ec8606", + "rev": "10986091e47fb1180620b78438512b294b7e8f67", "type": "github" }, "original": { @@ -483,22 +482,6 @@ "type": "github" } }, - "git-hooks": { - "flake": false, - "locked": { - "lastModified": 1716413087, - "narHash": "sha256-nSTIB7JeJGBGsvtqlyfhUByh/isyK1nfOq2YMxUOFJQ=", - "owner": "fricklerhandwerk", - "repo": "git-hooks", - "rev": "99a78fcf7dc03ba7b1d5c00af109c1e28ced3490", - "type": "github" - }, - "original": { - "owner": "fricklerhandwerk", - "repo": "git-hooks", - "type": "github" - } - }, "gnome-shell": { "flake": false, "locked": { @@ -559,11 +542,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1716457508, - "narHash": "sha256-ZxzffLuWRyuMrkVVq7wastNUqeO0HJL9xqfY1QsYaqo=", + "lastModified": 1716736760, + "narHash": "sha256-h3RmnNknKYtVA+EvUSra6QAwfZjC2q1G8YA7W0gat8Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "850cb322046ef1a268449cf1ceda5fd24d930b05", + "rev": "5d151429e1e79107acf6d06dcc5ace4e642ec239", "type": "github" }, "original": { @@ -600,11 +583,11 @@ }, "locked": { "dir": "nix", - "lastModified": 1715058553, - "narHash": "sha256-5y87n9v8WJ921Q6hMFGIYq1g/HaZHoopTuzDk4SvrfQ=", + "lastModified": 1716615055, + "narHash": "sha256-tBkXDAv3TJLV/aEWzq4aIPzE5kwSbtaOOK+P1UZGlNY=", "owner": "kmonad", "repo": "kmonad", - "rev": "8efcc8f7f7369a5e684d201c0263416db2a5df60", + "rev": "9a97f4b04de689b36dc5db2aad28ba1c90878160", "type": "github" }, "original": { @@ -692,11 +675,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1715150548, - "narHash": "sha256-pb2xIGuzzkPOjUlZnBahpfQWVvtCSOcW8vLL7rQUiEY=", + "lastModified": 1716714838, + "narHash": "sha256-Wg/AitJwhglJQGP+8siy7vsmfaqfe4iBQljSzmFtYLk=", "owner": "nix-community", "repo": "nixos-anywhere", - "rev": "242444d228636b1f0e89d3681f04a75254c29f66", + "rev": "d8b8cc69b057601a090df1dddd9df7f09975be5b", "type": "github" }, "original": { @@ -729,11 +712,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1716173274, - "narHash": "sha256-FC21Bn4m6ctajMjiUof30awPBH/7WjD0M5yqrWepZbY=", + "lastModified": 1716798306, + "narHash": "sha256-s8+OhT1WSPMoqbTawT30hj4NVMg+w03/a+2HVqcNhY0=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "d9e0b26202fd500cf3e79f73653cce7f7d541191", + "rev": "9a20e17a73b052d6be912adcee220cb483477094", "type": "github" }, "original": { @@ -908,11 +891,11 @@ }, "nixpkgs-legacy_2311": { "locked": { - "lastModified": 1716361217, - "narHash": "sha256-mzZDr00WUiUXVm1ujBVv6A0qRd8okaITyUp4ezYRgc4=", + "lastModified": 1716633019, + "narHash": "sha256-xim1b5/HZYbWaZKyI7cn9TJCM6ewNVZnesRr00mXeS4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "46397778ef1f73414b03ed553a3368f0e7e33c2f", + "rev": "9d29cd266cebf80234c98dd0b87256b6be0af44e", "type": "github" }, "original": { @@ -924,11 +907,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1716061101, - "narHash": "sha256-H0eCta7ahEgloGIwE/ihkyGstOGu+kQwAiHvwVoXaA0=", + "lastModified": 1716655032, + "narHash": "sha256-kQ25DAiCGigsNR/Quxm3v+JGXAEXZ8I7RAF4U94bGzE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e7cc61784ddf51c81487637b3031a6dd2d6673a2", + "rev": "59a450646ec8ee0397f5fa54a08573e8240eb91f", "type": "github" }, "original": { @@ -940,11 +923,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1716395399, - "narHash": "sha256-X+99WjSwbxQ7X+CTyqZQZqeqGe8nbfAFz+tgK2r3O/g=", + "lastModified": 1716749035, + "narHash": "sha256-mdBp0b4VIQ71aUK2uBRROUkENk93RUUubjlQkvskNO0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bc5dc89513caa16788f6379962e50383cf3f70b0", + "rev": "b5995681aa319d0e33a6d83a31710d6c6f092820", "type": "github" }, "original": { @@ -956,11 +939,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1715266358, - "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", + "lastModified": 1716509168, + "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f1010e0469db743d14519a1efd37e23f8513d714", + "rev": "bfb7a882678e518398ce9a31a881538679f6f092", "type": "github" }, "original": { @@ -1019,11 +1002,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1716330097, - "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", + "lastModified": 1716509168, + "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", + "rev": "bfb7a882678e518398ce9a31a881538679f6f092", "type": "github" }, "original": { @@ -1065,11 +1048,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1716062047, - "narHash": "sha256-OhysviwHQz4p2HZL4g7XGMLoUbWMjkMr/ogaR3VUYNA=", + "lastModified": 1716651315, + "narHash": "sha256-iMgzIeedMqf30TXZ439zW3Yvng1Xm9QTGO+ZwG1IWSw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "02923630b89aa1ab36ef8e422501a6f4fd4b2016", + "rev": "c5187508b11177ef4278edf19616f44f21cc8c69", "type": "github" }, "original": { @@ -1268,11 +1251,11 @@ ] }, "locked": { - "lastModified": 1677715661, - "narHash": "sha256-O4jQBF76GcvqtJbBZT13bh3kEnEGPEu5coW8aBtDivQ=", + "lastModified": 1716644244, + "narHash": "sha256-lfEK+c21gRJVr5PHvv5GkNhhXlB9HSxsAUfFHyeWUs4=", "owner": "SamirTalwar", "repo": "smoke", - "rev": "3a3c12dcfe49fc6ec847516fc49b0804f4151fe0", + "rev": "cbaa95cb293df39422d19588b05f16b98623eed5", "type": "github" }, "original": { @@ -1311,11 +1294,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1716400300, - "narHash": "sha256-0lMkIk9h3AzOHs1dCL9RXvvN4PM8VBKb+cyGsqOKa4c=", + "lastModified": 1716692524, + "narHash": "sha256-sALodaA7Zkp/JD6ehgwc0UCBrSBfB4cX66uFGTsqeFU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "b549832718b8946e875c016a4785d204fcfc2e53", + "rev": "962797a8d7f15ed7033031731d0bb77244839960", "type": "github" }, "original": { @@ -1329,11 +1312,11 @@ "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1716425501, - "narHash": "sha256-BSLhmGYY1khyyBAjraR+N0Pa9Nha/et5yQQlEZxcfkU=", + "lastModified": 1716771198, + "narHash": "sha256-vRDCDuFMvkvCjGT/N9K2lxG1E61vvq3TiU/4ZM36p8k=", "owner": "nix-community", "repo": "srvos", - "rev": "1122cd50a23647e09c3e7a679d37ec02113bc412", + "rev": "5d4550de420ee501d7fa0e6cd9031cd00354554c", "type": "github" }, "original": { @@ -1361,11 +1344,11 @@ ] }, "locked": { - "lastModified": 1716456264, - "narHash": "sha256-s9Tyj5pEivl/AsvrpkUkfR1Iu3zHfXpviPfe4HbPJ5I=", + "lastModified": 1716744577, + "narHash": "sha256-YvYYKLuf+SNj129k6SS/bhVybaLYgUlnznTa7rKv904=", "owner": "danth", "repo": "stylix", - "rev": "290c8aef476ce98fff9cefc059284429d561a085", + "rev": "00a11ba2f0b52f761c0bc77daebb00cb4d44ba09", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index eaba6f3..10b4492 100644 --- a/flake.nix +++ b/flake.nix @@ -160,8 +160,8 @@ }; legacy_2205 = import nixpkgs-legacy_2205 { inherit system; }; legacy_2211 = import nixpkgs-legacy_2211 { inherit system; }; - legacy_2305 = nixpkgs-legacy_2305 { inherit system; }; - legacy_2311 = nixpkgs-legacy_2311 { inherit system; }; + legacy_2305 = import nixpkgs-legacy_2305 { inherit system; }; + legacy_2311 = import nixpkgs-legacy_2311 { inherit system; }; polygon-art = polygon-art.packages.${system}; landingpage = landingpage.packages.${system}.plain; kmonad = kmonad.packages.${system}.kmonad; diff --git a/nixos/homes/palo/packages/social.nix b/nixos/homes/palo/packages/social.nix index d5a9711..ac82582 100644 --- a/nixos/homes/palo/packages/social.nix +++ b/nixos/homes/palo/packages/social.nix @@ -6,31 +6,9 @@ with lib; config = mkIf config.gui.enable { programs.obs-studio.enable = true; home.packages = [ - emoji-picker - signal-desktop - - # matrix clients - # -------------- - #element-desktop - #fractal - #cinny-desktop - fluffychat - #(fluffychat.overrideAttrs - # (old: rec { - # version = "1.13.0"; - # src = fetchFromGitHub { - # owner = "krille-chan"; - # repo = "fluffychat"; - # rev = "v${version}"; - # hash = "sha256-w29Nxs/d0b18jMvWnrRUjEGqY4jGtuEGodg+ncCAaVc="; - # }; - # vendorHash = ""; - # }) - #) - - + legacy_2311.fluffychat ]; }; diff --git a/nixos/machines/sterni/packages.nix b/nixos/machines/sterni/packages.nix index 49abe9b..4890fb4 100644 --- a/nixos/machines/sterni/packages.nix +++ b/nixos/machines/sterni/packages.nix @@ -44,7 +44,7 @@ in valentina signal-desktop - fluffychat + legacy_2311.fluffychat sweethome3d.application pkgs.polygon-art.polygon-art