diff --git a/flake.lock b/flake.lock index 1ef9cf5..81613c1 100644 --- a/flake.lock +++ b/flake.lock @@ -101,27 +101,6 @@ "type": "github" } }, - "fenix": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src" - }, - "locked": { - "lastModified": 1690784506, - "narHash": "sha256-yGjqJnWo51CKgWPNQ4Z8CHLxsRejSZDWYdPnluR0/PU=", - "owner": "nix-community", - "repo": "fenix", - "rev": "792ee9139705831a27f1d4b1e0b4bc4e909c5ac0", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -214,30 +193,12 @@ "attic": "attic", "catppuccin": "catppuccin", "discord-applemusic-rich-presence": "discord-applemusic-rich-presence", - "fenix": "fenix", "flake-compat": "flake-compat", "home-manager": "home-manager", "nix-darwin": "nix-darwin", "nixpkgs": "nixpkgs" } }, - "rust-analyzer-src": { - "flake": false, - "locked": { - "lastModified": 1690745810, - "narHash": "sha256-PWEdqI+iiHbx4dkIwWHZCGJuTpRfJI3MLSHf3gQEJt4=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "429a3816adb99f33ef557767c874d2cd3a1ffa01", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, "rust-overlay": { "inputs": { "flake-utils": [ diff --git a/flake.nix b/flake.nix index 6b6fb5c..252770c 100644 --- a/flake.nix +++ b/flake.nix @@ -20,11 +20,6 @@ inputs.flake-compat.follows = "flake-compat"; }; - fenix = { - url = "github:nix-community/fenix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - catppuccin = { url = "github:Stonks3141/ctp-nix"; inputs.nixpkgs.follows = "nixpkgs"; @@ -47,7 +42,6 @@ nixpkgs, nix-darwin, home-manager, - fenix, attic, catppuccin, discord-applemusic-rich-presence, diff --git a/system.nix b/system.nix index 440f357..fba2e8c 100644 --- a/system.nix +++ b/system.nix @@ -1,7 +1,6 @@ { pkgs, attic, - fenix, catppuccin, discord-applemusic-rich-presence, ... @@ -14,7 +13,12 @@ cachix direnv - fenix.packages.${system}.stable.defaultToolchain + rustc + cargo + rustfmt + rust-analyzer + clippy + ccache deno fnm @@ -87,7 +91,6 @@ nixpkgs = { overlays = [ attic.overlays.default - fenix.overlays.default discord-applemusic-rich-presence.overlays.default (import ./overlays/ryan-mono-bin.nix) ];