Compare commits

...

2 commits

Author SHA1 Message Date
Harald Hoyer 8ab6f726bd chore(sgx-nixos): cleanup
Signed-off-by: Harald Hoyer <harald@hoyer.xyz>
2024-01-12 14:23:32 +01:00
Harald Hoyer aaa0a5016f feat: add git-delete-merged-branches
Signed-off-by: Harald Hoyer <harald@hoyer.xyz>
2024-01-12 14:22:59 +01:00
2 changed files with 7 additions and 20 deletions

View file

@ -18,6 +18,9 @@ in
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
home.packages = with pkgs; [
git-delete-merged-branches
];
programs.git = { programs.git = {
enable = true; enable = true;
inherit (cfg) userName userEmail; inherit (cfg) userName userEmail;

View file

@ -63,12 +63,6 @@ with lib.plusultra;
LC_TIME = "de_DE.UTF-8"; LC_TIME = "de_DE.UTF-8";
}; };
# Configure keymap in X11
services.xserver = {
layout = "us";
xkbVariant = "";
};
users.users.root.openssh.authorizedKeys.keys = [ users.users.root.openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMNsmP15vH8BVKo7bdvIiiEjiQboPGcRPqJK0+bH4jKD harald@lenovo.fritz.box" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMNsmP15vH8BVKo7bdvIiiEjiQboPGcRPqJK0+bH4jKD harald@lenovo.fritz.box"
"sk-ecdsa-sha2-nistp256@openssh.com AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb20AAAAIbmlzdHAyNTYAAABBBACLgT81iB1iWWVuXq6PdQ5GAAGhaZhSKnveQCvcNnAOZ5WKH80bZShKHyAYzrzbp8IGwLWJcZQ7TqRK+qZdfagAAAAEc3NoOg== harald@hoyer.xyz" "sk-ecdsa-sha2-nistp256@openssh.com AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb20AAAAIbmlzdHAyNTYAAABBBACLgT81iB1iWWVuXq6PdQ5GAAGhaZhSKnveQCvcNnAOZ5WKH80bZShKHyAYzrzbp8IGwLWJcZQ7TqRK+qZdfagAAAAEc3NoOg== harald@hoyer.xyz"
@ -106,20 +100,10 @@ with lib.plusultra;
# $ nix search wget # $ nix search wget
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
age age
delta
gcc
git
git-delete-merged-branches
gnumake
htop
mdadm mdadm
mosh
nixpkgs-fmt
openssl openssl
rustup rustup
sops sops
strace
tmux
tpm2-pkcs11 tpm2-pkcs11
tpm2-pkcs11.out tpm2-pkcs11.out
tpm2-tools tpm2-tools
@ -132,10 +116,10 @@ with lib.plusultra;
# Some programs need SUID wrappers, can be configured further or are # Some programs need SUID wrappers, can be configured further or are
# started in user sessions. # started in user sessions.
# programs.mtr.enable = true; # programs.mtr.enable = true;
# programs.gnupg.agent = { programs.gnupg.agent = {
# enable = true; enable = true;
# enableSSHSupport = true; enableSSHSupport = true;
# }; };
# List services that you want to enable: # List services that you want to enable: