Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
32facdd02d
|
||
|
|
9d842e34cc
|
||
|
|
d4c2b37d46
|
||
|
|
15d4a06719
|
||
|
|
6bbd22bce8
|
@@ -1 +1,2 @@
|
||||
.worktrees/
|
||||
/.direnv
|
||||
|
||||
@@ -28,12 +28,13 @@
|
||||
};
|
||||
|
||||
outputs =
|
||||
inputs:
|
||||
inputs@{ self, nixpkgs, ... }:
|
||||
let
|
||||
systems = [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
];
|
||||
forAllSystems = nixpkgs.lib.genAttrs systems;
|
||||
in
|
||||
{
|
||||
nixosConfigurations.jpporta-nixos = inputs.nixpkgs.lib.nixosSystem {
|
||||
@@ -61,5 +62,21 @@
|
||||
./hosts/writter-deck/home.nix
|
||||
];
|
||||
};
|
||||
|
||||
devShells = forAllSystems (
|
||||
system:
|
||||
let
|
||||
pkgs = nixpkgs.legacyPackages.${system};
|
||||
in
|
||||
{
|
||||
default = pkgs.mkShell {
|
||||
packages = with pkgs; [
|
||||
nixfmt
|
||||
nil # Nix LSP — your Neovim will pick it up via direnv
|
||||
statix # linter, optional
|
||||
];
|
||||
};
|
||||
}
|
||||
);
|
||||
};
|
||||
}
|
||||
|
||||
@@ -125,6 +125,7 @@
|
||||
##------------------------------
|
||||
programs = {
|
||||
zsh.enable = true;
|
||||
nix-ld.enable = true;
|
||||
};
|
||||
|
||||
# System Packages
|
||||
@@ -140,7 +141,6 @@
|
||||
glib
|
||||
gsettings-desktop-schemas
|
||||
zip
|
||||
yarn
|
||||
];
|
||||
|
||||
virtualisation.docker.enable = true; # docker, buildx
|
||||
|
||||
@@ -1,6 +1,3 @@
|
||||
Warning: Identity file /home/jpporta/.ssh/id_rsa not accessible: No such file or directory.
|
||||
Warning: Identity file /home/jpporta/.ssh/id_rsa not accessible: No such file or directory.
|
||||
Warning: Identity file /home/jpporta/.ssh/id_rsa not accessible: No such file or directory.
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
@@ -36,6 +33,7 @@ Warning: Identity file /home/jpporta/.ssh/id_rsa not accessible: No such file or
|
||||
../../modules/home-manager/openspec
|
||||
../../modules/home-manager/power-profiles
|
||||
../../modules/home-manager/ntfy-notify
|
||||
../../modules/home-manager/pinentry
|
||||
|
||||
inputs.zen-browser.homeModules.beta
|
||||
];
|
||||
@@ -114,6 +112,7 @@ Warning: Identity file /home/jpporta/.ssh/id_rsa not accessible: No such file or
|
||||
fastfetch
|
||||
nodejs
|
||||
firefox
|
||||
telegram-desktop
|
||||
];
|
||||
|
||||
programs = {
|
||||
@@ -148,15 +147,13 @@ Warning: Identity file /home/jpporta/.ssh/id_rsa not accessible: No such file or
|
||||
];
|
||||
};
|
||||
gpg.enable = true;
|
||||
direnv = {
|
||||
enable = true;
|
||||
nix-direnv.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
services.gpg-agent = {
|
||||
enable = true;
|
||||
pinentry.package = pkgs.pinentry-rofi;
|
||||
enableSshSupport = true; # only if you use gpg keys as ssh keys
|
||||
defaultCacheTtl = 3600;
|
||||
maxCacheTtl = 86400;
|
||||
};
|
||||
custom.pinentry.enable = true;
|
||||
|
||||
services.swaync.enable = true;
|
||||
}
|
||||
|
||||
@@ -37,7 +37,6 @@ in
|
||||
# nitch
|
||||
|
||||
# ---- editors & dev tooling ----
|
||||
tree
|
||||
ffmpeg
|
||||
chromium
|
||||
neovim
|
||||
@@ -68,15 +67,9 @@ in
|
||||
cargo
|
||||
php
|
||||
julia
|
||||
eslint_d
|
||||
golangci-lint
|
||||
rust-analyzer
|
||||
imagemagick
|
||||
ghostscript
|
||||
ripgrep
|
||||
gopls
|
||||
typescript-language-server
|
||||
nixfmt
|
||||
|
||||
# ---- cloud / infra ----
|
||||
awscli2
|
||||
|
||||
@@ -11,7 +11,6 @@
|
||||
worktrunk
|
||||
sesh
|
||||
sl
|
||||
ntfy-sh
|
||||
signal-cli
|
||||
];
|
||||
};
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
{
|
||||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
pinentry-wrapper = pkgs.writeShellScriptBin "pinentry-wrapper" ''
|
||||
if [ -n "''${SSH_CONNECTION:-}" ] || [ -n "''${SSH_TTY:-}" ]; then
|
||||
exec ${pkgs.pinentry-curses}/bin/pinentry-curses "$@"
|
||||
else
|
||||
exec ${pkgs.pinentry-rofi}/bin/pinentry-rofi "$@"
|
||||
fi
|
||||
'';
|
||||
in {
|
||||
options.custom.pinentry = {
|
||||
enable = lib.mkEnableOption "adaptive pinentry: rofi on TTY, curses on SSH";
|
||||
};
|
||||
|
||||
config = lib.mkIf config.custom.pinentry.enable {
|
||||
home.packages = [ pinentry-wrapper ];
|
||||
|
||||
services.gpg-agent = {
|
||||
enable = true;
|
||||
pinentry.package = pinentry-wrapper;
|
||||
enableSshSupport = true;
|
||||
defaultCacheTtl = 3600;
|
||||
maxCacheTtl = 86400;
|
||||
};
|
||||
};
|
||||
}
|
||||
Reference in New Issue
Block a user