Compare commits

..

No commits in common. "1168fdb539aa6fe1ae18da8b0cd6d94885a39899" and "82b6a01e94c78c3af1e1dccadcf19112dab8c1d8" have entirely different histories.

6 changed files with 32 additions and 33 deletions

View file

@ -18,9 +18,9 @@
id-case = "lower"; id-case = "lower";
}; };
format.markdown = { format.markdown={
link-format = "wiki"; link-format="wiki";
hashtags = true; hashtags=true;
}; };
alias = { alias = {

View file

@ -124,10 +124,10 @@ in {
} }
{ {
Cyberchef = { Cyberchef = {
icon = "sh-cyberchef.svg"; icon="sh-cyberchef.svg";
href = "https://cyberchef.venberg.xyz"; href="https://cyberchef.venberg.xyz";
siteMonitor = "https://cyberchef.venberg.xyz"; siteMonitor= "https://cyberchef.venberg.xyz";
description = "a data toolbox"; description= "a data toolbox";
}; };
} }
]; ];

View file

@ -4,8 +4,8 @@
pkgs, pkgs,
lib, lib,
... ...
}: let }:let
port = "8080"; port="8080";
in { in {
systemd.services.miniserve = { systemd.services.miniserve = {
wantedBy = ["multi-user.target"]; wantedBy = ["multi-user.target"];

View file

@ -17,7 +17,7 @@ bootstrap-home-manager target=(`whoami`+"@"+`hostname`):
nix run --extra-experimental-features "nix-command flakes" --no-write-lock-file github:nix-community/home-manager/ -- --extra-experimental-features "nix-command flakes" --flake .#{{target}} switch nix run --extra-experimental-features "nix-command flakes" --no-write-lock-file github:nix-community/home-manager/ -- --extra-experimental-features "nix-command flakes" --flake .#{{target}} switch
format: format:
nix fmt ./ nix fmt
home-gc: home-gc:
home-manager expire-generations -7days home-manager expire-generations -7days

View file

@ -44,37 +44,36 @@
line-numbers = true; line-numbers = true;
}; };
}; };
# difftastic.enable=true;
# difftastic.background="dark";
userEmail = config.user.git.profile.email; userEmail = config.user.git.profile.email;
userName = config.user.git.profile.name; userName = config.user.git.profile.name;
extraConfig = { extraConfig = {
init.defaultBranch = "main"; init = {
defaultBranch = "main";
};
push = { push = {
autoSetupRemote = true; autoSetupRemote = true;
default = "simple"; default = "current";
followTags = true;
}; };
fetch = { pull = {
prune = true; ff = true;
pruneTags = true;
all = true;
}; };
pull.ff = true; merge = {
merge.conflictstyle = "zdiff3"; conflictstyle = "zdiff3";
diff = {
algorithm = "histogram";
colorMoved = "plain";
mnemonicPrefix = true;
renames = true;
}; };
rerere = { rebase = {
enabled = true; autosquash = true;
autoupdate = true; };
help = {
autocorrect = "prompt";
};
branch = {
sort = "-committerdate";
};
status = {
submodulesummary = true;
}; };
rebase.autosquash = true;
help.autocorrect = "prompt";
branch.sort = "-committerdate";
tag.sort = "version:refname";
status.submodulesummary = true;
}; };
includes = includes =
if config.user.git.workProfile.enable if config.user.git.workProfile.enable

View file

@ -8,7 +8,7 @@
description = "A flake containing a basic latex environment"; description = "A flake containing a basic latex environment";
}; };
typst = { typst = {
path = ./typst; path= ./typst;
description = "A flake containing a basic typst environment"; description = "A flake containing a basic typst environment";
}; };
} }