flake.lock

@@ -10,11 +10,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1715290355,
+        "lastModified": 1714136352,
-        "narHash": "sha256-2T7CHTqBXJJ3ZC6R/4TXTcKoXWHcvubKNj9SfomURnw=",
+        "narHash": "sha256-BtWQ2Th/jamO1SlD+2ASSW5Jaf7JhA/JLpQHk0Goqpg=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "8d37c5bdeade12b6479c85acd133063ab53187a0",
+        "rev": "24a7ea390564ccd5b39b7884f597cfc8d7f6f44e",
         "type": "github"
       },
       "original": {
@@ -44,11 +44,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1715401925,
+        "lastModified": 1713966850,
-        "narHash": "sha256-EGZGHCv4OFqzFc9oP82LCKMWfMGsmadOOZ0DZHYSdns=",
+        "narHash": "sha256-AHAkkTUjk86rED3pQh8i4OiSze+OHe697L0o3zhv89A=",
         "owner": "catppuccin",
         "repo": "vscode",
-        "rev": "f0a6271f62ebb868f32c7ad4ecb31104c26f987a",
+        "rev": "75d96f3ae48b249f77124688a026ca5d7eeb5fb2",
         "type": "github"
       },
       "original": {
@@ -119,11 +119,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1715930644,
+        "lastModified": 1714679908,
-        "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=",
+        "narHash": "sha256-KzcXzDvDJjX34en8f3Zimm396x6idbt+cu4tWDVS2FI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d",
+        "rev": "9036fe9ef8e15a819fa76f47a8b1f287903fb848",
         "type": "github"
       },
       "original": {
@@ -139,11 +139,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1715381426,
+        "lastModified": 1714043624,
-        "narHash": "sha256-wPuqrAQGdv3ISs74nJfGb+Yprm23U/rFpcHFFNWgM94=",
+        "narHash": "sha256-Xn2r0Jv95TswvPlvamCC46wwNo8ALjRCMBJbGykdhcM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ab5542e9dbd13d0100f8baae2bc2d68af901f4b4",
+        "rev": "86853e31dc1b62c6eeed11c667e8cdd0285d4411",
         "type": "github"
       },
       "original": {
@@ -161,11 +161,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1715922002,
+        "lastModified": 1714720101,
-        "narHash": "sha256-FSUrne82MXFzZ7R88ZnJz21kv06GS2TS/Ctsd+RXbP4=",
+        "narHash": "sha256-Dxlj52coLzQZVV4a9IMMc/2xU5FIpj0iaHBigPwoNjM=",
         "owner": "Jovian-Experiments",
         "repo": "Jovian-NixOS",
-        "rev": "23a55d6bb80f6340d0acdb9feef754646b68f895",
+        "rev": "68b6bfacf67fcb1660c024b8dcd9376af38bbafe",
         "type": "github"
       },
       "original": {
@@ -234,11 +234,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1715483403,
+        "lastModified": 1714273701,
-        "narHash": "sha256-WMDuQj7J5jbpXI/X/E6FZRKgBFGcaSTvYyVxPnKE6KU=",
+        "narHash": "sha256-bmoeZ5zMSSO/e8P51yjrzaxA9uzA3SZAEFvih6S3LFo=",
         "owner": "Mic92",
         "repo": "nix-index-database",
-        "rev": "f9027322f48b427da23746aa359a6510dfcd0228",
+        "rev": "941c4973c824509e0356be455d89613611f76c8a",
         "type": "github"
       },
       "original": {
@@ -254,11 +254,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1715483403,
+        "lastModified": 1714273701,
-        "narHash": "sha256-WMDuQj7J5jbpXI/X/E6FZRKgBFGcaSTvYyVxPnKE6KU=",
+        "narHash": "sha256-bmoeZ5zMSSO/e8P51yjrzaxA9uzA3SZAEFvih6S3LFo=",
         "owner": "Mic92",
         "repo": "nix-index-database",
-        "rev": "f9027322f48b427da23746aa359a6510dfcd0228",
+        "rev": "941c4973c824509e0356be455d89613611f76c8a",
         "type": "github"
       },
       "original": {
@@ -269,11 +269,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1715881912,
+        "lastModified": 1714746424,
-        "narHash": "sha256-e4LJk5uV1wvrRkffGFZekPWvFUx29NnnOahBlLaq8Ek=",
+        "narHash": "sha256-Jdyw7VcM+jQ0uSXgjFj8UdXZ229yOvPNlYkKyKyHA4s=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "ff1be1e3cdf884df0935ab28745ab13c3c26d828",
+        "rev": "3f017311191fe6d501ca2496a835d012f656ee9c",
         "type": "github"
       },
       "original": {
@@ -301,11 +301,11 @@
     },
     "nixpkgs-raw": {
       "locked": {
-        "lastModified": 1715668745,
+        "lastModified": 1714531828,
-        "narHash": "sha256-xp62OkRkbUDNUc6VSqH02jB0FbOS+MsfMb7wL1RJOfA=",
+        "narHash": "sha256-ILsf3bdY/hNNI/Hu5bSt2/KbmHaAVhBbNUOdGztTHEg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9ddcaffecdf098822d944d4147dd8da30b4e6843",
+        "rev": "0638fe2715d998fa81d173aad264eb671ce2ebc1",
         "type": "github"
       },
       "original": {
@@ -316,11 +316,11 @@
     },
     "nixpkgs-unstable-raw": {
       "locked": {
-        "lastModified": 1715787315,
+        "lastModified": 1714635257,
-        "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=",
+        "narHash": "sha256-4cPymbty65RvF1DWQfc+Bc8B233A1BWxJnNULJKQ1EY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5",
+        "rev": "63c3a29ca82437c87573e4c6919b09a24ea61b0f",
         "type": "github"
       },
       "original": {
@@ -331,11 +331,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1716022947,
+        "lastModified": 1714746830,
-        "narHash": "sha256-6MpQHyMEF0hSGFGeCJurXnRTFJ5D3BDynwaw4egCIME=",
+        "narHash": "sha256-c+I/pO6ZQjBGwykKpwuzzxc6Fsrn29iTdyenljxHn2I=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "76a11ee5e3b36f2a140a827fd266da5dd64f07b7",
+        "rev": "4d948474c1ba38a037fc52474fbbb3b79e8ac6e8",
         "type": "github"
       },
       "original": {
@@ -444,11 +444,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1715995317,
+        "lastModified": 1714699387,
-        "narHash": "sha256-Pt6Lkr3qteSi4nF5x9RPrnOLoH1bZYnxLmhYVJHyZpY=",
+        "narHash": "sha256-3PPA17RJvKjiaOnMSPYXnsg0Pux3GbQ4GXGAjJFOQZw=",
         "owner": "nix-community",
         "repo": "nix-vscode-extensions",
-        "rev": "6c49c56d4365278f755a2a05ee8581706afed626",
+        "rev": "e17d01c6d45bb73eda399c2f7f2dff6e2543c9a6",
         "type": "github"
       },
       "original": {

flake.nix

@@ -78,6 +78,7 @@
           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
           ];
         };

nixpkgs-patches/0001-handheld-daemon-2.6.4-2.7.2.patch

@@ -0,0 +1,33 @@
+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
+

roles/desktop/programs/discord.nix

@@ -1,4 +1,8 @@
-{pkgs, ...}: let
+{
+  pkgs,
+  lib,
+  ...
+}: let
   discordOverlay = _self: super: {
     discord = super.discord.override {
       withOpenASAR = true;
@@ -6,20 +10,33 @@
     };
     # Update some stuff while I wait for nixpkgs
       vencord = super.vencord.overrideAttrs rec {
-      version = "1.8.4";
+    	version = "1.8.1";
     	src = pkgs.fetchFromGitHub {
     		owner = "Vendicated";
     		repo = "Vencord";
-        rev = "v${version}";
+        rev = "a525cd0113b37fbe08512a6e68ecb62b8d74cd72";
-        hash = "sha256-FbU1Zsz/84oSOCOSWunA5nn5qFGLQ4W3uqsbYytF/7c=";
+    		# rev = "v${version}";
+    		hash = "sha256-97KgELDNhP2aZU66tC+F/QfHuWnICGRzXQFQMbim4Sk=";
     	};
-      npmDepsHash = "sha256-97KgELDNhP2aZU66tC+F/QfHuWnICGRzX3FQMbim4Sk=";
+      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
     ];
   };