jmug/nixos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Introduce a "user" module that can be interpolated everywhere.

Browse source 
Signed-off-by: Mariano Uvalle <juvallegarza@microsoft.com>
This commit is contained in:
Mariano Uvalle 2025-08-07 15:33:00 -07:00
parent c6aad094b0
commit 4c8cd258c1
5 changed files with 60 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

15
hosts/msft-mac/configuration.nix
View file

@ -1,10 +1,13 @@
{ self, pkgs, ... }: {
{ self, pkgs, config, ... }: {
imports = [ ./hotkeys.nix ];
imports = [
./hotkeys.nix
../../modules/common
];
# To reflect hotkeys without a login cycle.
system.activationScripts.postActivation.text = ''
sudo -u jmug /System/Library/PrivateFrameworks/SystemAdministration.framework/Resources/activateSettings -u
sudo -u ${config.user.name} /System/Library/PrivateFrameworks/SystemAdministration.framework/Resources/activateSettings -u
'';
# List packages installed in system profile. To search by name, run:
@ -14,7 +17,9 @@
git-credential-manager
];
system.primaryUser = "jmug";
user.name = "jmug";
system.primaryUser = config.user.name;
homebrew = {
enable = true;
@ -45,7 +50,7 @@
nerd-fonts.bigblue-terminal
];
users.users.jmug.home = "/Users/jmug";
users.users.${config.user.name}.home = config.user.homeDirectory;
nixpkgs.config.allowUnfree = true;

31
hosts/msft-mac/home.nix
View file

@ -2,8 +2,13 @@
config,
pkgs,
pkgs-unstable,
user,
...
} : {
} :
let
username = user.name;
homeDirectory = user.homeDirectory;
in {
imports = [
../../home-modules/default.nix
@ -28,8 +33,8 @@
};
home = {
username = "jmug";
homeDirectory = "/Users/jmug";
username = username;
homeDirectory = homeDirectory;
packages = with pkgs; [
jq
@ -67,24 +72,24 @@
enable = true;
extraConfig = ''
Host *
IdentityAgent /Users/jmug/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/socket.ssh
IdentityAgent ${homeDirectory}/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/socket.ssh
'';
};
programs.zsh = {
shellAliases = {
# TODO BEGIN Interpolate the name of the host here.
flakeconf = "nvim /Users/jmug/nixos/flake.nix";
sysconf = "nvim /Users/jmug/nixos/hosts/macbook/configuration.nix";
homeconf = "nvim /Users/jmug/nixos/hosts/macbook/home.nix";
nvconf = "nvim /Users/jmug/nixos/home-modules/explicit-configs/nvim/init.lua";
flakeconf = "nvim ${homeDirectory}/nixos/flake.nix";
sysconf = "nvim ${homeDirectory}/nixos/hosts/macbook/configuration.nix";
homeconf = "nvim ${homeDirectory}/nixos/hosts/macbook/home.nix";
nvconf = "nvim ${homeDirectory}/nixos/home-modules/explicit-configs/nvim/init.lua";
# TODO: Interpolate the name of the host here.
rshellconf="source /Users/jmug/.zshrc";
radev = "/Users/jmug/dev/aks-rp/bin/aksdev";
ksc = "KUBECONFIG=/Users/jmug/Downloads/cxkubeconfig.yaml kubectl";
kso = "KUBECONFIG=/Users/jmug/Downloads/overlaykubeconfig.yaml kubectl";
rshellconf="source ${homeDirectory}/.zshrc";
radev = "${homeDirectory}/dev/aks-rp/bin/aksdev";
ksc = "KUBECONFIG=${homeDirectory}/Downloads/cxkubeconfig.yaml kubectl";
kso = "KUBECONFIG=${homeDirectory}/Downloads/overlaykubeconfig.yaml kubectl";
k = "kubectl";
nrsw = "sudo darwin-rebuild switch --flake /Users/jmug/nixos#msft-mac";
nrsw = "sudo darwin-rebuild switch --flake ${homeDirectory}/nixos#msft-mac";
};
initExtra = ''
export GONOPROXY='github.com,golang.org,googlesource.com,opentelemetry.io,uber.org'