From bea59d896f1777d7d13e0deeff5a8132913d13ea Mon Sep 17 00:00:00 2001
From: Nicolai Van der Storm <nicolai@nvds.be>
Date: Fri, 20 Oct 2023 11:51:30 +0200
Subject: [PATCH] added arRPC

---
 flake.lock                                 | 55 ++++++++++++++++++----
 flake.nix                                  |  3 +-
 nix/users/base/neovim/plugins/presence.lua |  2 +-
 nix/users/nicolaivds/programs/webcord.nix  | 10 +++-
 4 files changed, 57 insertions(+), 13 deletions(-)

diff --git a/flake.lock b/flake.lock
index b7243c9..c965888 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,23 @@
 {
   "nodes": {
+    "arrpc": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1690915766,
+        "narHash": "sha256-YynUr5VU7AKjFl74tGKo9RHkyYw4TSFLLtRsNg9SDbQ=",
+        "owner": "notashelf",
+        "repo": "arrpc-flake",
+        "rev": "4d72fe05df250a93e32c70ba6893ddadde438e28",
+        "type": "github"
+      },
+      "original": {
+        "owner": "notashelf",
+        "repo": "arrpc-flake",
+        "type": "github"
+      }
+    },
     "flake-utils": {
       "inputs": {
         "systems": "systems_2"
@@ -41,7 +59,7 @@
     "hyprland": {
       "inputs": {
         "hyprland-protocols": "hyprland-protocols",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
         "systems": "systems",
         "wlroots": "wlroots",
         "xdph": "xdph"
@@ -87,7 +105,7 @@
     },
     "maxfetch": {
       "inputs": {
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
         "lastModified": 1690770330,
@@ -104,6 +122,22 @@
       }
     },
     "nixpkgs": {
+      "locked": {
+        "lastModified": 1681920287,
+        "narHash": "sha256-+/d6XQQfhhXVfqfLROJoqj3TuG38CAeoT6jO1g9r1k0=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "645bc49f34fa8eff95479f0345ff57e55b53437e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
       "locked": {
         "lastModified": 1694767346,
         "narHash": "sha256-5uH27SiVFUwsTsqC5rs3kS7pBoNhtoy9QfTP9BmknGk=",
@@ -119,7 +153,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1690640159,
         "narHash": "sha256-5DZUYnkeMOsVb/eqPYb9zns5YsnQXRJRC8Xx/nPMcno=",
@@ -135,7 +169,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_3": {
+    "nixpkgs_4": {
       "locked": {
         "lastModified": 1697456312,
         "narHash": "sha256-roiSnrqb5r+ehnKCauPLugoU8S36KgmWraHgRqVYndo=",
@@ -151,7 +185,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_5": {
       "locked": {
         "lastModified": 1693060755,
         "narHash": "sha256-KNsbfqewEziFJEpPR0qvVz4rx0x6QXxw1CcunRhlFdk=",
@@ -167,11 +201,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1697637981,
-        "narHash": "sha256-BReinxzdLksrjXkCZWqHZSEKd4/vWuNwgzmfjKprRxo=",
+        "lastModified": 1697646416,
+        "narHash": "sha256-rWB2uADZlVbKlh+RN54+zo2A3P1iBi/FSxRDUtNbSwI=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "bc8feb3239c1a4a896fd03ada155d1b8ee8ae38c",
+        "rev": "32ef23c823f865d09b34076f2b133ce45464a66b",
         "type": "github"
       },
       "original": {
@@ -183,7 +217,7 @@
     "orcaslicer": {
       "inputs": {
         "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": "nixpkgs_5"
       },
       "locked": {
         "lastModified": 1693147294,
@@ -201,10 +235,11 @@
     },
     "root": {
       "inputs": {
+        "arrpc": "arrpc",
         "home-manager": "home-manager",
         "hyprland": "hyprland",
         "maxfetch": "maxfetch",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_4",
         "nur": "nur",
         "orcaslicer": "orcaslicer",
         "sops-nix": "sops-nix"
diff --git a/flake.nix b/flake.nix
index 6b57f41..cc3d13b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,6 +14,7 @@
       inputs.nixpkgs-stable.follows = "";
     };
     nur.url = "github:nix-community/NUR";
+    arrpc.url = "github:notashelf/arrpc-flake";
   };
 
   outputs = { self, nixpkgs, home-manager, nur, ...}@inputs:
@@ -54,4 +55,4 @@
       };
     };
   };
-}
\ No newline at end of file
+}
diff --git a/nix/users/base/neovim/plugins/presence.lua b/nix/users/base/neovim/plugins/presence.lua
index bc8c9eb..949ae3d 100644
--- a/nix/users/base/neovim/plugins/presence.lua
+++ b/nix/users/base/neovim/plugins/presence.lua
@@ -25,4 +25,4 @@ plugin.setup({
     reading_text        = "Reading %s",               -- Format string rendered when a read-only or unmodifiable file is loaded in the buffer (either string or function(filename: string): string)
     workspace_text      = "Working on %s",            -- Format string rendered when in a git repository (either string or function(project_name: string|nil, filename: string): string)
     line_number_text    = "Line %s out of %s",        -- Format string rendered when `enable_line_number` is set to true (either string or function(line_number: number, line_count: number): string)
-})
\ No newline at end of file
+})
diff --git a/nix/users/nicolaivds/programs/webcord.nix b/nix/users/nicolaivds/programs/webcord.nix
index c4e7c36..91f4ad2 100644
--- a/nix/users/nicolaivds/programs/webcord.nix
+++ b/nix/users/nicolaivds/programs/webcord.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }:
+{ pkgs, inputs, lib, ... }:
 let 
   catppuccin-mocha = pkgs.fetchFromGitHub {
     owner = "catppuccin";
@@ -9,6 +9,7 @@ let
 in {
   home.packages = with pkgs; [
     (webcord-vencord.override { webcord = webcord.override { electron_25 = electron_24;};})
+    inputs.arrpc.packages.${pkgs.system}.arrpc
   ];
 
   xdg.configFile = {
@@ -16,4 +17,11 @@ in {
       source = "${catppuccin-mocha}/themes/mocha.theme.css";
     };
   };
+  
+  imports = [
+    inputs.arrpc.homeManagerModules.default
+  ];
+
+  services.arrpc.enable = true;
+
 }