From 3a4ebdcd110dca0337334ed866e6e6d66d1ba007 Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Wed, 3 May 2023 12:33:02 -0500 Subject: [PATCH] WIP --- flake.lock | 8 ++++---- flake.nix | 2 +- hosts/jeran/configuration.nix | 2 ++ modules/environment.nix | 20 ++++++++++---------- 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 99079d0..7c80e46 100644 --- a/flake.lock +++ b/flake.lock @@ -2,16 +2,16 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1682530770, - "narHash": "sha256-xKO2KuibPW/p6HdBLpG7Cg5UF3l/WX2e9LbwVpsZzN0=", + "lastModified": 1682453498, + "narHash": "sha256-WoWiAd7KZt5Eh6n+qojcivaVpnXKqBsVgpixpV2L9CE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ddff8bd1184a180ebe30d4dec51e083c1811816c", + "rev": "c8018361fa1d1650ee8d4b96294783cf564e8a7f", "type": "github" }, "original": { "owner": "nixos", - "ref": "master", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 01ab5b7..a8b0f23 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "An example NixOS configuration"; inputs = { - nixpkgs = { url = "github:nixos/nixpkgs/master"; }; + nixpkgs = { url = "github:nixos/nixpkgs/nixos-unstable"; }; }; diff --git a/hosts/jeran/configuration.nix b/hosts/jeran/configuration.nix index 4d6b859..35946f3 100644 --- a/hosts/jeran/configuration.nix +++ b/hosts/jeran/configuration.nix @@ -78,6 +78,8 @@ lazydocker python3 + micromamba + nodejs go rustup diff --git a/modules/environment.nix b/modules/environment.nix index 03bb032..ce3d23c 100644 --- a/modules/environment.nix +++ b/modules/environment.nix @@ -8,14 +8,14 @@ issue.source = ../etc/issue; }; - environment.variables = { - # NIX_LD_LIBRARY_PATH = with pkgs; lib.makeLibraryPath [ - # stdenv.cc.cc - # openssl - # - # zlib # for delta - # ]; - # this setting means needing to build --impure - NIX_LD = lib.fileContents "${pkgs.stdenv.cc}/nix-support/dynamic-linker"; - }; + # environment.variables = { + # # NIX_LD_LIBRARY_PATH = with pkgs; lib.makeLibraryPath [ + # # stdenv.cc.cc + # # openssl + # # + # # zlib # for delta + # # ]; + # # this setting means needing to build --impure + # NIX_LD = lib.fileContents "${pkgs.stdenv.cc}/nix-support/dynamic-linker"; + # }; }