From 10117356835ee661c91d2cd8a1112b42d5c0a0ea Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Sat, 24 Dec 2022 15:19:02 +0100 Subject: [PATCH] Better rust and latex configuration --- flake.lock | 26 +++++++++++++++++++++++++- flake.nix | 3 +++ hm_modules/development/latex.nix | 7 ++++--- hm_modules/development/rust.nix | 31 ++++++++++++++++++++++++++++++- 4 files changed, 62 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index b7be143..a1162a5 100644 --- a/flake.lock +++ b/flake.lock @@ -316,7 +316,31 @@ "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "nixpkgs-u": "nixpkgs-u", - "pre-commit-hooks": "pre-commit-hooks_2" + "pre-commit-hooks": "pre-commit-hooks_2", + "tex2nix": "tex2nix" + } + }, + "tex2nix": { + "inputs": { + "flake-utils": [ + "flake-utils" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1671620613, + "narHash": "sha256-QJaDy+y77/XiSMGxcV029gnDRgjakUfr+PrZNJDtQC8=", + "owner": "Mic92", + "repo": "tex2nix", + "rev": "9ec1c0cd8eecf938f4954c53755c4564679486d9", + "type": "github" + }, + "original": { + "owner": "Mic92", + "repo": "tex2nix", + "type": "github" } }, "utils": { diff --git a/flake.nix b/flake.nix index e8fb113..433a397 100644 --- a/flake.nix +++ b/flake.nix @@ -13,6 +13,7 @@ nixos-hardware.url = "github:NixOS/nixos-hardware"; nix-rice = { url = "github:bertof/nix-rice"; inputs = { nixpkgs.follows = "nixpkgs"; flake-utils.follows = "flake-utils"; }; }; pre-commit-hooks = { url = "github:cachix/pre-commit-hooks.nix"; inputs = { nixpkgs.follows = "nixpkgs"; flake-utils.follows = "flake-utils"; }; }; + tex2nix = { url = "github:Mic92/tex2nix"; inputs = { nixpkgs.follows = "nixpkgs"; flake-utils.follows = "flake-utils"; }; }; }; outputs = @@ -27,6 +28,7 @@ , nixos-hardware , nix-rice , pre-commit-hooks + , tex2nix }: let config = { @@ -43,6 +45,7 @@ (self: _: { stable = import nixpkgs { inherit config overlays; inherit (self) system; }; unstable = import nixpkgs-u { inherit config overlays; inherit (self) system; }; + inherit (tex2nix.packages.${self.system}) tex2nix; }) # Nix rice diff --git a/hm_modules/development/latex.nix b/hm_modules/development/latex.nix index 2af3291..733e9ad 100644 --- a/hm_modules/development/latex.nix +++ b/hm_modules/development/latex.nix @@ -1,8 +1,9 @@ -{ pkgs, ... }: { +{ pkgs, config, lib, ... }: { home.packages = with pkgs; [ bibtool - # tex2nix - texlab + tex2nix texlive.combined.scheme-medium + ] ++ lib.optionals config.programs.helix.enable [ + texlab ]; } diff --git a/hm_modules/development/rust.nix b/hm_modules/development/rust.nix index e398993..67b3f6d 100644 --- a/hm_modules/development/rust.nix +++ b/hm_modules/development/rust.nix @@ -1,3 +1,32 @@ { pkgs, lib, config, ... }: { - home.packages = with pkgs; [ bacon cargo clippy rustfmt ] ++ (lib.optionals config.programs.helix.enable [ rust-analyzer ]); + home.packages = with pkgs; [ + bacon + cargo + # cargo-about + cargo-audit + # cargo-auditable + cargo-criterion + cargo-deadlinks + # cargo-deny + # cargo-deps + cargo-expand + # cargo-feature + cargo-flamegraph + cargo-fuzz + cargo-hack + cargo-hakari + cargo-inspect + cargo-modules + cargo-outdated + cargo-profiler + cargo-release + cargo-show-asm + cargo-spellcheck + cargo-tarpaulin + cargo-udeps + cargo-watch + cargo-workspaces + clippy + rustfmt + ] ++ (lib.optionals config.programs.helix.enable [ rust-analyzer ]); }