gwg313/nix-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: gwg313:3bd99264b9ae19a394d8ca6ae5cf1ef608c48e7d
Branches Tags
gwg313:main
..
compare: gwg313:b5592c1e0528137c6778b028eb0842cc63a7af95
Branches Tags
gwg313:main

No commits in common. "3bd99264b9ae19a394d8ca6ae5cf1ef608c48e7d" and "b5592c1e0528137c6778b028eb0842cc63a7af95" have entirely different histories.
3bd99264b9 ... b5592c1e05

4 changed files with 1 additions and 229 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/aspects/roles.nix
View file

@ -56,7 +56,6 @@
"earlyoom" "earlyoom"
"dolphin" "dolphin"
"pass" "pass"
"zk"
]; ];
laptop.features = [ laptop.features = [
@ -76,7 +75,6 @@
]; ];
developer.features = [ developer.features = [
"jujutsu"
"developer-cli" "developer-cli"
"editor-neovim" "editor-neovim"
"containers-podman" "containers-podman"

2
modules/features/desktop/pass.nix
View file

@ -8,7 +8,7 @@
enable = true; enable = true;
package = pkgs.pass.withExtensions (exts: [ exts.pass-otp ]); package = pkgs.pass.withExtensions (exts: [ exts.pass-otp ]);
settings = { settings = {
PASSWORD_STORE_DIR = "$HOME/.local/share/password-store"; PASSWORD_STORE_DIR = "$XDG_DATA_HOME/password-store";
}; };
}; };

107
modules/features/desktop/zk.nix
View file

@ -1,107 +0,0 @@
{ ... }:
{
config.dendritic.features.zk.homeModules = [
(
{ ... }:
{
home.sessionVariables = {
ZK_NOTEBOOK_DIR = "/home/gwg313/my-notes";
};
programs.zk = {
enable = true;
settings = {
notebook = {
dir = "~/my-notes";
};
note = {
language = "en";
default-title = "Untitled";
filename = "{{id}}-{{slug title}}";
extension = "md";
template = "inbox.md";
id-charset = "alphanum";
id-length = 4;
id-case = "lower";
};
format.markdown = {
multiword-tags = true;
hashtags = true;
};
tool = {
editor = "nvim";
fzf-preview = "bat -p --color always {-1}";
};
extra = {
author = "gwg313";
};
group = {
inbox = {
paths = [ "inbox" ];
note.template = "inbox.md";
};
projects = {
paths = [ "projects" ];
note.template = "project.md";
};
literature = {
paths = [ "literature" ];
note.template = "literature.md";
};
note = {
paths = [ "notes" ];
note.template = "permanent.md";
};
seed = {
paths = [ "notes" ];
note.template = "seed.md";
};
daily = {
paths = [ "journal" ];
note.filename = "{{format-date now}}";
note.template = "daily.md";
};
};
filter = {
# Notes created in last 2 weeks
recents = "--sort created- --created-after 'last two weeks'";
# Only permanent notes
permanent = "--group notes";
# Orphans (useful for cleaning up disconnected notes)
orphans = "--orphan";
seeds = "--tag seed --sort created-";
};
alias = {
ls = "zk list --interactive $@";
edit = "zk edit --interactive $@";
inbox = ''zk new --no-input "$ZK_NOTEBOOK_DIR/inbox" --group inbox --title "$@"'';
seed = ''zk new --no-input "$ZK_NOTEBOOK_DIR/inbox" --group seed --title "$@"'';
proj = ''zk new --no-input "$ZK_NOTEBOOK_DIR/projects/" --group projects --title "$@"'';
lit = ''zk new --no-input "$ZK_NOTEBOOK_DIR/literature" --group literature --title "$@"'';
note = ''zk new --no-input "$ZK_NOTEBOOK_DIR/notes" --group notes --title "$@"'';
# Edit the last modified note.
edlast = "zk edit --limit 1 --sort modified- $@";
seeds = "zk list seeds --interactive";
# Edit the notes selected interactively among the notes created the last two weeks.
recent = "zk edit --sort created- --created-after 'last two weeks' --interactive";
# Show a random note.
lucky = "zk list --quiet --format full --sort random --limit 1";
# Show backlinks to a given note
bl = "zk list --link-to $@";
# Orphans
orph = "zk list orphans --interactive";
};
};
};
}
)
];
}

119
modules/features/programs/cli/vc-jujutsu.nix
View file

@ -1,119 +0,0 @@
{ ... }:
{
config.dendritic.features.jujutsu = {
homeModules = [
(
{ pkgs, ... }:
{
programs.jujutsu = {
enable = true;
settings = {
user = {
email = "gwg313@pm.me";
name = "gwg313";
};
signing = {
behavior = "own";
backend = "gpg";
};
aliases = {
c = [ "commit" ];
ci = [
"commit"
"--interactive"
];
e = [ "edit" ];
i = [
"git"
"init"
"--colocate"
];
tug = [
"bookmark"
"move"
"--from"
"closest_bookmark(@-)"
"--to"
"@-"
];
log-recent = [
"log"
"-r"
"default() & recent()"
];
nb = [
"bookmark"
"create"
"-r"
"@-"
]; # new bookmark
upmain = [
"bookmark"
"set"
"main"
];
squash-desc = [
"squash"
"::@"
"-d"
"@"
];
rebase-main = [
"rebase"
"-d"
"main"
];
amend = [
"describe"
"-m"
];
pushall = [
"git"
"push"
"--all"
];
push = [
"git"
"push"
"--allow-new"
];
pull = [
"git"
"fetch"
];
dmain = [
"diff"
"-r"
"main"
];
l = [
"log"
"-T"
"builtin_log_compact"
];
lf = [
"log"
"-r"
"all()"
];
r = [ "rebase" ];
s = [ "squash" ];
si = [
"squash"
"--interactive"
];
};
};
};
home.packages = with pkgs; [
lazyjj
meld
];
}
)
];
};
}