From 892de67a9f64d0b0cdb023d830a019d8feec0a57 Mon Sep 17 00:00:00 2001 From: Jakub Stachurski Date: Wed, 19 Nov 2025 21:02:52 +0100 Subject: Nix fmt --- users/live-user.nix | 39 ++++++++++++++++++++++++++------------- users/user-common.nix | 39 ++++++++++++++++++++++++--------------- users/wilkuu.nix | 43 +++++++++++++++++++++++++++++-------------- 3 files changed, 79 insertions(+), 42 deletions(-) (limited to 'users') diff --git a/users/live-user.nix b/users/live-user.nix index b7182c8..8e8c237 100644 --- a/users/live-user.nix +++ b/users/live-user.nix @@ -1,16 +1,29 @@ -{pkgs, lib, config,...}: { - imports = [./user-common.nix]; - programs.zsh.enable = true; - users.users.live-user = { - shell = pkgs.zsh; - isNormalUser = true; - initialPassword = "PleazeChangeThis123"; - extraGroups = [ "wheel" "networkmanager" "input" "docker" "adbusers" "libvirtd" ]; # Enable ‘sudo’ for the user. - packages = with pkgs; [ - home-manager - ]; - }; +{ + pkgs, + lib, + config, + ... +}: +{ + imports = [ ./user-common.nix ]; + programs.zsh.enable = true; + users.users.live-user = { + shell = pkgs.zsh; + isNormalUser = true; + initialPassword = "PleazeChangeThis123"; + extraGroups = [ + "wheel" + "networkmanager" + "input" + "docker" + "adbusers" + "libvirtd" + ]; # Enable ‘sudo’ for the user. + packages = with pkgs; [ + home-manager + ]; + }; - home-manager.users.live-user.imports = [ ../home/live-user.nix ]; + home-manager.users.live-user.imports = [ ../home/live-user.nix ]; } diff --git a/users/user-common.nix b/users/user-common.nix index b6da2bb..4d0e8ad 100644 --- a/users/user-common.nix +++ b/users/user-common.nix @@ -1,17 +1,26 @@ -{pkgs, config, inputs, ...}: { - # Pass host config to HM (Common config) - # TODO: Move this somewhere else. - home-manager = { - useUserPackages = true; - useGlobalPkgs = true; - backupFileExtension = "bak"; - - sharedModules = [ - ({ ...}: { - _module.args.hostconfig = config; +{ + pkgs, + config, + inputs, + ... +}: +{ + # Pass host config to HM (Common config) + # TODO: Move this somewhere else. + home-manager = { + useUserPackages = true; + useGlobalPkgs = true; + backupFileExtension = "bak"; - }) - inputs.sops-nix.homeManagerModules.sops - ]; - }; + sharedModules = [ + ( + { ... }: + { + _module.args.hostconfig = config; + _module.args.inputs = inputs; + } + ) + inputs.sops-nix.homeManagerModules.sops + ]; + }; } diff --git a/users/wilkuu.nix b/users/wilkuu.nix index 1815b10..e5404ae 100644 --- a/users/wilkuu.nix +++ b/users/wilkuu.nix @@ -1,17 +1,32 @@ -{pkgs, lib, config,...}: { - imports = [./user-common.nix]; - programs.zsh.enable = true; - programs.adb.enable = true; - users.users.wilkuu = { - shell = pkgs.zsh; - isNormalUser = true; - initialPassword = "PleazeChangeThis123"; - extraGroups = [ "wheel" "adbusers" "networkmanager" "input" "docker" "adbusers" "libvirtd" "libvirt"]; # Enable ‘sudo’ for the user. - packages = with pkgs; [ - home-manager - ]; - }; +{ + pkgs, + lib, + config, + ... +}: +{ + imports = [ ./user-common.nix ]; + programs.zsh.enable = true; + programs.adb.enable = true; + users.users.wilkuu = { + shell = pkgs.zsh; + isNormalUser = true; + initialPassword = "PleazeChangeThis123"; + extraGroups = [ + "wheel" + "adbusers" + "networkmanager" + "input" + "docker" + "adbusers" + "libvirtd" + "libvirt" + ]; # Enable ‘sudo’ for the user. + packages = with pkgs; [ + home-manager + ]; + }; - home-manager.users.wilkuu.imports = [ ../home/wilkuu.nix ]; + home-manager.users.wilkuu.imports = [ ../home/wilkuu.nix ]; } -- cgit v1.3.1