From fbe01084d28f8d6a6c92b396500883a6ccb9fed6 Mon Sep 17 00:00:00 2001 From: Toast Date: Sat, 18 May 2024 13:28:50 +0200 Subject: [PATCH 1/3] Desktop/discord: get rid of official discord app --- roles/desktop/programs/discord.nix | 34 ++++++++---------------------- 1 file changed, 9 insertions(+), 25 deletions(-) diff --git a/roles/desktop/programs/discord.nix b/roles/desktop/programs/discord.nix index 58051ae..dc5485d 100644 --- a/roles/desktop/programs/discord.nix +++ b/roles/desktop/programs/discord.nix @@ -1,42 +1,26 @@ -{ - pkgs, - lib, - ... -}: let +{pkgs, ...}: let discordOverlay = _self: super: { discord = super.discord.override { withOpenASAR = true; withVencord = true; }; # Update some stuff while I wait for nixpkgs - vencord = super.vencord.overrideAttrs rec { - version = "1.8.1"; - src = pkgs.fetchFromGitHub { - owner = "Vendicated"; - repo = "Vencord"; + vencord = super.vencord.overrideAttrs rec { + version = "1.8.1"; + src = pkgs.fetchFromGitHub { + owner = "Vendicated"; + repo = "Vencord"; rev = "a525cd0113b37fbe08512a6e68ecb62b8d74cd72"; - # rev = "v${version}"; - hash = "sha256-97KgELDNhP2aZU66tC+F/QfHuWnICGRzXQFQMbim4Sk="; - }; + # rev = "v${version}"; + hash = "sha256-97KgELDNhP2aZU66tC+F/QfHuWnICGRzXQFQMbim4Sk="; + }; npmDepsHash = "sha256-97KgELDNhP2aZU66tC+F/QfHuWnICGRzXQFQMbim4Sk="; }; }; - stock-discord = _self: super: { - discord = super.discord.override { - withOpenASAR = false; - withVencord = false; - }; - }; in { - # Sometimes discord breaks after updates, and launching it stock once fixes it - specialisation.stockDiscord.configuration = { - nixpkgs.overlays = lib.mkAfter [stock-discord]; - }; - nixpkgs.overlays = [discordOverlay]; home-manager.users.toast = { home.packages = with pkgs; [ - discord vesktop ]; }; From 89c600766a039dbcd88e61ae4ae679229fe5dd1a Mon Sep 17 00:00:00 2001 From: Toast Date: Sat, 18 May 2024 14:01:12 +0200 Subject: [PATCH 2/3] Desktop/discord: update vencord --- roles/desktop/programs/discord.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/roles/desktop/programs/discord.nix b/roles/desktop/programs/discord.nix index dc5485d..62aa940 100644 --- a/roles/desktop/programs/discord.nix +++ b/roles/desktop/programs/discord.nix @@ -6,15 +6,14 @@ }; # Update some stuff while I wait for nixpkgs vencord = super.vencord.overrideAttrs rec { - version = "1.8.1"; + version = "1.8.4"; src = pkgs.fetchFromGitHub { owner = "Vendicated"; repo = "Vencord"; - rev = "a525cd0113b37fbe08512a6e68ecb62b8d74cd72"; - # rev = "v${version}"; - hash = "sha256-97KgELDNhP2aZU66tC+F/QfHuWnICGRzXQFQMbim4Sk="; + rev = "v${version}"; + hash = "sha256-FbU1Zsz/84oSOCOSWunA5nn5qFGLQ4W3uqsbYytF/7c="; }; - npmDepsHash = "sha256-97KgELDNhP2aZU66tC+F/QfHuWnICGRzXQFQMbim4Sk="; + npmDepsHash = "sha256-97KgELDNhP2aZU66tC+F/QfHuWnICGRzX3FQMbim4Sk="; }; }; in { From 6628a2d1815ca757654c3a40c74abe7c456005e6 Mon Sep 17 00:00:00 2001 From: Toast Date: Sat, 18 May 2024 18:55:03 +0200 Subject: [PATCH 3/3] Flake: update lock file and remove uneeded nixpkgs patch --- flake.lock | 72 +++++++++---------- flake.nix | 1 - .../0001-handheld-daemon-2.6.4-2.7.2.patch | 33 --------- 3 files changed, 36 insertions(+), 70 deletions(-) delete mode 100644 nixpkgs-patches/0001-handheld-daemon-2.6.4-2.7.2.patch diff --git a/flake.lock b/flake.lock index 94b2859..76651e1 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1714136352, - "narHash": "sha256-BtWQ2Th/jamO1SlD+2ASSW5Jaf7JhA/JLpQHk0Goqpg=", + "lastModified": 1715290355, + "narHash": "sha256-2T7CHTqBXJJ3ZC6R/4TXTcKoXWHcvubKNj9SfomURnw=", "owner": "ryantm", "repo": "agenix", - "rev": "24a7ea390564ccd5b39b7884f597cfc8d7f6f44e", + "rev": "8d37c5bdeade12b6479c85acd133063ab53187a0", "type": "github" }, "original": { @@ -44,11 +44,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1713966850, - "narHash": "sha256-AHAkkTUjk86rED3pQh8i4OiSze+OHe697L0o3zhv89A=", + "lastModified": 1715401925, + "narHash": "sha256-EGZGHCv4OFqzFc9oP82LCKMWfMGsmadOOZ0DZHYSdns=", "owner": "catppuccin", "repo": "vscode", - "rev": "75d96f3ae48b249f77124688a026ca5d7eeb5fb2", + "rev": "f0a6271f62ebb868f32c7ad4ecb31104c26f987a", "type": "github" }, "original": { @@ -119,11 +119,11 @@ ] }, "locked": { - "lastModified": 1714679908, - "narHash": "sha256-KzcXzDvDJjX34en8f3Zimm396x6idbt+cu4tWDVS2FI=", + "lastModified": 1715930644, + "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=", "owner": "nix-community", "repo": "home-manager", - "rev": "9036fe9ef8e15a819fa76f47a8b1f287903fb848", + "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d", "type": "github" }, "original": { @@ -139,11 +139,11 @@ ] }, "locked": { - "lastModified": 1714043624, - "narHash": "sha256-Xn2r0Jv95TswvPlvamCC46wwNo8ALjRCMBJbGykdhcM=", + "lastModified": 1715381426, + "narHash": "sha256-wPuqrAQGdv3ISs74nJfGb+Yprm23U/rFpcHFFNWgM94=", "owner": "nix-community", "repo": "home-manager", - "rev": "86853e31dc1b62c6eeed11c667e8cdd0285d4411", + "rev": "ab5542e9dbd13d0100f8baae2bc2d68af901f4b4", "type": "github" }, "original": { @@ -161,11 +161,11 @@ ] }, "locked": { - "lastModified": 1714720101, - "narHash": "sha256-Dxlj52coLzQZVV4a9IMMc/2xU5FIpj0iaHBigPwoNjM=", + "lastModified": 1715922002, + "narHash": "sha256-FSUrne82MXFzZ7R88ZnJz21kv06GS2TS/Ctsd+RXbP4=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "68b6bfacf67fcb1660c024b8dcd9376af38bbafe", + "rev": "23a55d6bb80f6340d0acdb9feef754646b68f895", "type": "github" }, "original": { @@ -234,11 +234,11 @@ ] }, "locked": { - "lastModified": 1714273701, - "narHash": "sha256-bmoeZ5zMSSO/e8P51yjrzaxA9uzA3SZAEFvih6S3LFo=", + "lastModified": 1715483403, + "narHash": "sha256-WMDuQj7J5jbpXI/X/E6FZRKgBFGcaSTvYyVxPnKE6KU=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "941c4973c824509e0356be455d89613611f76c8a", + "rev": "f9027322f48b427da23746aa359a6510dfcd0228", "type": "github" }, "original": { @@ -254,11 +254,11 @@ ] }, "locked": { - "lastModified": 1714273701, - "narHash": "sha256-bmoeZ5zMSSO/e8P51yjrzaxA9uzA3SZAEFvih6S3LFo=", + "lastModified": 1715483403, + "narHash": "sha256-WMDuQj7J5jbpXI/X/E6FZRKgBFGcaSTvYyVxPnKE6KU=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "941c4973c824509e0356be455d89613611f76c8a", + "rev": "f9027322f48b427da23746aa359a6510dfcd0228", "type": "github" }, "original": { @@ -269,11 +269,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1714746424, - "narHash": "sha256-Jdyw7VcM+jQ0uSXgjFj8UdXZ229yOvPNlYkKyKyHA4s=", + "lastModified": 1715881912, + "narHash": "sha256-e4LJk5uV1wvrRkffGFZekPWvFUx29NnnOahBlLaq8Ek=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "3f017311191fe6d501ca2496a835d012f656ee9c", + "rev": "ff1be1e3cdf884df0935ab28745ab13c3c26d828", "type": "github" }, "original": { @@ -301,11 +301,11 @@ }, "nixpkgs-raw": { "locked": { - "lastModified": 1714531828, - "narHash": "sha256-ILsf3bdY/hNNI/Hu5bSt2/KbmHaAVhBbNUOdGztTHEg=", + "lastModified": 1715668745, + "narHash": "sha256-xp62OkRkbUDNUc6VSqH02jB0FbOS+MsfMb7wL1RJOfA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0638fe2715d998fa81d173aad264eb671ce2ebc1", + "rev": "9ddcaffecdf098822d944d4147dd8da30b4e6843", "type": "github" }, "original": { @@ -316,11 +316,11 @@ }, "nixpkgs-unstable-raw": { "locked": { - "lastModified": 1714635257, - "narHash": "sha256-4cPymbty65RvF1DWQfc+Bc8B233A1BWxJnNULJKQ1EY=", + "lastModified": 1715787315, + "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "63c3a29ca82437c87573e4c6919b09a24ea61b0f", + "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5", "type": "github" }, "original": { @@ -331,11 +331,11 @@ }, "nur": { "locked": { - "lastModified": 1714746830, - "narHash": "sha256-c+I/pO6ZQjBGwykKpwuzzxc6Fsrn29iTdyenljxHn2I=", + "lastModified": 1716022947, + "narHash": "sha256-6MpQHyMEF0hSGFGeCJurXnRTFJ5D3BDynwaw4egCIME=", "owner": "nix-community", "repo": "NUR", - "rev": "4d948474c1ba38a037fc52474fbbb3b79e8ac6e8", + "rev": "76a11ee5e3b36f2a140a827fd266da5dd64f07b7", "type": "github" }, "original": { @@ -444,11 +444,11 @@ ] }, "locked": { - "lastModified": 1714699387, - "narHash": "sha256-3PPA17RJvKjiaOnMSPYXnsg0Pux3GbQ4GXGAjJFOQZw=", + "lastModified": 1715995317, + "narHash": "sha256-Pt6Lkr3qteSi4nF5x9RPrnOLoH1bZYnxLmhYVJHyZpY=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "e17d01c6d45bb73eda399c2f7f2dff6e2543c9a6", + "rev": "6c49c56d4365278f755a2a05ee8581706afed626", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 44b41b8..f9715fa 100644 --- a/flake.nix +++ b/flake.nix @@ -78,7 +78,6 @@ name = "patched-nixpkgs-unstable"; src = nixpkgs-unstable-raw; patches = [ - ./nixpkgs-patches/0001-handheld-daemon-2.6.4-2.7.2.patch ./nixpkgs-patches/0001-Revert-handheld-daemon-undo-refactor.patch ]; }; diff --git a/nixpkgs-patches/0001-handheld-daemon-2.6.4-2.7.2.patch b/nixpkgs-patches/0001-handheld-daemon-2.6.4-2.7.2.patch deleted file mode 100644 index 7921f80..0000000 --- a/nixpkgs-patches/0001-handheld-daemon-2.6.4-2.7.2.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 742e26325f8d5b8bcc97afd11ae188c53c6f80f1 Mon Sep 17 00:00:00 2001 -From: Toast <39011842+toast003@users.noreply.github.com> -Date: Mon, 6 May 2024 11:52:09 +0200 -Subject: [PATCH 1/1] handheld-daemon: 2.6.4 -> 2.7.2 - ---- - pkgs/by-name/ha/handheld-daemon/package.nix | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/pkgs/by-name/ha/handheld-daemon/package.nix b/pkgs/by-name/ha/handheld-daemon/package.nix -index 246e3879bb5c..ec24637dde3f 100644 ---- a/pkgs/by-name/ha/handheld-daemon/package.nix -+++ b/pkgs/by-name/ha/handheld-daemon/package.nix -@@ -9,14 +9,14 @@ - }: - python3.pkgs.buildPythonApplication rec { - pname = "handheld-daemon"; -- version = "2.6.4"; -+ version = "2.7.2"; - pyproject = true; - - src = fetchFromGitHub { - owner = "hhd-dev"; - repo = "hhd"; - rev = "v${version}"; -- hash = "sha256-S77APtE1GGfqnv1IkZdJOSlprPOBtrqVXV60yVMvopg="; -+ hash = "sha256-jWLL1nmKam1iJ1R1l/OuIp+isgZ7toRhVamx1nOID/8="; - }; - - propagatedBuildInputs = with python3.pkgs; [ --- -2.44.0 -