From ab05131567ee3cba2ddf71b20b82c248491d9b12 Mon Sep 17 00:00:00 2001 From: m3tam3re Date: Thu, 7 Aug 2025 21:58:03 +0200 Subject: [PATCH] code formatting --- modules/cli/default.nix | 3 +- overlays/default.nix | 4 +-- users/m3tam3re/default.nix | 68 ++++++++++++++++++++------------------ 3 files changed, 37 insertions(+), 38 deletions(-) diff --git a/modules/cli/default.nix b/modules/cli/default.nix index 94a1283..8aba84a 100644 --- a/modules/cli/default.nix +++ b/modules/cli/default.nix @@ -1,5 +1,4 @@ -{pkgs, ...}: -{ +{pkgs, ...}: { imports = [ ./fzf.nix ./nitch.nix diff --git a/overlays/default.nix b/overlays/default.nix index 328af96..91dd98d 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,12 +1,10 @@ {inputs, ...}: { # This one brings our custom packages from the 'pkgs' directory - additions = final: prev: - (import ../pkgs {pkgs = final;}); + additions = final: prev: (import ../pkgs {pkgs = final;}); # This one contains whatever you want to overlay # You can change versions, add patches, set compilation flags, anything really. # https://nixos.wiki/wiki/Overlays modifications = final: prev: { - brave = prev.brave.override { commandLineArgs = "--password-store=gnome-libsecret"; }; diff --git a/users/m3tam3re/default.nix b/users/m3tam3re/default.nix index dc09820..a03c2e4 100644 --- a/users/m3tam3re/default.nix +++ b/users/m3tam3re/default.nix @@ -1,46 +1,48 @@ -{ config, +{ + config, lib, systemConfig ? {}, - ...}: -{ + ... +}: { imports = [ ../../modules ]; config = lib.mkMerge [ { - home = { - username = "m3tam3re"; - homeDirectory = lib.mkDefault "/home/${config.home.username}"; - 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"; + home = { + username = "m3tam3re"; + homeDirectory = lib.mkDefault "/home/${config.home.username}"; + stateVersion = "25.05"; }; - extraConfig = { - core.excludesfile = "~/.gitignore_global"; - init.defaultBranch = "master"; - }; - }; + programs = { + home-manager.enable = true; - jujutsu = { - enable = true; - settings = { - user = { - email = "m@m3tam3re.com"; - name = "Sascha Koenig"; + 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 = { + 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) ]; }