style: reformat with alejandra

This commit is contained in:
Kat Inskip 2023-01-17 15:51:05 -05:00
parent bcd5fd495a
commit e04f4bbafd
Signed by: kat
GPG key ID: 465E64DECEA8CF0F
8 changed files with 101 additions and 80 deletions

View file

@ -1,4 +1,8 @@
{config,lib,...}: let {
config,
lib,
...
}: let
inherit (lib.modules) mkForce mkMerge; inherit (lib.modules) mkForce mkMerge;
in { in {
services.gpg-agent = { services.gpg-agent = {

View file

@ -1,7 +1,12 @@
{tree,lib,...}: let {
tree,
lib,
...
}: let
inherit (lib.attrsets) mapAttrs; inherit (lib.attrsets) mapAttrs;
wrapImports = imports: mapAttrs wrapImports = imports:
(_: paths: { config, ... }: { mapAttrs
(_: paths: {config, ...}: {
config.home-manager.users.kat = { config.home-manager.users.kat = {
imports = lib.singleton paths; imports = lib.singleton paths;
}; };
@ -9,19 +14,19 @@
imports; imports;
dirImports = wrapImports tree.prev; dirImports = wrapImports tree.prev;
in in
tree.prev tree.prev
// { // {
common = { common = {
imports = with tree.prev; [ imports = with tree.prev; [
base16 base16
shell shell
neovim neovim
]; ];
}; };
work = { work = {
imports = with dirImports; [ imports = with dirImports; [
wezterm wezterm
gpg gpg
]; ];
}; };
} }

View file

@ -1,4 +1,8 @@
{pkgs,tree,...}: { {
pkgs,
tree,
...
}: {
programs.rbw = { programs.rbw = {
enable = true; enable = true;
package = pkgs.rbw-bitw; package = pkgs.rbw-bitw;

View file

@ -1,4 +1,8 @@
{pkgs,tree,...}: let {
pkgs,
tree,
...
}: let
kat = import tree.kat.user.data; kat = import tree.kat.user.data;
in { in {
home.packages = with pkgs; [ home.packages = with pkgs; [

View file

@ -1,11 +1,11 @@
{ {
config, config,
lib, lib,
pkgs, pkgs,
... ...
}: { }: {
home.packages = with pkgs; [ home.packages = with pkgs; [
# programs.zsh.enableAutosuggestions only includes nix-zsh-autocompletions # programs.zsh.enableAutosuggestions only includes nix-zsh-autocompletions
zsh-completions zsh-completions
]; ];
@ -20,7 +20,7 @@
enableAutosuggestions = true; enableAutosuggestions = true;
initExtra = let initExtra = let
zshOpts = [ zshOpts = [
"auto_pushd" "auto_pushd"
"pushd_ignore_dups" "pushd_ignore_dups"
"pushdminus" "pushdminus"
"rmstarsilent" "rmstarsilent"
@ -40,71 +40,71 @@
"nolistbeep" "nolistbeep"
"autolist" "autolist"
"listrowsfirst" "listrowsfirst"
]; ];
in '' in ''
${ ${
if pkgs.hostPlatform.isLinux if pkgs.hostPlatform.isLinux
then '' then ''
eval $(dircolors -b | sd "\*#=00;90" "*\#=00;90") eval $(dircolors -b | sd "\*#=00;90" "*\#=00;90")
'' ''
else '' else ''
'' ''
} }
PROMPT_EOL_MARK=''' PROMPT_EOL_MARK='''
ZSH_TAB_TITLE_ADDITIONAL_TERMS='wezterm' ZSH_TAB_TITLE_ADDITIONAL_TERMS='wezterm'
ZSH_TAB_TITLE_ENABLE_FULL_COMMAND=true ZSH_TAB_TITLE_ENABLE_FULL_COMMAND=true
zmodload -i zsh/complist zmodload -i zsh/complist
h=() h=()
if [[ -r ~/.ssh/config ]]; then if [[ -r ~/.ssh/config ]]; then
h=($h ''${''${''${(@M)''${(f)"$(cat ~/.ssh/config)"}:#Host *}#Host }:#*[*?]*}) h=($h ''${''${''${(@M)''${(f)"$(cat ~/.ssh/config)"}:#Host *}#Host }:#*[*?]*})
fi fi
if [[ $#h -gt 0 ]]; then if [[ $#h -gt 0 ]]; then
zstyle ':completion:*:ssh:*' hosts $h zstyle ':completion:*:ssh:*' hosts $h
zstyle ':completion:*:slogin:*' hosts $h zstyle ':completion:*:slogin:*' hosts $h
fi fi
unset h unset h
u=(root ${config.home.username}) u=(root ${config.home.username})
zstyle ':completion:*:ssh:*' users $u zstyle ':completion:*:ssh:*' users $u
unset u unset u
zstyle ':completion:*:*:*:*:*' menu select zstyle ':completion:*:*:*:*:*' menu select
zstyle ':completion:*:cd:*' tag-order local-directories directory-stack path-directories zstyle ':completion:*:cd:*' tag-order local-directories directory-stack path-directories
zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#) ([0-9a-z-]#)*=01;34=0=01' zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#) ([0-9a-z-]#)*=01;34=0=01'
zstyle ':completion:*:*:*:*:processes' command "ps -u $USER -o pid,user,comm -w -w" zstyle ':completion:*:*:*:*:processes' command "ps -u $USER -o pid,user,comm -w -w"
zstyle ':completion:*:complete:pass:*:*' matcher 'r:|[./_-]=** r:|=*' 'l:|=* r:|=*' zstyle ':completion:*:complete:pass:*:*' matcher 'r:|[./_-]=** r:|=*' 'l:|=* r:|=*'
zstyle ':completion:*' list-colors ''${(s.:.)LS_COLORS} zstyle ':completion:*' list-colors ''${(s.:.)LS_COLORS}
zstyle ':fzf-tab:complete:cd:*' fzf-preview 'exa -1lb --color=always $realpath' zstyle ':fzf-tab:complete:cd:*' fzf-preview 'exa -1lb --color=always $realpath'
${lib.concatStringsSep "\n" (map (opt: "setopt ${opt}") zshOpts)} ${lib.concatStringsSep "\n" (map (opt: "setopt ${opt}") zshOpts)}
bindkey '^ ' autosuggest-accept bindkey '^ ' autosuggest-accept
${ ${
if pkgs.hostPlatform.isDarwin if pkgs.hostPlatform.isDarwin
then '' then ''
export PATH="''${KREW_ROOT:-$HOME/.krew}/bin:$PATH" export PATH="''${KREW_ROOT:-$HOME/.krew}/bin:$PATH"
'' ''
else "" else ""
} }
''; '';
shellAliases = lib.mkMerge [ shellAliases = lib.mkMerge [
{ {
nixdirfmt = "nixpkgs-fmt $(fd -e nix)"; nixdirfmt = "nixpkgs-fmt $(fd -e nix)";
dmesg = "dmesg -HP"; dmesg = "dmesg -HP";
hg = "history 0 | rg"; hg = "history 0 | rg";
} }
(lib.mkIf pkgs.hostPlatform.isLinux { (lib.mkIf pkgs.hostPlatform.isLinux {
sys = "systemctl"; sys = "systemctl";
sysu = "systemctl --user"; sysu = "systemctl --user";
logu = "journalctl --user"; logu = "journalctl --user";
log = "journalctl"; log = "journalctl";
lg = "log --no-pager | rg"; lg = "log --no-pager | rg";
}) })
]; ];
localVariables = { localVariables = {
ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE = "fg=3,bold"; ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE = "fg=3,bold";
ZSH_AUTOSUGGEST_USE_ASYNC = 1; ZSH_AUTOSUGGEST_USE_ASYNC = 1;
}; };
plugins = with pkgs.zsh-plugins; (map (plugin: plugin.zshPlugin) [ plugins = with pkgs.zsh-plugins; (map (plugin: plugin.zshPlugin) [
tab-title tab-title
vim-mode vim-mode
evil-registers evil-registers
]); ]);
}; };

View file

@ -1,4 +1,8 @@
{pkgs,tree,...}: { {
pkgs,
tree,
...
}: {
users.users.kat = { users.users.kat = {
inherit (import tree.kat.user.data) description; inherit (import tree.kat.user.data) description;
shell = pkgs.zsh; shell = pkgs.zsh;

View file

@ -1,7 +1,7 @@
rec { rec {
description = "Kat Inskip"; description = "Kat Inskip";
email = "kat@inskip.me"; email = "kat@inskip.me";
keys = [ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDPsu3vNsvBb/G+wALpstD/DnoRZ3fipAs00jtl8rzDuv96RlS7AJr4aNvG6Pt2D9SYn2wVLaiw+76mz2gOycH9/N+VCvL4/0MN9uqj+7XIcxNRo0gHVOblmi2bOXcmGKh3eRwHj1xyDwRxo9WIuBEP2bPpDPz75OXRtEdlTgvky7siSguQxJu03cb0p9hNAYhUoohNXyWW2CjDCLUQVE1+QRVUzsKq3KkPy0cHYgmZC1gRSMQyKpMt72L5tayLz3Tp/zrshucc+QO5IJeZdqMxsNAcvALsysT1J5EqxZoYH9VpWLRhSgVD6Nvn853pycJAlXQxgOCpSD3/v/JbgUe5NE+ci0o7NMy5IiHUv2gQMRIEhwBHlRGwokUPL9upx0lsjaEiPya5xQqqDKRom87xytM778ANS5CuMdQMWg9qVbpHZUHMjA0QmNkjPgq71pUDXHk5L4mZuS8wVjyjnvlw68yIJuHEc8P7QiLcjvRHFS2L9Ck8NRmPDTQXlQi9kk6LmMyu6fdevR/kZL21b+xO1e2DMyxBbNDTot8luppiiL8adgUDMwptpIne7JCWB1o9NFCbXUVgwuCCYBif6pOGSc6bGo1JTAKMflRlcy6Mi3t5H0mR2lj/sCSTWwTlP5FM4aPIq08NvW6PeuK1bFJY9fIgTwVsUnbAKOhmsMt62w== pgp-${email}" ]; keys = ["ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDPsu3vNsvBb/G+wALpstD/DnoRZ3fipAs00jtl8rzDuv96RlS7AJr4aNvG6Pt2D9SYn2wVLaiw+76mz2gOycH9/N+VCvL4/0MN9uqj+7XIcxNRo0gHVOblmi2bOXcmGKh3eRwHj1xyDwRxo9WIuBEP2bPpDPz75OXRtEdlTgvky7siSguQxJu03cb0p9hNAYhUoohNXyWW2CjDCLUQVE1+QRVUzsKq3KkPy0cHYgmZC1gRSMQyKpMt72L5tayLz3Tp/zrshucc+QO5IJeZdqMxsNAcvALsysT1J5EqxZoYH9VpWLRhSgVD6Nvn853pycJAlXQxgOCpSD3/v/JbgUe5NE+ci0o7NMy5IiHUv2gQMRIEhwBHlRGwokUPL9upx0lsjaEiPya5xQqqDKRom87xytM778ANS5CuMdQMWg9qVbpHZUHMjA0QmNkjPgq71pUDXHk5L4mZuS8wVjyjnvlw68yIJuHEc8P7QiLcjvRHFS2L9Ck8NRmPDTQXlQi9kk6LmMyu6fdevR/kZL21b+xO1e2DMyxBbNDTot8luppiiL8adgUDMwptpIne7JCWB1o9NFCbXUVgwuCCYBif6pOGSc6bGo1JTAKMflRlcy6Mi3t5H0mR2lj/sCSTWwTlP5FM4aPIq08NvW6PeuK1bFJY9fIgTwVsUnbAKOhmsMt62w== pgp-${email}"];
keyid = "9CC644B569CDA59BC874C4C9E8DDE3ED1C90F3A0"; keyid = "9CC644B569CDA59BC874C4C9E8DDE3ED1C90F3A0";
keygrip = "59921D2F4E6DF7EEC3CB2934BD3D53666007B1AB"; keygrip = "59921D2F4E6DF7EEC3CB2934BD3D53666007B1AB";
userName = description; userName = description;

View file

@ -1,4 +1,4 @@
{tree,...}: { {tree, ...}: {
users.users.kat = { users.users.kat = {
uid = 1000; uid = 1000;
isNormalUser = true; isNormalUser = true;