code formatting

This commit is contained in:
m3tam3re
2025-08-07 21:58:03 +02:00
parent 54f6c6b65b
commit ab05131567
3 changed files with 37 additions and 38 deletions

View File

@ -1,5 +1,4 @@
{pkgs, ...}: {pkgs, ...}: {
{
imports = [ imports = [
./fzf.nix ./fzf.nix
./nitch.nix ./nitch.nix

View File

@ -1,12 +1,10 @@
{inputs, ...}: { {inputs, ...}: {
# This one brings our custom packages from the 'pkgs' directory # This one brings our custom packages from the 'pkgs' directory
additions = final: prev: additions = final: prev: (import ../pkgs {pkgs = final;});
(import ../pkgs {pkgs = final;});
# This one contains whatever you want to overlay # This one contains whatever you want to overlay
# You can change versions, add patches, set compilation flags, anything really. # You can change versions, add patches, set compilation flags, anything really.
# https://nixos.wiki/wiki/Overlays # https://nixos.wiki/wiki/Overlays
modifications = final: prev: { modifications = final: prev: {
brave = prev.brave.override { brave = prev.brave.override {
commandLineArgs = "--password-store=gnome-libsecret"; commandLineArgs = "--password-store=gnome-libsecret";
}; };

View File

@ -1,46 +1,48 @@
{ config, {
config,
lib, lib,
systemConfig ? {}, systemConfig ? {},
...}: ...
{ }: {
imports = [ imports = [
../../modules ../../modules
]; ];
config = lib.mkMerge [ config = lib.mkMerge [
{ {
home = { home = {
username = "m3tam3re"; username = "m3tam3re";
homeDirectory = lib.mkDefault "/home/${config.home.username}"; homeDirectory = lib.mkDefault "/home/${config.home.username}";
stateVersion = "25.05"; stateVersion = "25.05";
};
programs = {
home-manager.enable = true;
git = {
enable = true;
difftastic.enable = true;
userName = "m3tam3re";
userEmail = "m@m3tam3re.com";
aliases = {
st = "status";
logd = "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit";
}; };
extraConfig = { programs = {
core.excludesfile = "~/.gitignore_global"; home-manager.enable = true;
init.defaultBranch = "master";
};
};
jujutsu = { git = {
enable = true; enable = true;
settings = { difftastic.enable = true;
user = { userName = "m3tam3re";
email = "m@m3tam3re.com"; userEmail = "m@m3tam3re.com";
name = "Sascha Koenig"; aliases = {
st = "status";
logd = "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit";
};
extraConfig = {
core.excludesfile = "~/.gitignore_global";
init.defaultBranch = "master";
};
};
jujutsu = {
enable = true;
settings = {
user = {
email = "m@m3tam3re.com";
name = "Sascha Koenig";
};
};
}; };
}; };
}; }
};} (lib.mkIf (systemConfig != {}) systemConfig)
(lib.mkIf (systemConfig != {}) systemConfig)
]; ];
} }