mirror of
https://github.com/kittywitch/nixfiles.git
synced 2026-02-09 04:19:19 -08:00
feat: meep
This commit is contained in:
parent
dc9e30075d
commit
e9031cbdd3
13 changed files with 166 additions and 129 deletions
|
|
@ -7,28 +7,34 @@
|
|||
gitAndTools.git-remote-gcrypt
|
||||
git-crypt
|
||||
git-revise
|
||||
radicle-tui
|
||||
];
|
||||
|
||||
programs.git = {
|
||||
inherit (tree.home.user.data) userName userEmail;
|
||||
package = pkgs.gitAndTools.gitFull;
|
||||
enable = true;
|
||||
delta = {
|
||||
programs = {
|
||||
jujutsu = {
|
||||
enable = true;
|
||||
};
|
||||
extraConfig = {
|
||||
init = {defaultBranch = "main";};
|
||||
protocol.gcrypt.allow = "always";
|
||||
merge.conflictstyle = "diff3";
|
||||
annex = {
|
||||
autocommit = false;
|
||||
backend = "BLAKE2B512";
|
||||
synccontent = true;
|
||||
git = {
|
||||
inherit (tree.home.user.data) userName userEmail;
|
||||
package = pkgs.gitAndTools.gitFull;
|
||||
enable = true;
|
||||
delta = {
|
||||
enable = true;
|
||||
};
|
||||
extraConfig = {
|
||||
init = {defaultBranch = "main";};
|
||||
protocol.gcrypt.allow = "always";
|
||||
merge.conflictstyle = "diff3";
|
||||
annex = {
|
||||
autocommit = false;
|
||||
backend = "BLAKE2B512";
|
||||
synccontent = true;
|
||||
};
|
||||
};
|
||||
signing = {
|
||||
inherit (tree.home.user.data) key;
|
||||
signByDefault = true;
|
||||
};
|
||||
};
|
||||
signing = {
|
||||
inherit (tree.home.user.data) key;
|
||||
signByDefault = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@
|
|||
pkgs,
|
||||
...
|
||||
}: let
|
||||
inherit (lib.attrsets) nameValuePair listToAttrs;
|
||||
inherit (lib.modules) mkMerge mkIf;
|
||||
inherit (std) string list;
|
||||
in {
|
||||
|
|
@ -89,29 +88,20 @@ in {
|
|||
else ""
|
||||
}
|
||||
'';
|
||||
shellAliases = let
|
||||
packages = [
|
||||
"sidequest"
|
||||
"ungoogled-chromium"
|
||||
];
|
||||
makeAliasForBin = package: nameValuePair package "nix run kat#${package}";
|
||||
packages' = builtins.listToAttrs (map makeAliasForBin packages);
|
||||
in
|
||||
mkMerge [
|
||||
packages'
|
||||
{
|
||||
nixdirfmt = "nixpkgs-fmt $(fd -e nix)";
|
||||
dmesg = "dmesg -HP";
|
||||
hg = "history 0 | rg";
|
||||
}
|
||||
(mkIf pkgs.hostPlatform.isLinux {
|
||||
sys = "systemctl";
|
||||
sysu = "systemctl --user";
|
||||
logu = "journalctl --user";
|
||||
log = "journalctl";
|
||||
lg = "log --no-pager | rg";
|
||||
})
|
||||
];
|
||||
shellAliases = mkMerge [
|
||||
{
|
||||
nixdirfmt = "nixpkgs-fmt $(fd -e nix)";
|
||||
dmesg = "dmesg -HP";
|
||||
hg = "history 0 | rg";
|
||||
}
|
||||
(mkIf pkgs.hostPlatform.isLinux {
|
||||
sys = "systemctl";
|
||||
sysu = "systemctl --user";
|
||||
logu = "journalctl --user";
|
||||
log = "journalctl";
|
||||
lg = "log --no-pager | rg";
|
||||
})
|
||||
];
|
||||
localVariables = {
|
||||
ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE = "fg=3,bold";
|
||||
ZSH_AUTOSUGGEST_USE_ASYNC = 1;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue