Format
This commit is contained in:
parent
2605cc1015
commit
67214a3cdc
|
@ -31,20 +31,19 @@
|
|||
'';
|
||||
};
|
||||
password-store = {
|
||||
package = pkgs.pass-wayland.withExtensions
|
||||
(exts: [ exts.pass-update pkgs.pass-clip exts.pass-otp ]);
|
||||
package = pkgs.pass-wayland.withExtensions (exts: [ exts.pass-update pkgs.pass-clip exts.pass-otp ]);
|
||||
enable = true;
|
||||
settings.PASSWORD_STORE_DIR =
|
||||
"${config.home.homeDirectory}/git/password-store";
|
||||
settings.PASSWORD_STORE_DIR = "${config.home.homeDirectory}/git/password-store";
|
||||
};
|
||||
git = {
|
||||
aliases = {
|
||||
sync = "!git pull -r && git push";
|
||||
cpr =
|
||||
"!f() { git fetch origin refs/pull/$1/head && git checkout FETCH_HEAD; }; f";
|
||||
cpr = "!f() { git fetch origin refs/pull/$1/head && git checkout FETCH_HEAD; }; f";
|
||||
};
|
||||
extraConfig = {
|
||||
pull.ff = "only";
|
||||
core.editor = "nvim";
|
||||
};
|
||||
extraConfig.pull.ff = "only";
|
||||
extraConfig.core.editor = "nvim";
|
||||
enable = true;
|
||||
ignores = [
|
||||
".syncthing*.tmp"
|
||||
|
@ -87,68 +86,78 @@
|
|||
controlMaster = "auto";
|
||||
controlPersist = "120";
|
||||
enable = true;
|
||||
matchBlocks = let agHost = "fb04217.mathematik.tu-darmstadt.de";
|
||||
in {
|
||||
athene.hostname = "192.168.178.22";
|
||||
git-auto = {
|
||||
hostname = "hera.m-0.eu";
|
||||
user = "git";
|
||||
identityFile = "~/.ssh/id_auto_ed25519";
|
||||
matchBlocks = let
|
||||
agHost = "fb04217.mathematik.tu-darmstadt.de";
|
||||
in
|
||||
{
|
||||
athene.hostname = "192.168.178.22";
|
||||
git-auto = {
|
||||
hostname = "hera.m-0.eu";
|
||||
user = "git";
|
||||
identityFile = "~/.ssh/id_auto_ed25519";
|
||||
};
|
||||
git = {
|
||||
hostname = "hera.m-0.eu";
|
||||
user = "git";
|
||||
};
|
||||
hera = {
|
||||
hostname = "hera.m-0.eu";
|
||||
user = "maralorn";
|
||||
};
|
||||
ag-forward = {
|
||||
hostname = agHost;
|
||||
proxyJump = "gw";
|
||||
user = "brandy";
|
||||
};
|
||||
ag = {
|
||||
hostname = agHost;
|
||||
user = "brandy";
|
||||
};
|
||||
gw = {
|
||||
hostname = "gwres4.mathematik.tu-darmstadt.de";
|
||||
user = "brandy";
|
||||
};
|
||||
shells = {
|
||||
hostname = "shells.darmstadt.ccc.de";
|
||||
user = "maralorn";
|
||||
};
|
||||
whisky = {
|
||||
hostname = "whisky.w17.io";
|
||||
user = "chaos";
|
||||
};
|
||||
kitchen = {
|
||||
hostname = "kitchen.w17.io";
|
||||
user = "chaos";
|
||||
};
|
||||
"door.w17.io".identityFile = "~/.ssh/door_rsa";
|
||||
};
|
||||
git = {
|
||||
hostname = "hera.m-0.eu";
|
||||
user = "git";
|
||||
};
|
||||
hera = {
|
||||
hostname = "hera.m-0.eu";
|
||||
user = "maralorn";
|
||||
};
|
||||
ag-forward = {
|
||||
hostname = agHost;
|
||||
proxyJump = "gw";
|
||||
user = "brandy";
|
||||
};
|
||||
ag = {
|
||||
hostname = agHost;
|
||||
user = "brandy";
|
||||
};
|
||||
gw = {
|
||||
hostname = "gwres4.mathematik.tu-darmstadt.de";
|
||||
user = "brandy";
|
||||
};
|
||||
shells = {
|
||||
hostname = "shells.darmstadt.ccc.de";
|
||||
user = "maralorn";
|
||||
};
|
||||
whisky = {
|
||||
hostname = "whisky.w17.io";
|
||||
user = "chaos";
|
||||
};
|
||||
kitchen = {
|
||||
hostname = "kitchen.w17.io";
|
||||
user = "chaos";
|
||||
};
|
||||
"door.w17.io".identityFile = "~/.ssh/door_rsa";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
home = {
|
||||
packages = builtins.attrValues pkgs.home-pkgs ++ [
|
||||
(pkgs.writeShellScriptBin "unlock-ssh" ''
|
||||
SSH_ASKPASS="print-ssh-pw" DISPLAY="a" ssh-add < /dev/null
|
||||
'')
|
||||
(pkgs.writeShellScriptBin "print-radicle-pw"
|
||||
"pass show etc/radicle/${config.m-0.hostName}")
|
||||
(pkgs.writeShellScriptBin "print-ssh-pw"
|
||||
"pass show eu/m-0/${config.m-0.hostName}.m-0.eu/ssh-key")
|
||||
(
|
||||
pkgs.writeShellScriptBin "unlock-ssh" ''
|
||||
SSH_ASKPASS="print-ssh-pw" DISPLAY="a" ssh-add < /dev/null
|
||||
''
|
||||
)
|
||||
(
|
||||
pkgs.writeShellScriptBin "print-radicle-pw"
|
||||
"pass show etc/radicle/${config.m-0.hostName}"
|
||||
)
|
||||
(
|
||||
pkgs.writeShellScriptBin "print-ssh-pw"
|
||||
"pass show eu/m-0/${config.m-0.hostName}.m-0.eu/ssh-key"
|
||||
)
|
||||
];
|
||||
sessionVariables = {
|
||||
PATH = "$HOME/.nix-profile/bin:$PATH";
|
||||
BROWSER = "${pkgs.firefox}/bin/firefox";
|
||||
EMAIL = "malte.brandy@maralorn.de";
|
||||
SUDO_ASKPASS = toString (pkgs.writeShellScript "print-sudo-pw"
|
||||
"pass show eu/m-0/${config.m-0.hostName}.m-0.eu/${config.home.username}");
|
||||
SUDO_ASKPASS = toString (
|
||||
pkgs.writeShellScript "print-sudo-pw"
|
||||
"pass show eu/m-0/${config.m-0.hostName}.m-0.eu/${config.home.username}"
|
||||
);
|
||||
};
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue