AtaraxiaDev/nixos-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update gpg-ssh

Browse Source
This commit is contained in:
Dmitriy Kholkin 2020-08-05 22:51:19 +04:00
parent 3d85a2c08f
commit 9a4e0af232
4 changed files with 35 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/default.nix
View File

@ -33,6 +33,7 @@ device:
./workspace/pulseeffects ./workspace/pulseeffects
./workspace/rofi.nix ./workspace/rofi.nix
# ./workspace/spotifyd.nix # ./workspace/spotifyd.nix
./workspace/ssh.nix
./workspace/xresources.nix ./workspace/xresources.nix
./workspace/zsh.nix ./workspace/zsh.nix
]; ];

2
modules/services.nix
View File

@ -50,7 +50,7 @@ in {
services.upower.enable = true; services.upower.enable = true;
services.gnome3.gnome-keyring.enable = true; services.gnome3.gnome-keyring.enable = false;
virtualisation.docker.enable = device.enableVirtualisation; virtualisation.docker.enable = device.enableVirtualisation;

20
modules/workspace/misc.nix
View File

@ -1,6 +1,5 @@
{ pkgs, lib, config, ... }: { { pkgs, lib, config, ... }: {
# programs.ssh.askPassword = "${pkgs.plasma5.ksshaskpass}/bin/ksshaskpass";
environment.sessionVariables = { environment.sessionVariables = {
EDITOR = config.defaultApplications.editor.cmd; EDITOR = config.defaultApplications.editor.cmd;
VISUAL = config.defaultApplications.editor.cmd; VISUAL = config.defaultApplications.editor.cmd;
@ -8,12 +7,6 @@
NIX_AUTO_RUN = "1"; NIX_AUTO_RUN = "1";
}; };
# GPG with SSH
environment.shellInit = ''
export GPG_TTY="$(tty)"
gpg-connect-agent /bye
'';
services.atd.enable = true; services.atd.enable = true;
home-manager.users.alukard = { home-manager.users.alukard = {
@ -26,6 +19,7 @@
package = pkgs.git-with-libsecret; package = pkgs.git-with-libsecret;
userEmail = "alukard.develop@gmail.com"; userEmail = "alukard.develop@gmail.com";
userName = "Dmitriy Kholkin"; userName = "Dmitriy Kholkin";
signing.key = "922DA6E758A0FE4CFAB4E4B2FD266B810DF48DF2";
extraConfig = { extraConfig = {
credential = { credential = {
helper = "libsecret"; helper = "libsecret";
@ -37,19 +31,25 @@
}; };
# GPG with SSH # GPG with SSH
programs.gpg.enable = true;
services.gpg-agent = { services.gpg-agent = {
enable = true; enable = true;
enableSshSupport = true; enableSshSupport = true;
pinentryFlavor = "gtk2"; pinentryFlavor = "gtk2";
sshKeys = [ "E6A6377C3D0827C36428A290199FDB3B91414AFE" ]; sshKeys = [ "E6A6377C3D0827C36428A290199FDB3B91414AFE" ];
}; };
programs.gpg.enable = true;
home.sessionVariables.SSH_AUTH_SOCK = "/run/user/1000/gnupg/S.gpg-agent.ssh";
# --END--
programs.direnv = { programs.direnv = {
enable = true; enable = true;
enableZshIntegration = true; enableZshIntegration = true;
# enable use_flake support
# stdlib = ''
# use_flake() {
# watch_file flake.nix
# watch_file flake.lock
# eval "$(nix print-dev-env --profile "$(direnv_layout_dir)/flake-profile")"
# }
# '';
}; };
news.display = "silent"; news.display = "silent";

23
modules/workspace/ssh.nix Normal file
View File

@ -0,0 +1,23 @@
{ pkgs, lib, config, ... }: {
# services.openssh = {
# enable = true;
# passwordAuthentication = false;
# permitRootLogin = "yes";
# forwardX11 = true;
# ports = [ 22 ];
# };
# home-manager.users.alukard.programs.ssh = {
# enable = true;
# matchBlocks = {
# "*" = {
# compression = false;
# };
# };
# };
users.users.alukard.openssh.authorizedKeys.keys = [
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC+xd8ClJPvJuAdYC9HlNnjiubEtYfvnKjYr9ROV+UmPVvI3ZITF24OaMI+fxgR0EqGfcUzSGom8528IB53Q3aFMIAaA0vKjW+jrByyB2l/k/+ttpLbH75c9WyOpAcUDTen8BhHKPyXOHoJ1jLu7GFmtPZ+mZo8thFB/VIRrwECHd8DnF0drsSCorkRp1bZC7bAHgztaYHNBUoAVGgJ7nLwW7DotlgbUEDiPJHXOxd/c/ZlXIB/cfUUqF+L5ThbMPhMcwRMspLy+nQdmHhih9k6SkvYqJoNqHT5/XeShb0RkIzvUWT2CYTPop5kAY5mMnatVTOY1FZPhHzk3G8MhOQ3r/elM/ecZxmjL8uozMN9kRGf1IL4DgQZfVqQRILdNSQGb0tfeiyirNZe1RlDw9UvMnZJOw0EkiC9lSSRhBWXXxAmxRrbNFTPQSp+/kiIGDmp2AsGhD11CfTDEU3wcLEUPBUqp1FYSzHncJyEKGy2Dpa5xaUJ0cuyGL4W3WHDXa4sTfY+AIXbQTD88Ujdsbfzyd6lrikG4D/crCurXissrh7q9DuYKWRI24cp5bw9lG33U1EXisnZqFyZNwMAmSj2QEGsHCwSevn0FgyRa2WYXgpZ9hfgY4le+ZSMo2JTosQ6DjGyxMDyQAHJ/ismTTzL67Q2p6U+73toYm62Qqdspw== (none)"
];
programs.ssh.askPassword = "${pkgs.plasma5.ksshaskpass}/bin/ksshaskpass";
}