diff --git a/flake.lock b/flake.lock index 1e8156d..c86bdac 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,20 @@ { "nodes": { + "flake-utils": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -21,6 +36,28 @@ "type": "github" } }, + "julia2nix": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1669700922, + "narHash": "sha256-CSco+BtoWn/O7IJepELzIepmmpXxoR225TVCjMRQzew=", + "owner": "codedownio", + "repo": "julia2nix", + "rev": "3d326d4e3fa6aa026f4e7568327b3fa007ab8cb6", + "type": "github" + }, + "original": { + "owner": "codedownio", + "ref": "v1.0.0", + "repo": "julia2nix", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1693428224, @@ -40,6 +77,7 @@ "root": { "inputs": { "home-manager": "home-manager", + "julia2nix": "julia2nix", "nixpkgs": "nixpkgs" } } diff --git a/flake.nix b/flake.nix index 167e6c7..2bb017a 100644 --- a/flake.nix +++ b/flake.nix @@ -6,9 +6,11 @@ nixpkgs.url = "github:NixOs/nixpkgs/nixos-23.05"; home-manager.url = "github:nix-community/home-manager/release-23.05"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; + julia2nix.url = "github:codedownio/julia2nix/v1.0.0"; + julia2nix.inputs.nixpkgs.follows = "nixpkgs"; }; - outputs = { self, nixpkgs, home-manager }: { + outputs = { self, nixpkgs, home-manager, julia2nix }: { nixosConfigurations.lambda = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; @@ -19,13 +21,16 @@ } ./lambda/configuration.nix home-manager.nixosModules.home-manager - { + ({ pkgs, ...}: { home-manager = { useGlobalPkgs = true; useUserPackages = true; - users.rachel = import ./home/rachel.nix; + users.rachel = import ./home/rachel.nix { + inherit pkgs; + julia2nix = julia2nix.packages."x86_64-linux".default; + } ; }; - } + }) ]; }; diff --git a/home/rachel.nix b/home/rachel.nix index 7e44265..98ce601 100644 --- a/home/rachel.nix +++ b/home/rachel.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, julia2nix, ... }: let username = "rachel"; homeDir = "/home/${username}"; SAX2 = pkgs.fetchurl { @@ -34,7 +34,8 @@ in nmap arp-scan acpi - julia + julia-bin + julia2nix python3 ghc firefox