From 9a5427e3a0c0ccf2a82dc503149a26b23fbd6004 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Sun, 31 Mar 2024 21:29:27 +0300 Subject: 2024-03-31 --- modules/darwin/common/home-manager.nix | 5 +++-- modules/darwin/common/locale.nix | 7 ++++--- modules/darwin/common/networking.nix | 3 ++- modules/darwin/common/nix.nix | 7 ++----- modules/darwin/common/secrets.nix | 5 +++-- modules/darwin/common/shell.nix | 5 +++-- modules/darwin/common/stylix.nix | 5 +++-- modules/darwin/common/users.nix | 3 ++- modules/darwin/common/xdg.nix | 15 +++++++-------- 9 files changed, 29 insertions(+), 26 deletions(-) (limited to 'modules/darwin/common') diff --git a/modules/darwin/common/home-manager.nix b/modules/darwin/common/home-manager.nix index 4fc6cbe..487c64b 100644 --- a/modules/darwin/common/home-manager.nix +++ b/modules/darwin/common/home-manager.nix @@ -1,3 +1,4 @@ -{inputs, ...}: { - imports = [inputs.home-manager.darwinModule]; +{ inputs, ... }: +{ + imports = [ inputs.home-manager.darwinModule ]; } diff --git a/modules/darwin/common/locale.nix b/modules/darwin/common/locale.nix index 1ecf6fe..19770a3 100644 --- a/modules/darwin/common/locale.nix +++ b/modules/darwin/common/locale.nix @@ -1,7 +1,8 @@ -{lib, ...}: -with lib; { +{ lib, ... }: +with lib; +{ environment.variables.LANG = "en_GB.UTF-8"; # TODO https://daiderd.com/nix-darwin/manual/index.html#opt-system.keyboard.enableKeyMapping - system.keyboard = {}; + system.keyboard = { }; } diff --git a/modules/darwin/common/networking.nix b/modules/darwin/common/networking.nix index 2843bc4..eae7c2f 100644 --- a/modules/darwin/common/networking.nix +++ b/modules/darwin/common/networking.nix @@ -2,7 +2,8 @@ localHostname ? this.hostname, this, ... -}: { +}: +{ networking = { computerName = localHostname; hostName = localHostname; diff --git a/modules/darwin/common/nix.nix b/modules/darwin/common/nix.nix index 10aeb03..63b0d90 100644 --- a/modules/darwin/common/nix.nix +++ b/modules/darwin/common/nix.nix @@ -1,9 +1,6 @@ +{ lib, this, ... }: +with lib; { - lib, - this, - ... -}: -with lib; { nix = { daemonIOLowPriority = false; daemonProcessType = "Standard"; diff --git a/modules/darwin/common/secrets.nix b/modules/darwin/common/secrets.nix index 0656ae8..681c5c2 100644 --- a/modules/darwin/common/secrets.nix +++ b/modules/darwin/common/secrets.nix @@ -1,3 +1,4 @@ -{inputs, ...}: { - imports = [inputs.agenix.darwinModules.default]; +{ inputs, ... }: +{ + imports = [ inputs.agenix.darwinModules.default ]; } diff --git a/modules/darwin/common/shell.nix b/modules/darwin/common/shell.nix index 5985f50..2139f2f 100644 --- a/modules/darwin/common/shell.nix +++ b/modules/darwin/common/shell.nix @@ -1,3 +1,4 @@ -{pkgs, ...}: { - environment.shells = with pkgs; [bashInteractive]; +{ pkgs, ... }: +{ + environment.shells = with pkgs; [ bashInteractive ]; } diff --git a/modules/darwin/common/stylix.nix b/modules/darwin/common/stylix.nix index cfeed05..8712172 100644 --- a/modules/darwin/common/stylix.nix +++ b/modules/darwin/common/stylix.nix @@ -4,8 +4,9 @@ lib, ... }: -with lib; { - imports = [inputs.stylix.darwinModules.stylix]; +with lib; +{ + imports = [ inputs.stylix.darwinModules.stylix ]; fonts.fonts = mkAfter config.nixfiles.modules.common.stylix.fonts.extraPackages; } diff --git a/modules/darwin/common/users.nix b/modules/darwin/common/users.nix index 957e50c..9043f51 100644 --- a/modules/darwin/common/users.nix +++ b/modules/darwin/common/users.nix @@ -3,7 +3,8 @@ localUsername ? lib.my.username, ... }: -with lib; { +with lib; +{ # The only MacOS machine I'm currently using has a pre-configured domain user # account that I have to login as. I may accidentally break something if I # change options here so this section is left practically untouched. diff --git a/modules/darwin/common/xdg.nix b/modules/darwin/common/xdg.nix index 9e798ad..526dc0b 100644 --- a/modules/darwin/common/xdg.nix +++ b/modules/darwin/common/xdg.nix @@ -1,12 +1,11 @@ -{ - config, - lib, - ... -}: -with lib; let +{ config, lib, ... }: +with lib; +let cfg = config.nixfiles.modules.common.xdg; -in { - hm.home.sessionVariables = with cfg; +in +{ + hm.home.sessionVariables = + with cfg; { XDG_CACHE_HOME = cacheHome; XDG_CONFIG_HOME = configHome; -- cgit 1.4.1