From 2394d9ec50888154356a57273139427555597197 Mon Sep 17 00:00:00 2001
From: Yusuf Bera Ertan <y.bera003.06@protonmail.com>
Date: Wed, 16 Jun 2021 18:19:07 +0300
Subject: [PATCH] stuff

---
 flake.nix                          | 22 +++++++++++++---------
 overlays/discord-canary-system.nix |  4 ++--
 users/patriot/default.nix          |  1 +
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/flake.nix b/flake.nix
index 52a991a..948e452 100644
--- a/flake.nix
+++ b/flake.nix
@@ -37,6 +37,8 @@
     digga.lib.mkFlake {
       inherit self inputs;
 
+      lib = import ./lib { lib = digga.lib // nixos.lib; };
+
       channelsConfig = {
         allowUnfree = true;
         permittedInsecurePackages = [
@@ -60,8 +62,6 @@
         latest = { };
       };
 
-      lib = import ./lib { lib = digga.lib // nixos.lib; };
-
       sharedOverlays = [
         (final: prev: {
           lib = prev.lib.extend (lfinal: lprev: {
@@ -89,19 +89,23 @@
           /* set host specific properties here */
           NixOS = { };
         };
-        profiles = [ ./profiles ./users ];
-        suites = { profiles, users, ... }: with profiles; {
-          base = [ cachix core users.root ];
-          work = [ users.patriot develop ];
+        importables = rec {
+          profiles = (digga.lib.importers.rakeLeaves ./profiles) // { users = digga.lib.importers.rakeLeaves ./users; };
+          suites = with profiles; {
+            base = [ cachix core users.root ];
+            work = [ users.patriot develop ];
+          };
         };
       };
 
       home = {
         modules = ./users/modules/module-list.nix;
         externalModules = [ ];
-        profiles = [ ./users/profiles ];
-        suites = { profiles, ... }: with profiles; {
-          base = [ direnv git starship ];
+        importables = rec {
+          profiles = digga.lib.importers.rakeLeaves ./users/profiles;
+          suites = with profiles; {
+            base = [ direnv git starship ];
+          };
         };
       };
 
diff --git a/overlays/discord-canary-system.nix b/overlays/discord-canary-system.nix
index 723840b..c66c7a1 100644
--- a/overlays/discord-canary-system.nix
+++ b/overlays/discord-canary-system.nix
@@ -1,12 +1,12 @@
 final: prev: rec {
   discord-canary-system = prev.callPackage mkDiscord (rec {
     pname = "discord-canary";
-    version = "0.0.124";
+    version = "0.0.125";
     binaryName = "DiscordCanary";
     desktopName = "Discord Canary";
     src = prev.fetchurl {
       url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
-      sha256 = "sha256-Ie37ju2eg6oPwaB0LQ5WPoBiduhqbAJ5RNQXm1O+Hhg=";
+      sha256 = "sha256-L/1K1R0eFr9MyHPaZgcOwWWWJQmq9jRYJYXufKhRxVM=";
     };
     isWayland = true;
     extraOptions = [
diff --git a/users/patriot/default.nix b/users/patriot/default.nix
index c9ba9de..90538d5 100644
--- a/users/patriot/default.nix
+++ b/users/patriot/default.nix
@@ -870,6 +870,7 @@ in
               (mkExt "material-icon-theme" "4.6.0" "PKief" "sha256-i+3lrw3mDqK2vTMDhJYTACW5JleA+lN1XAC2imgQLUo=")
               (mkExt "github-vscode-theme" "4.1.1" "GitHub" "sha256-yLySHOx6pe7w2cyi95pQlKkn/o4VMCTkrTYHu8ASn5M=")
               (mkExt "koka" "0.0.1" "maelvalais" "sha256-ty8Mql19HgUWForggeZuHQpzTbmmB/eBFHqof5ZMKr0=")
+              (mkExt "vscode-rhai" "0.6.3" "rhaiscript" "sha256-gEdpM/TkkiZ50bG9qDU6BH04AJLRDcHLquniRs6m0mg=")
             ]) ++ (with pkgs.vscode-extensions; [ a5huynh.vscode-ron vadimcn.vscode-lldb jnoortheen.nix-ide ]);
           userSettings = {
             "workbench.iconTheme" = "material-icon-theme";