From d885924961b3c4b3db76b78e603c0cc84ff88aae Mon Sep 17 00:00:00 2001 From: Mike Vink Date: Mon, 16 Oct 2023 23:16:01 +0200 Subject: stuff --- templates/ansible/flake.nix | 9 --------- templates/flake/.envrc | 4 ---- templates/flake/flake.nix | 42 ------------------------------------------ templates/go/flake.nix | 6 ------ 4 files changed, 61 deletions(-) delete mode 100644 templates/flake/.envrc delete mode 100644 templates/flake/flake.nix (limited to 'templates') diff --git a/templates/ansible/flake.nix b/templates/ansible/flake.nix index 98c47ef..df49972 100644 --- a/templates/ansible/flake.nix +++ b/templates/ansible/flake.nix @@ -3,12 +3,6 @@ nixpkgs.url = "nixpkgs"; nix-filter.url = "github:numtide/nix-filter"; flake-utils.url = "github:numtide/flake-utils"; - nixpkgs-terraform-providers-bin.url = "github:nix-community/nixpkgs-terraform-providers-bin"; - nixpkgs-terraform-providers-bin.inputs.nixpkgs.follows = "nixpkgs"; - poetry2nix = { - url = "github:nix-community/poetry2nix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; outputs = { self, @@ -21,13 +15,10 @@ { inherit system; }; - poetry = inputs.poetry2nix.packages.${system}.poetry; - inherit (inputs.poetry2nix.legacyPackages.${system}) mkPoetryEnv defaultPoetryOverrides; in { devShells.default = pkgs.mkShell { name = "dev"; buildInputs = [ - poetry pkgs.ansible-language-server pkgs.bashInteractive ]; diff --git a/templates/flake/.envrc b/templates/flake/.envrc deleted file mode 100644 index 1305de8..0000000 --- a/templates/flake/.envrc +++ /dev/null @@ -1,4 +0,0 @@ -if ! has nix_direnv_version || ! nix_direnv_version 2.2.0; then - source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.2.0/direnvrc" "sha256-5EwyKnkJNQeXrRkYbwwRBcXbibosCJqyIUuz9Xq+LRc=" -fi -use flake diff --git a/templates/flake/flake.nix b/templates/flake/flake.nix deleted file mode 100644 index 83c2bca..0000000 --- a/templates/flake/flake.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - inputs = { - nixpkgs.url = "nixpkgs"; - nix-filter.url = "github:numtide/nix-filter"; - flake-utils.url = "github:numtide/flake-utils"; - nixpkgs-terraform-providers-bin.url = "github:nix-community/nixpkgs-terraform-providers-bin"; - nixpkgs-terraform-providers-bin.inputs.nixpkgs.follows = "nixpkgs"; - poetry2nix = { - url = "github:nix-community/poetry2nix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - }; - outputs = { - self, - flake-utils, - ... - } @ inputs: - flake-utils.lib.eachDefaultSystem (system: let - pkgs = - import inputs.nixpkgs - { - inherit system; - }; - python = pkgs.python310; - poetry = inputs.poetry2nix.packages.${system}.poetry; - inherit (inputs.poetry2nix.legacyPackages.${system}) mkPoetryEnv defaultPoetryOverrides; - - more-providers = inputs.nixpkgs-terraform-providers-bin.legacyPackages.${system}.providers; - terraform = pkgs.terraform.withPlugins (p: [ - more-providers.microsoft.azuredevops - ]); - in { - devShells.default = pkgs.mkShell { - name = "dev"; - buildInputs = [ - terraform - poetry - pkgs.nodejs - ]; - }; - }); -} diff --git a/templates/go/flake.nix b/templates/go/flake.nix index b41da36..d99ce9a 100644 --- a/templates/go/flake.nix +++ b/templates/go/flake.nix @@ -3,12 +3,6 @@ nixpkgs.url = "nixpkgs"; nix-filter.url = "github:numtide/nix-filter"; flake-utils.url = "github:numtide/flake-utils"; - nixpkgs-terraform-providers-bin.url = "github:nix-community/nixpkgs-terraform-providers-bin"; - nixpkgs-terraform-providers-bin.inputs.nixpkgs.follows = "nixpkgs"; - poetry2nix = { - url = "github:nix-community/poetry2nix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; outputs = { self, -- cgit v1.2.3