Merge branch 'nixos' into nixos-work

This commit is contained in:
Moritz Böhme 2024-11-19 09:37:54 +01:00
commit 2fd299eaf8
10 changed files with 181 additions and 78 deletions

View file

@ -187,7 +187,6 @@ in
rs = "sudo systemctl";
uj = "journalctl --user";
rj = "sudo journalctl";
lg = "lazygit";
};
aliases = {
ls = "${getExe pkgs.eza} -lh --icons --git";
@ -198,6 +197,7 @@ in
variables = { EDITOR = "vim"; };
};
programs = {
lazygit.enable = true;
direnv.enable = true;
fish.enable = true;
git.enable = true;
@ -265,6 +265,10 @@ in
programs = {
mtr.enable = true;
command-not-found.enable = false;
nh = {
enable = true;
flake = "/home/moritz/Documents/dotfiles/";
};
};
services = {
@ -299,65 +303,6 @@ in
];
};
starship.enable = true;
lazygit.enable = true;
lazygit.settings = {
customCommands = [
{
key = "<c-v>";
context = "global";
description = "Create new conventional commit";
prompts = [
{
type = "menu";
key = "Type";
title = "Type of change";
options = [
{ name = "build"; description = "Changes that affect the build system or external dependencies"; value = "build"; }
{ name = "feat"; description = "A new feature"; value = "feat"; }
{ name = "fix"; description = "A bug fix"; value = "fix"; }
{ name = "chore"; description = "Other changes that don't modify src or test files"; value = "chore"; }
{ name = "ci"; description = "Changes to CI configuration files and scripts"; value = "ci"; }
{ name = "docs"; description = "Documentation only changes"; value = "docs"; }
{ name = "perf"; description = "A code change that improves performance"; value = "perf"; }
{ name = "refactor"; description = "A code change that neither fixes a bug nor adds a feature"; value = "refactor"; }
{ name = "revert"; description = "Reverts a previous commit"; value = "revert"; }
{ name = "style"; description = "Changes that do not affect the meaning of the code"; value = "style"; }
{ name = "test"; description = "Adding missing tests or correcting existing tests"; value = "test"; }
];
}
{
type = "input";
title = "Scope";
key = "Scope";
initialValue = "";
}
{
type = "menu";
key = "Breaking";
title = "Breaking change";
options = [
{ name = "no"; value = ""; }
{ name = "yes"; value = "!"; }
];
}
{
type = "input";
title = "message";
key = "Message";
initialValue = "";
}
{
type = "confirm";
key = "Confirm";
title = "Commit";
body = "Are you sure you want to commit?";
}
];
command = "git commit --message '{{.Form.Type}}{{ if .Form.Scope }}({{ .Form.Scope }}){{ end }}{{.Form.Breaking}}: {{.Form.Message}}'";
loadingText = "Creating conventional commit...";
}
];
};
};
home = {
username = "moritz";

View file

@ -27,6 +27,7 @@ in
"/var/lib/nixos"
"/var/lib/systemd"
"/var/log"
"/etc/mullvad-vpn/"
];
files = [
"/etc/machine-id"
@ -44,15 +45,17 @@ in
".cache/nvim/luac"
".cat_installer" # eduroam
".config/JetBrains"
".config/Mullvad VPN/"
".config/Nextcloud"
".config/Signal/"
".config/Mullvad VPN/"
".config/calibre"
".config/github-copilot"
".config/kdeconnect"
".config/keepassxc"
".java/.userPrefs/jetbrains/"
".local/share/JetBrains"
".local/share/PrismLauncher/"
".local/share/Steam/"
".local/share/direnv"
".local/share/nvim"
".local/share/zoxide"