minor experiment with signing
This commit is contained in:
parent
62d004a6a2
commit
4fdcdeb3e1
@ -1,7 +1,14 @@
|
||||
{ config, pkgs, lib, ... }:
|
||||
let name = "olaf";
|
||||
user = "olaf";
|
||||
email = "github@dacht.net"; in
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
let
|
||||
name = "olaf";
|
||||
user = "olaf";
|
||||
email = "olaf@xolx.nl";
|
||||
in
|
||||
{
|
||||
# Shared shell configuration
|
||||
zsh = {
|
||||
@ -10,14 +17,14 @@ let name = "olaf";
|
||||
cdpath = [ "~/.local/share/src" ];
|
||||
plugins = [
|
||||
{
|
||||
name = "powerlevel10k";
|
||||
src = pkgs.zsh-powerlevel10k;
|
||||
file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme";
|
||||
name = "powerlevel10k";
|
||||
src = pkgs.zsh-powerlevel10k;
|
||||
file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme";
|
||||
}
|
||||
{
|
||||
name = "powerlevel10k-config";
|
||||
src = lib.cleanSource ./config;
|
||||
file = "p10k.zsh";
|
||||
name = "powerlevel10k-config";
|
||||
src = lib.cleanSource ./config;
|
||||
file = "p10k.zsh";
|
||||
}
|
||||
];
|
||||
initExtraFirst = ''
|
||||
@ -74,7 +81,7 @@ let name = "olaf";
|
||||
extraConfig = {
|
||||
init.defaultBranch = "main";
|
||||
core = {
|
||||
editor = "vim";
|
||||
editor = "vim";
|
||||
autocrlf = "input";
|
||||
};
|
||||
commit.gpgsign = true;
|
||||
@ -85,8 +92,15 @@ let name = "olaf";
|
||||
|
||||
vim = {
|
||||
enable = true;
|
||||
plugins = with pkgs.vimPlugins; [ vim-airline vim-airline-themes vim-startify vim-tmux-navigator ];
|
||||
settings = { ignorecase = true; };
|
||||
plugins = with pkgs.vimPlugins; [
|
||||
vim-airline
|
||||
vim-airline-themes
|
||||
vim-startify
|
||||
vim-tmux-navigator
|
||||
];
|
||||
settings = {
|
||||
ignorecase = true;
|
||||
};
|
||||
extraConfig = ''
|
||||
"" General
|
||||
set number
|
||||
@ -190,8 +204,8 @@ let name = "olaf";
|
||||
|
||||
let g:airline_theme='bubblegum'
|
||||
let g:airline_powerline_fonts = 1
|
||||
'';
|
||||
};
|
||||
'';
|
||||
};
|
||||
|
||||
alacritty = {
|
||||
enable = true;
|
||||
@ -261,25 +275,18 @@ let name = "olaf";
|
||||
ssh = {
|
||||
enable = true;
|
||||
includes = [
|
||||
(lib.mkIf pkgs.stdenv.hostPlatform.isLinux
|
||||
"/home/${user}/.ssh/config_external"
|
||||
)
|
||||
(lib.mkIf pkgs.stdenv.hostPlatform.isDarwin
|
||||
"/Users/${user}/.ssh/config_external"
|
||||
)
|
||||
(lib.mkIf pkgs.stdenv.hostPlatform.isLinux "/home/${user}/.ssh/config_external")
|
||||
(lib.mkIf pkgs.stdenv.hostPlatform.isDarwin "/Users/${user}/.ssh/config_external")
|
||||
];
|
||||
matchBlocks = {
|
||||
"Host *" = {
|
||||
identityAgent="\"~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock\"";
|
||||
identityAgent = "\"~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock\"";
|
||||
};
|
||||
"github.com" = {
|
||||
identitiesOnly = true;
|
||||
identityFile = [
|
||||
(lib.mkIf pkgs.stdenv.hostPlatform.isLinux
|
||||
"/home/${user}/.ssh/id_github" )
|
||||
(lib.mkIf pkgs.stdenv.hostPlatform.isDarwin
|
||||
"/Users/${user}/.ssh/id_github"
|
||||
)
|
||||
(lib.mkIf pkgs.stdenv.hostPlatform.isLinux "/home/${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;
|
||||
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-l' select-pane -R
|
||||
bind-key -T copy-mode-vi 'C-\' select-pane -l
|
||||
'';
|
||||
};
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user