summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configuration.nix1
-rw-r--r--flake-template/flake.nix54
-rw-r--r--home.nix10
3 files changed, 48 insertions, 17 deletions
diff --git a/configuration.nix b/configuration.nix
index c619c38..2d4365e 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -30,6 +30,7 @@
vim
wget
git
+ pinentry-curses
];
system.stateVersion = "22.11";
diff --git a/flake-template/flake.nix b/flake-template/flake.nix
index a497f25..bd88f19 100644
--- a/flake-template/flake.nix
+++ b/flake-template/flake.nix
@@ -1,22 +1,42 @@
{
- description = "A very basic flake";
-
- inputs.flake-utils.url = "github:numtide/flake-utils";
- inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-
+ 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,
- nixpkgs,
flake-utils,
- }: (flake-utils.lib.eachDefaultSystem (system: let
- pkgs = import nixpkgs {
- inherit system;
- };
- in {
- devShell = pkgs.mkShell {
- buildInputs = with pkgs; [
- make
- ];
- };
- }));
+ ...
+ } @ 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 = "default-shell";
+ buildInputs = [
+ terraform
+ poetry
+ pkgs.nodejs
+ ];
+ };
+ });
}
diff --git a/home.nix b/home.nix
index c112856..f3ff86c 100644
--- a/home.nix
+++ b/home.nix
@@ -71,6 +71,16 @@
];
};
+ programs.gpg = {
+ enable = true;
+ };
+ services.gpg-agent = {
+ enable = true;
+ };
+ programs.password-store = {
+ enable = true;
+ };
+
xsession = {
enable = true;
windowManager.spectrwm = {