From 0a6b8812e22eef339170aba8758ec0a89a00b0e6 Mon Sep 17 00:00:00 2001 From: LordGrimmauld Date: Sun, 31 Mar 2024 16:07:15 +0200 Subject: [PATCH] add useful py packages to xonsh --- common/toolchains.nix | 12 +++++++++- flake.lock | 51 ++++++++++++++++++++++++++++++------------- flake.nix | 11 +++++++--- 3 files changed, 55 insertions(+), 19 deletions(-) diff --git a/common/toolchains.nix b/common/toolchains.nix index b882a90..bbe7125 100644 --- a/common/toolchains.nix +++ b/common/toolchains.nix @@ -99,7 +99,17 @@ in { }; }; - programs.xonsh.enable = true; + programs.xonsh = { + enable = true; + package = pkgs.xonsh.override { + extraPackages = ps: with ps; [ + requests + matplotlib + numpy + scipy + ]; + }; + }; programs.ssh.startAgent = true; programs.thefuck.enable = true; }; diff --git a/flake.lock b/flake.lock index d495b84..6ee613e 100644 --- a/flake.lock +++ b/flake.lock @@ -78,11 +78,11 @@ "yafas": "yafas" }, "locked": { - "lastModified": 1711620834, - "narHash": "sha256-ACc91o5k7rlNbX6wQmV6tiOF4pQr/nV2ulQ3JHoYH/E=", + "lastModified": 1711734846, + "narHash": "sha256-EFrsJPOKrXp9h/C22ayBx3PwLMr3/FKEuCW8lQ/LpSc=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "bec5e460d3fcfccac029088c395f4f629c800957", + "rev": "7cc6282416833f2dea96f97f516aceadbf406404", "type": "github" }, "original": { @@ -357,11 +357,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1711497966, - "narHash": "sha256-riUI0kKAPlx0IueXm6cn2jjAnorwumLSN2kFbVvDwT8=", + "lastModified": 1711707302, + "narHash": "sha256-lJ3HdKjT3rQhul+PXW7Fh3iAE8GrddKjRM13GrHhQ/0=", "owner": "martinvonz", "repo": "jj", - "rev": "423a2a54463471e525a04959c9e79e3f4a206f4a", + "rev": "f83d1a840e0a9b23737c31191ca46d6277cf9569", "type": "github" }, "original": { @@ -394,11 +394,11 @@ ] }, "locked": { - "lastModified": 1711518378, - "narHash": "sha256-+wOdvNOEtkb5sGeJBXK5CpUPx+NWeVwVH6y4NdVH2os=", + "lastModified": 1711707808, + "narHash": "sha256-n+WRrXW5aMYB/AyJtpZniPC+KhOMh1tRIvHlf2Ql+pA=", "owner": "YaLTeR", "repo": "niri", - "rev": "e276c906bf4bea27dc8173815ff373d04c20caaf", + "rev": "ab228165212a7fc1911044bcf9a1f1d84cdaf5a3", "type": "github" }, "original": { @@ -430,11 +430,11 @@ ] }, "locked": { - "lastModified": 1711501815, - "narHash": "sha256-mHtxlnqdIZAPAAXT0em6O5n9yW/6ri937i0NWAvEErU=", + "lastModified": 1711847810, + "narHash": "sha256-gLeUuU3hQ2ErboVIyzDNes2bywdTYDidvi6wG5+tnQ8=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "63ded1ffc0846c259f9cd0f62aa2ea9f7f804f56", + "rev": "4ec1bf4262e913af85e3f699f564769ec2f23cff", "type": "github" }, "original": { @@ -468,11 +468,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1711523803, - "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=", + "lastModified": 1711703276, + "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2726f127c15a4cc9810843b96cad73c7eb39e443", + "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", "type": "github" }, "original": { @@ -516,12 +516,33 @@ "type": "github" } }, + "rmenu": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1711745148, + "narHash": "sha256-TS9gV8E4Icpsrb25fUUH8rzQ+X0BIUpbAu/Y5r/TpZI=", + "ref": "7e2302eb64e4bc91e0a92019684dab54990361ad", + "rev": "7e2302eb64e4bc91e0a92019684dab54990361ad", + "revCount": 87, + "type": "git", + "url": "file:///home/grimmauld/rmenu" + }, + "original": { + "type": "git", + "url": "file:///home/grimmauld/rmenu" + } + }, "root": { "inputs": { "agenix": "agenix", "chaotic": "chaotic", "nix-gaming": "nix-gaming", "nixpkgs": "nixpkgs", + "rmenu": "rmenu", "swaymux": "swaymux" } }, diff --git a/flake.nix b/flake.nix index e20520c..3e461a2 100644 --- a/flake.nix +++ b/flake.nix @@ -21,9 +21,13 @@ url = "git+https://git.grimmauld.de/Grimmauld/swaymux"; inputs.nixpkgs.follows = "nixpkgs"; }; + rmenu = { + url = "git+file:///home/grimmauld/rmenu"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; - outputs = inputs @ { self, swaymux, nix-gaming, agenix, nixpkgs, chaotic, ... }: let + outputs = inputs @ { self, swaymux, rmenu, nix-gaming, agenix, nixpkgs, chaotic, ... }: let system = "x86_64-linux"; in { nixosConfigurations = { @@ -31,9 +35,10 @@ inherit system; specialArgs = { inherit inputs system; }; modules = [ - agenix.nixosModules.default + agenix.nixosModules.default chaotic.nixosModules.default - inputs.nix-gaming.nixosModules.pipewireLowLatency + nix-gaming.nixosModules.pipewireLowLatency + rmenu.nixosModules.default ./load_common.nix ./specific/grimm-nixos-laptop/configuration.nix