From fc4ea15c0b463626858a26288a59880d709f2fbc Mon Sep 17 00:00:00 2001 From: Nathan McCarty Date: Sun, 23 Oct 2022 09:52:34 -0400 Subject: [PATCH] Add idris --- flake.lock | 60 ++++++++++++++++++++++++-- flake.nix | 7 ++- home-manager/common/programs/devel.nix | 5 +++ home-manager/options.nix | 2 + 4 files changed, 69 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 286087c..045cd58 100644 --- a/flake.lock +++ b/flake.lock @@ -111,6 +111,21 @@ } }, "flake-utils_2": { + "locked": { + "lastModified": 1638122382, + "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -125,7 +140,7 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_4": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -204,6 +219,44 @@ "type": "github" } }, + "idris-emacs-src": { + "flake": false, + "locked": { + "lastModified": 1640162726, + "narHash": "sha256-blfl73dUC3dagL6PIK2+0979DGH4ZnMMHsd6U1yD+LM=", + "owner": "redfish64", + "repo": "idris2-mode", + "rev": "f56118aa09f5562815d3295d2fd160152bdef967", + "type": "github" + }, + "original": { + "owner": "redfish64", + "repo": "idris2-mode", + "type": "github" + } + }, + "idris2": { + "inputs": { + "flake-utils": "flake-utils_2", + "idris-emacs-src": "idris-emacs-src", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1666462432, + "narHash": "sha256-iiJkmycA3I2r2Q7s2ayHXBSV4d2NITX18eXNjqzuXb0=", + "owner": "idris-lang", + "repo": "idris2", + "rev": "c906720ee3782fff5117590d94da30c6cf9860bd", + "type": "github" + }, + "original": { + "owner": "idris-lang", + "repo": "idris2", + "type": "github" + } + }, "java": { "inputs": { "nixpkgs": [ @@ -265,7 +318,7 @@ }, "nix-on-droid": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "home-manager": [ "home-manager" ], @@ -437,6 +490,7 @@ "fenix": "fenix", "gamescope": "gamescope", "home-manager": "home-manager", + "idris2": "idris2", "java": "java", "nix-on-droid": "nix-on-droid", "nixos-generators": "nixos-generators", @@ -551,7 +605,7 @@ "wsl": { "inputs": { "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "nixpkgs": [ "nixpkgs" ] diff --git a/flake.nix b/flake.nix index 74cba59..ad8a16d 100644 --- a/flake.nix +++ b/flake.nix @@ -58,13 +58,16 @@ nixpkgs.follows = "nixpkgs"; nixpkgs-unstable.follows = "nixpkgs-unstable"; }; - + }; + idris2 = { + url = "github:idris-lang/idris2"; + inputs.nixpkgs.follows = "nixpkgs"; }; }; outputs = { self, nixpkgs, nixpkgs-unstable, nixos-hardware, fenix, emacs , sops-nix, home-manager, darwin, prismlauncher, java, quilt-server - , nixos-generators, wsl, gamescope, nix-on-droid }@inputs: + , nixos-generators, wsl, gamescope, nix-on-droid, idris2 }@inputs: let makeNixosSystem = { system, hostName, extraModules ? [ ], ourNixpkgs ? nixpkgs }: diff --git a/home-manager/common/programs/devel.nix b/home-manager/common/programs/devel.nix index 2640874..d39ba75 100644 --- a/home-manager/common/programs/devel.nix +++ b/home-manager/common/programs/devel.nix @@ -70,5 +70,10 @@ with nLib; { }) # Raku Development (mkIf devel.raku { home.packages = with pkgs; [ rakudo zef ]; }) + # Idris 2 Development + (mkIf devel.idris2 { + home.packages = with pkgs; + [ inputs.idris2.packages."${pkgs.system}".idris2 ]; + }) ]; } diff --git a/home-manager/options.nix b/home-manager/options.nix index d5da492..f4854d6 100644 --- a/home-manager/options.nix +++ b/home-manager/options.nix @@ -43,6 +43,8 @@ with nLib; { config.nathan.config.isDesktop; raku = mkDefaultOption "Raku Development Utilites" config.nathan.config.isDesktop; + idris2 = mkDefaultOption "Idris 2 Development Utilites" + config.nathan.config.isDesktop; }; # Emacs, enabled by default on desktop emacs = {