diff --git a/flake.lock b/flake.lock index bc5bc2f..192ef8e 100644 --- a/flake.lock +++ b/flake.lock @@ -296,7 +296,28 @@ "lolcat++-unstable": "lolcat++-unstable", "mailserver": "mailserver", "nixpkgs-stable": "nixpkgs-stable", - "nixpkgs-unstable": "nixpkgs-unstable" + "nixpkgs-unstable": "nixpkgs-unstable", + "rust-overlay": "rust-overlay" + } + }, + "rust-overlay": { + "inputs": { + "nixpkgs": [ + "nixpkgs-unstable" + ] + }, + "locked": { + "lastModified": 1776741231, + "narHash": "sha256-k9G98qzn+7npROUaks8VqCFm7cFtEG8ulQLBBo5lItg=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "02061303f7c4c964f7b4584dabd9e985b4cd442b", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" } } }, diff --git a/flake.nix b/flake.nix index c75e4fc..e5665bd 100644 --- a/flake.nix +++ b/flake.nix @@ -21,6 +21,11 @@ inputs.nixpkgs.follows = "nixpkgs-unstable"; }; + rust-overlay = { + url = "github:oxalica/rust-overlay"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; + }; + mailserver = { url = "gitlab:simple-nixos-mailserver/nixos-mailserver?ref=nixos-25.05"; inputs.nixpkgs.follows = "nixpkgs-stable"; diff --git a/modules/nixos/packages/python.nix b/modules/nixos/packages/python.nix index bdda6af..eede536 100644 --- a/modules/nixos/packages/python.nix +++ b/modules/nixos/packages/python.nix @@ -10,6 +10,7 @@ numpy pandas requests + aiohttp beautifulsoup4 ipython diff --git a/modules/nixos/packages/rust.nix b/modules/nixos/packages/rust.nix index dcdd4e5..97be4db 100644 --- a/modules/nixos/packages/rust.nix +++ b/modules/nixos/packages/rust.nix @@ -1,8 +1,21 @@ -{ pkgs, ... }: +{ pkgs, inputs, ... }: +let + rustToolchain = pkgs.rust-bin.stable.latest.default.override { + extensions = [ + "rust-src" + "rustfmt" + ]; + }; +in { + nixpkgs.overlays = [ inputs.rust-overlay.overlays.default ]; + environment.systemPackages = with pkgs; [ + rustToolchain + clang + lld + pkg-config + openssl rust-analyzer - rustfmt - rustup ]; }