schrottkatze/nix-configs
1
2
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: schrottkatze:a73e54b6ac3b714b97a5710959d8c1bf7f65d273
Branches Tags
schrottkatze:main
schrottkatze:push-ryvwvsovxzpu
schrottkatze:push-pqvqptxrrmyk
..
compare: schrottkatze:ad591635e0103eee9c2437e136050ea7c520f394
Branches Tags
schrottkatze:main
schrottkatze:push-ryvwvsovxzpu
schrottkatze:push-pqvqptxrrmyk

No commits in common. "a73e54b6ac3b714b97a5710959d8c1bf7f65d273" and "ad591635e0103eee9c2437e136050ea7c520f394" have entirely different histories.
a73e54b6ac ... ad591635e0

3 changed files with 53 additions and 63 deletions
Show stats Expand all files Collapse all files

16
common.nix
View file

@ -29,11 +29,6 @@ with builtins; {
environment = {
systemPackages = with pkgs; [
pynitrokey
nitrokey-app2
veracrypt
htmlq
wget
@ -109,19 +104,14 @@ with builtins; {
"ebdbb2"
];
# nitrokey
services.udev.packages = [pkgs.nitrokey-udev-rules];
services.pcscd.enable = true;
programs = {
ssh.startAgent = false;
dconf.enable = true;
mtr.enable = true;
gnupg.agent = {
enable = true;
enableSSHSupport = true;
};
dconf.enable = true;
mtr.enable = true;
};
time.timeZone = "Europe/Berlin";

1
hosts/potatobook-g/configuration.nix
View file

@ -53,6 +53,7 @@
evremap.enable = true;
};
terminal.enable = true;
git.signingKey = "08F0 E7C9 6941 84C2 D514 7F31 5621 290C A02C 7BD8";
};
fileSystems = {

99
modules/git.nix
View file

@ -1,67 +1,66 @@
{
config,
lib,
pkgs,
...
}: {
home-manager.users.jade = {pkgs, ...}: {
programs.git = {
enable = true;
userName = "Schrottkatze";
userEmail = "git@schrottkatze.de";
aliases = {
a = "add";
c = "commit";
ca = "commit --all";
p = "push";
pl = "pull";
s = "status";
};
signing = {
key = "${pkgs.writeText "red_nk3.pub" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOaE8TFsIazpn4OnHvHcRpOFr9FfvMaWOiEjmHsmnAoE cardno:000F_70CD7D05"}";
signByDefault = true;
};
extraConfig = {
gpg = {
format = "ssh";
}: let
cfg = config.jade.git;
in {
options.jade.git.signingKey = lib.mkOption {type = lib.types.str;};
config = {
home-manager.users.jade = {pkgs, ...}: {
programs.git = {
enable = true;
userName = "Schrottkatze";
userEmail = "git@schrottkatze.de";
aliases = {
a = "add";
c = "commit";
ca = "commit --all";
p = "push";
pl = "pull";
s = "status";
};
signing = {
key = cfg.signingKey;
signByDefault = true;
};
};
};
programs.gitui = {
enable = true;
keyConfig = ''
(
open_help: Some(( code: F(1), modifiers: ( bits: 0,),)),
programs.gitui = {
enable = true;
keyConfig = ''
(
open_help: Some(( code: F(1), modifiers: ( bits: 0,),)),
move_left: Some(( code: Char('h'), modifiers: ( bits: 0,),)),
move_right: Some(( code: Char('l'), modifiers: ( bits: 0,),)),
move_up: Some(( code: Char('k'), modifiers: ( bits: 0,),)),
move_down: Some(( code: Char('j'), modifiers: ( bits: 0,),)),
move_left: Some(( code: Char('h'), modifiers: ( bits: 0,),)),
move_right: Some(( code: Char('l'), modifiers: ( bits: 0,),)),
move_up: Some(( code: Char('k'), modifiers: ( bits: 0,),)),
move_down: Some(( code: Char('j'), modifiers: ( bits: 0,),)),
popup_up: Some(( code: Char('p'), modifiers: ( bits: 2,),)),
popup_down: Some(( code: Char('n'), modifiers: ( bits: 2,),)),
page_up: Some(( code: Char('b'), modifiers: ( bits: 2,),)),
page_down: Some(( code: Char('f'), modifiers: ( bits: 2,),)),
home: Some(( code: Char('g'), modifiers: ( bits: 0,),)),
end: Some(( code: Char('G'), modifiers: ( bits: 1,),)),
shift_up: Some(( code: Char('K'), modifiers: ( bits: 1,),)),
shift_down: Some(( code: Char('J'), modifiers: ( bits: 1,),)),
popup_up: Some(( code: Char('p'), modifiers: ( bits: 2,),)),
popup_down: Some(( code: Char('n'), modifiers: ( bits: 2,),)),
page_up: Some(( code: Char('b'), modifiers: ( bits: 2,),)),
page_down: Some(( code: Char('f'), modifiers: ( bits: 2,),)),
home: Some(( code: Char('g'), modifiers: ( bits: 0,),)),
end: Some(( code: Char('G'), modifiers: ( bits: 1,),)),
shift_up: Some(( code: Char('K'), modifiers: ( bits: 1,),)),
shift_down: Some(( code: Char('J'), modifiers: ( bits: 1,),)),
edit_file: Some(( code: Char('I'), modifiers: ( bits: 1,),)),
edit_file: Some(( code: Char('I'), modifiers: ( bits: 1,),)),
status_reset_item: Some(( code: Char('U'), modifiers: ( bits: 1,),)),
status_reset_item: Some(( code: Char('U'), modifiers: ( bits: 1,),)),
diff_reset_lines: Some(( code: Char('u'), modifiers: ( bits: 0,),)),
diff_stage_lines: Some(( code: Char('s'), modifiers: ( bits: 0,),)),
diff_reset_lines: Some(( code: Char('u'), modifiers: ( bits: 0,),)),
diff_stage_lines: Some(( code: Char('s'), modifiers: ( bits: 0,),)),
stashing_save: Some(( code: Char('w'), modifiers: ( bits: 0,),)),
stashing_toggle_index: Some(( code: Char('m'), modifiers: ( bits: 0,),)),
stashing_save: Some(( code: Char('w'), modifiers: ( bits: 0,),)),
stashing_toggle_index: Some(( code: Char('m'), modifiers: ( bits: 0,),)),
stash_open: Some(( code: Char('l'), modifiers: ( bits: 0,),)),
stash_open: Some(( code: Char('l'), modifiers: ( bits: 0,),)),
abort_merge: Some(( code: Char('M'), modifiers: ( bits: 1,),)),
)
'';
abort_merge: Some(( code: Char('M'), modifiers: ( bits: 1,),)),
)
'';
};
};
};
}