diff --git a/flake.lock b/flake.lock index 07911be..4ef893e 100644 --- a/flake.lock +++ b/flake.lock @@ -785,11 +785,11 @@ ] }, "locked": { - "lastModified": 1738061895, - "narHash": "sha256-Yu0t5/h6+HbJjTqTMy/XIZF8YYUsiH5B/J+rY+ggl+I=", + "lastModified": 1738378935, + "narHash": "sha256-5+k990nb+BgYKMv04thpSe/xgo5wYpKpzXXQomTML0Y=", "owner": "nix-community", "repo": "nix4nvchad", - "rev": "92eb8d2037e3660104163264c5793ba7c16d10de", + "rev": "64e49f7186a851a36dadeacee05df7f98e390a9e", "type": "github" }, "original": { diff --git a/flakes/rust-dev/flake.nix b/flakes/rust-dev/flake.nix new file mode 100644 index 0000000..f24aafb --- /dev/null +++ b/flakes/rust-dev/flake.nix @@ -0,0 +1,35 @@ +{ + inputs = { + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + utils.url = "github:numtide/flake-utils"; + rust.url = "github:oxalica/rust-overlay"; + }; + outputs = + { + self, + nixpkgs, + utils, + rust, + }: + utils.lib.eachDefaultSystem ( + system: + + let + overlays = [ (import rust) ]; + pkgs = import nixpkgs { + inherit system overlays; + }; + buildInputs = with pkgs; [ + pkg-config + bacon + openssl + ]; + in + with pkgs; + { + devShells.default = mkShell { + inherit buildInputs; + }; + } + ); +} diff --git a/home/common/programs/rust.nix b/home/common/programs/rust.nix index c3c66b8..3b4c49b 100644 --- a/home/common/programs/rust.nix +++ b/home/common/programs/rust.nix @@ -5,17 +5,17 @@ bacon mprocs pkg-config - openssl + openssl.dev taplo sccache ]; home.sessionPath = [ "\${CARGO_HOME:-~/.cargo}/bin" ]; - systemd.user.services.ra-multiplex = { - Service = { - ExecStart = "${pkgs.ra-multiplex}/bin/ra-multiplex server"; - }; - Install.WantedBy = [ "default.target" ]; - }; + # systemd.user.services.ra-multiplex = { + # Service = { + # ExecStart = "${pkgs.ra-multiplex}/bin/ra-multiplex server"; + # }; + # Install.WantedBy = [ "default.target" ]; + # }; } diff --git a/home/common/programs/zsh.nix b/home/common/programs/zsh.nix index a5d540d..957ebf5 100644 --- a/home/common/programs/zsh.nix +++ b/home/common/programs/zsh.nix @@ -68,6 +68,10 @@ . "$HOME/.nix-profile/share/asdf-vm/asdf.sh" [[ -f ~/.secrets.zsh ]] && source ~/.secrets.zsh + + # export PKG_CONFIG_PATH=$(nix eval --raw nixpkgs.openssl.dev)/lib/pkgconfig:$PKG_CONFIG_PATH + # export LIBRARY_PATH=$(nix eval --raw nixpkgs.openssl.dev)/lib:$LIBRARY_PATH + # export LD_LIBRARY_PATH=$(nix eval --raw nixpkgs.openssl.dev)/lib:$LD_LIBRARY_PATH ''; };