minor experiment with signing

This commit is contained in:
Olaf 2025-05-07 11:50:59 +02:00
parent 62d004a6a2
commit 4fdcdeb3e1

View File

@ -1,7 +1,14 @@
{ config, pkgs, lib, ... }: {
let name = "olaf"; config,
user = "olaf"; pkgs,
email = "github@dacht.net"; in lib,
...
}:
let
name = "olaf";
user = "olaf";
email = "olaf@xolx.nl";
in
{ {
# Shared shell configuration # Shared shell configuration
zsh = { zsh = {
@ -10,14 +17,14 @@ let name = "olaf";
cdpath = [ "~/.local/share/src" ]; cdpath = [ "~/.local/share/src" ];
plugins = [ plugins = [
{ {
name = "powerlevel10k"; name = "powerlevel10k";
src = pkgs.zsh-powerlevel10k; src = pkgs.zsh-powerlevel10k;
file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme"; file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme";
} }
{ {
name = "powerlevel10k-config"; name = "powerlevel10k-config";
src = lib.cleanSource ./config; src = lib.cleanSource ./config;
file = "p10k.zsh"; file = "p10k.zsh";
} }
]; ];
initExtraFirst = '' initExtraFirst = ''
@ -74,7 +81,7 @@ let name = "olaf";
extraConfig = { extraConfig = {
init.defaultBranch = "main"; init.defaultBranch = "main";
core = { core = {
editor = "vim"; editor = "vim";
autocrlf = "input"; autocrlf = "input";
}; };
commit.gpgsign = true; commit.gpgsign = true;
@ -85,8 +92,15 @@ let name = "olaf";
vim = { vim = {
enable = true; enable = true;
plugins = with pkgs.vimPlugins; [ vim-airline vim-airline-themes vim-startify vim-tmux-navigator ]; plugins = with pkgs.vimPlugins; [
settings = { ignorecase = true; }; vim-airline
vim-airline-themes
vim-startify
vim-tmux-navigator
];
settings = {
ignorecase = true;
};
extraConfig = '' extraConfig = ''
"" General "" General
set number set number
@ -190,8 +204,8 @@ let name = "olaf";
let g:airline_theme='bubblegum' let g:airline_theme='bubblegum'
let g:airline_powerline_fonts = 1 let g:airline_powerline_fonts = 1
''; '';
}; };
alacritty = { alacritty = {
enable = true; enable = true;
@ -261,25 +275,18 @@ let name = "olaf";
ssh = { ssh = {
enable = true; enable = true;
includes = [ includes = [
(lib.mkIf pkgs.stdenv.hostPlatform.isLinux (lib.mkIf pkgs.stdenv.hostPlatform.isLinux "/home/${user}/.ssh/config_external")
"/home/${user}/.ssh/config_external" (lib.mkIf pkgs.stdenv.hostPlatform.isDarwin "/Users/${user}/.ssh/config_external")
)
(lib.mkIf pkgs.stdenv.hostPlatform.isDarwin
"/Users/${user}/.ssh/config_external"
)
]; ];
matchBlocks = { matchBlocks = {
"Host *" = { "Host *" = {
identityAgent="\"~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock\""; identityAgent = "\"~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock\"";
}; };
"github.com" = { "github.com" = {
identitiesOnly = true; identitiesOnly = true;
identityFile = [ identityFile = [
(lib.mkIf pkgs.stdenv.hostPlatform.isLinux (lib.mkIf pkgs.stdenv.hostPlatform.isLinux "/home/${user}/.ssh/id_github")
"/home/${user}/.ssh/id_github" ) (lib.mkIf pkgs.stdenv.hostPlatform.isDarwin "/Users/${user}/.ssh/id_github")
(lib.mkIf pkgs.stdenv.hostPlatform.isDarwin
"/Users/${user}/.ssh/id_github"
)
]; ];
}; };
}; };
@ -295,7 +302,7 @@ let name = "olaf";
{ {
plugin = power-theme; plugin = power-theme;
extraConfig = '' extraConfig = ''
set -g @tmux_power_theme 'gold' set -g @tmux_power_theme 'gold'
''; '';
} }
{ {
@ -366,6 +373,6 @@ let name = "olaf";
bind-key -T copy-mode-vi 'C-k' select-pane -U bind-key -T copy-mode-vi 'C-k' select-pane -U
bind-key -T copy-mode-vi 'C-l' select-pane -R bind-key -T copy-mode-vi 'C-l' select-pane -R
bind-key -T copy-mode-vi 'C-\' select-pane -l bind-key -T copy-mode-vi 'C-\' select-pane -l
''; '';
}; };
} }