From 453a63553827c645edacb4cd1d03e7218dd256bd Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Tue, 28 May 2024 10:41:54 -0500 Subject: [PATCH] SSH agent go away --- modules/home-manager/common.nix | 2 +- modules/nixos/gnome.nix | 10 +++++----- modules/nixos/sway.nix | 14 +++++++------- templates/gleam/flake.nix | 10 ++++++++-- 4 files changed, 21 insertions(+), 15 deletions(-) diff --git a/modules/home-manager/common.nix b/modules/home-manager/common.nix index 446ae61..3e6d5ee 100644 --- a/modules/home-manager/common.nix +++ b/modules/home-manager/common.nix @@ -25,7 +25,7 @@ programs.home-manager.enable = true; - services.ssh-agent.enable = true; + # services.ssh-agent.enable = true; home = { username = lib.mkDefault "lytedev"; diff --git a/modules/nixos/gnome.nix b/modules/nixos/gnome.nix index e336661..fb17dcc 100644 --- a/modules/nixos/gnome.nix +++ b/modules/nixos/gnome.nix @@ -22,11 +22,11 @@ ''; }; - programs.gnupg.agent = { - enable = true; - # pinentryFlavor = "gnome3"; - enableSSHSupport = true; - }; + # programs.gnupg.agent = { + # enable = true; + # # pinentryFlavor = "gnome3"; + # enableSSHSupport = true; + # }; xdg.portal = { enable = true; diff --git a/modules/nixos/sway.nix b/modules/nixos/sway.nix index dd9b9ce..7388073 100644 --- a/modules/nixos/sway.nix +++ b/modules/nixos/sway.nix @@ -12,13 +12,13 @@ services.gnome.gnome-keyring.enable = true; - programs.gnupg.agent = { - enable = true; - enableSSHSupport = true; - # settings = { - # pinentry-program = "/run/current-system/sw/bin/pinentry"; - # }; - }; + # programs.gnupg.agent = { + # enable = true; + # enableSSHSupport = true; + # # settings = { + # # pinentry-program = "/run/current-system/sw/bin/pinentry"; + # # }; + # }; xdg.portal = { enable = true; diff --git a/templates/gleam/flake.nix b/templates/gleam/flake.nix index 4302f5a..22267ec 100644 --- a/templates/gleam/flake.nix +++ b/templates/gleam/flake.nix @@ -1,15 +1,21 @@ { - inputs.nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; + # inputs.nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; + inputs.nixpkgs.url = "github:nixos/nixpkgs?rev=ae34cb9560a578b6354655538e98fb69e8bc8d39"; outputs = inputs: let supportedSystems = ["aarch64-linux" "x86_64-linux" "x86_64-darwin" "aarch64-darwin"]; forAllSystems = inputs.nixpkgs.lib.genAttrs supportedSystems; - nixpkgsFor = system: (import inputs.nixpkgs {inherit system;}); + overlay = final: prev: { + erlangPackages = prev.beam.packagesWith prev.erlang_26; + erlang = final.erlangPackages.erlang; + }; + nixpkgsFor = system: ((import inputs.nixpkgs {inherit system;}).extend overlay); in { devShells = forAllSystems (system: let pkgs = nixpkgsFor system; in { default = pkgs.mkShell { buildInputs = with pkgs; [ + erlang gleam ]; };