harald/nixcfg
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Compare commits

base: harald:8ab6f726bdfe3bd53a004882fb99d473abb7cb0b
Branches Tags
harald:main
harald:b24.05
..
compare: harald:bd89ecd70fc099eac01df1c46e0456ba54d44b8e
Branches Tags
harald:main
harald:b24.05

No commits in common. "8ab6f726bdfe3bd53a004882fb99d473abb7cb0b" and "bd89ecd70fc099eac01df1c46e0456ba54d44b8e" have entirely different histories.
8ab6f726bd ... bd89ecd70f

2 changed files with 20 additions and 7 deletions
Show stats Expand all files Collapse all files

3
modules/home/tools/git/default.nix
View file

@ -18,9 +18,6 @@ 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;

24
systems/x86_64-linux/sgx-nixos/default.nix
View file

@ -63,6 +63,12 @@ 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"
@ -100,10 +106,20 @@ 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
@ -116,10 +132,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: