From b423e2a14bd27c37c654ec834fc16a04169780b5 Mon Sep 17 00:00:00 2001
From: Miran Bastaja <miran.bastaja04@gmail.com>
Date: Tue, 30 Jul 2024 19:49:39 +0200
Subject: hyprdesktop: install rust nightly toolchain

---
 flake.lock                       | 21 +++++++++++++++++++++
 flake.nix                        |  4 ++++
 share/hm-modules/hyprdesktop.nix |  3 +--
 share/system/client-common.nix   |  3 ++-
 4 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 8a2c4a7..d143400 100644
--- a/flake.lock
+++ b/flake.lock
@@ -220,11 +220,32 @@
         "flake-utils": "flake-utils",
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs",
+        "rust-overlay": "rust-overlay",
         "snippets-ls": "snippets-ls",
         "sops-nix": "sops-nix",
         "sorre-website": "sorre-website"
       }
     },
+    "rust-overlay": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1722305989,
+        "narHash": "sha256-ljiuTGSFuEtudqFqp/5Wr1OuEsVCjur/F2CmlNujSjc=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "38c2f156fca1868c8be7195ddac150522752f6ab",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
     "snippets-ls": {
       "inputs": {
         "nixpkgs": [
diff --git a/flake.nix b/flake.nix
index 5fbe2c6..74cc584 100644
--- a/flake.nix
+++ b/flake.nix
@@ -24,6 +24,10 @@
       url = "github:quantonganh/snippets-ls";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    rust-overlay = {
+      url = "github:oxalica/rust-overlay";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs =
diff --git a/share/hm-modules/hyprdesktop.nix b/share/hm-modules/hyprdesktop.nix
index cdbb6ec..984065d 100644
--- a/share/hm-modules/hyprdesktop.nix
+++ b/share/hm-modules/hyprdesktop.nix
@@ -102,8 +102,6 @@ in
         # Developer stuff
         git
         gitui
-        cargo
-        rustc
         clang
         clangStdenv
         tinycc
@@ -112,6 +110,7 @@ in
         go
         python3
         lua
+        (rust-bin.selectLatestNightlyWith (toolchain: toolchain.default))
 
         # TUI/GUI programs
         cmus # music player
diff --git a/share/system/client-common.nix b/share/system/client-common.nix
index 0f1f530..66977c4 100644
--- a/share/system/client-common.nix
+++ b/share/system/client-common.nix
@@ -1,7 +1,8 @@
 # Common configuration options for client machines (i.e. not servers)
-{ pkgs, ... }:
+{ inputs, pkgs, ... }:
 {
   imports = [ ./steam.nix ];
+  nixpkgs.overlays = [ inputs.rust-overlay.overlays.default ];
 
   programs.hyprland.enable = true;
   boot.supportedFilesystems = [
-- 
cgit v1.3.1