mirror of
https://github.com/CHN-beta/nixos.git
synced 2024-10-22 21:38:44 +08:00
Compare commits
5 Commits
5b30aebfae
...
f23f7101e4
Author | SHA1 | Date | |
---|---|---|---|
f23f7101e4 | |||
8eea6ffdc3 | |||
729df7ab63 | |||
c1737fcb08 | |||
50862f0e33 |
@ -4,13 +4,13 @@
|
||||
}:
|
||||
let
|
||||
pname = "misskey";
|
||||
version = "2023.12.0";
|
||||
version = "2023.12.2";
|
||||
src = fetchFromGitHub
|
||||
{
|
||||
owner = "CHN-beta";
|
||||
repo = "misskey";
|
||||
rev = "bec1dc37598b71c377643ee77330d4d6f7eb31f2";
|
||||
sha256 = "sha256-svLpG4xQ2mtsJ6gm+Ap8fZKTOl5V68XybGDvymsV4F4=";
|
||||
rev = "579e1b00c1dc053a598ac4fd777459067860cdea";
|
||||
hash = "sha256-jrUqfj8RaF8JeQ6qh8O071o4IWXNhKz6XiC92htJsbY=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
originalPnpmPackage = mkPnpmPackage
|
||||
|
@ -96,6 +96,7 @@ inputs:
|
||||
else []
|
||||
))
|
||||
(attrsToList servers)));
|
||||
programs.ssh = { enableAskPassword = true; askPassword = "${inputs.pkgs.systemd}/bin/systemd-ask-password"; };
|
||||
nixos.users.sharedModules =
|
||||
[(hmInputs: {
|
||||
config.programs.ssh =
|
||||
|
@ -49,8 +49,8 @@ inputs:
|
||||
{
|
||||
owner = "z-shell";
|
||||
repo = "zsh-lsd";
|
||||
rev = "029a9cb0a9b39c9eb6c5b5100dd9182813332250";
|
||||
sha256 = "sha256-oWjWnhiimlGBMaZlZB+OM47jd9hporKlPNwCx6524Rk=";
|
||||
rev = "65bb5ac49190beda263aae552a9369127961632d";
|
||||
hash = "sha256-JSNsfpgiqWhtmGQkC3B0R1Y1QnDKp9n0Zaqzjhwt7Xk=";
|
||||
};
|
||||
}
|
||||
];
|
||||
@ -72,7 +72,6 @@ inputs:
|
||||
{
|
||||
enable = true;
|
||||
plugins = [ "git" "colored-man-pages" "extract" "history-substring-search" "autojump" ];
|
||||
customPkgs = with inputs.pkgs; [ zsh-nix-shell ];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
@ -5,6 +5,7 @@ inputs:
|
||||
let
|
||||
inherit (inputs.lib) mkIf;
|
||||
inherit (inputs.config.nixos) users;
|
||||
inherit (builtins) listToAttrs;
|
||||
in mkIf (builtins.elem "chn" users.users)
|
||||
{
|
||||
users.users.chn =
|
||||
@ -42,7 +43,10 @@ inputs:
|
||||
# identityFile = "~/.ssh/xmuhk_id_rsa";
|
||||
xmuhk = { host = "xmuhk"; hostname = "10.26.14.56"; user = "xmuhk"; };
|
||||
xmuhk2 = { host = "xmuhk2"; hostname = "183.233.219.132"; user = "xmuhk"; port = 62022; };
|
||||
};
|
||||
}
|
||||
// (listToAttrs (map
|
||||
(system: { name = system; value.forwardAgent = true; })
|
||||
[ "vps6" "wireguard.vps6" "vps7" "wireguard.vps7" "wireguard.pc" "nas" "wireguard.nas" ]));
|
||||
};
|
||||
home.packages =
|
||||
[
|
||||
|
Loading…
Reference in New Issue
Block a user