From a63f0aaca40e86a8b4ef89840f224a9296230b31 Mon Sep 17 00:00:00 2001 From: Nickiel12 Date: Tue, 31 Jan 2023 17:52:10 -0800 Subject: [PATCH] Removed rust-overlay --- flake.lock | 53 +---------------------------------------------- flake.nix | 5 ++--- hosts/default.nix | 6 +----- hosts/home.nix | 1 - 4 files changed, 4 insertions(+), 61 deletions(-) diff --git a/flake.lock b/flake.lock index 845c0b6..524de14 100644 --- a/flake.lock +++ b/flake.lock @@ -1,20 +1,5 @@ { "nodes": { - "flake-utils": { - "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -88,47 +73,11 @@ "type": "github" } }, - "nixpkgs_3": { - "locked": { - "lastModified": 1665296151, - "narHash": "sha256-uOB0oxqxN9K7XGF1hcnY+PQnlQJ+3bP2vCn/+Ru/bbc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "14ccaaedd95a488dd7ae142757884d8e125b3363", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "home-manager": "home-manager", "kmonad": "kmonad", - "nixpkgs": "nixpkgs_2", - "rust-overlay": "rust-overlay" - } - }, - "rust-overlay": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_3" - }, - "locked": { - "lastModified": 1675132198, - "narHash": "sha256-izOVjdIfdv0OzcfO9rXX0lfGkQn4tdJ0eNm3P3LYo/o=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "48b1403150c3f5a9aeee8bc4c77c8926f29c6501", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" + "nixpkgs": "nixpkgs_2" } }, "utils": { diff --git a/flake.nix b/flake.nix index b43113c..58fba6f 100644 --- a/flake.nix +++ b/flake.nix @@ -8,17 +8,16 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - rust-overlay.url = "github:oxalica/rust-overlay"; kmonad.url = "github:kmonad/kmonad?dir=nix"; }; - outputs = inputs@{ self, nixpkgs, home-manager, kmonad, rust-overlay }: + outputs = inputs@{ self, nixpkgs, home-manager, kmonad }: let user = "nixolas"; in { nixosConfigurations = import ./hosts { inherit (nixpkgs) lib; - inherit inputs nixpkgs home-manager user kmonad rust-overlay; + inherit inputs nixpkgs home-manager user kmonad ; }; }; } diff --git a/hosts/default.nix b/hosts/default.nix index d691161..6e6c8ba 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -1,4 +1,4 @@ -{ lib, inputs, nixpkgs, home-manager, user, kmonad, rust-overlay, ... }: +{ lib, inputs, nixpkgs, home-manager, user, kmonad, ... }: let system = "x86_64-linux"; @@ -19,10 +19,6 @@ in { { networking.hostName = "NicksNixLaptop"; } - ({ pkgs, ... }: { - nixpkgs.overlays = [ rust-overlay.overlays.default ]; - environment.systemPackages = [ pkgs.rust-bin.stable.latest.default ]; - }) kmonad.nixosModules.default home-manager.nixosModules.home-manager { home-manager = { diff --git a/hosts/home.nix b/hosts/home.nix index 8295d60..c5b33a2 100644 --- a/hosts/home.nix +++ b/hosts/home.nix @@ -39,7 +39,6 @@ in frei0r # kdenlive video plugins pandoc fontpreview - cmake texlive.combined.scheme-medium