[msft-mac] Clean up darwin home modules. Prepare mstf-mac config.
Signed-off-by: Mariano Uvalle <u.g.a.mariano@gmail.com>
This commit is contained in:
parent
dff049e7f8
commit
fe118afd58
9 changed files with 175 additions and 91 deletions
|
|
@ -6,16 +6,21 @@
|
|||
} : {
|
||||
|
||||
imports = [
|
||||
../../home-modules/tmux-darwin.nix
|
||||
../../home-modules/tmux.nix
|
||||
../../home-modules/lazygit.nix
|
||||
../../home-modules/zsh.nix
|
||||
../../home-modules/starship.nix
|
||||
../../home-modules/nvim.nix
|
||||
../../home-modules/direnv.nix
|
||||
# I should update the module with an option for adding winodow decorations.
|
||||
../../home-modules/ghostty-mac-config.nix
|
||||
../../home-modules/ghostty-config.nix
|
||||
];
|
||||
|
||||
ghostty = {
|
||||
font-size = "17.2";
|
||||
window-decoration = true;
|
||||
};
|
||||
|
||||
nvim = {
|
||||
enable = true;
|
||||
package = pkgs-unstable.neovim;
|
||||
|
|
|
|||
53
hosts/msft-mac/configuration.nix
Normal file
53
hosts/msft-mac/configuration.nix
Normal file
|
|
@ -0,0 +1,53 @@
|
|||
{ self, pkgs, ... }: {
|
||||
# List packages installed in system profile. To search by name, run:
|
||||
# $ nix-env -qaP | grep wget
|
||||
environment.systemPackages = with pkgs; [
|
||||
neofetch
|
||||
];
|
||||
|
||||
system.primaryUser = "jmug";
|
||||
|
||||
homebrew = {
|
||||
enable = true;
|
||||
onActivation = {
|
||||
autoUpdate = true;
|
||||
cleanup = "uninstall";
|
||||
upgrade = true;
|
||||
};
|
||||
|
||||
caskArgs = {
|
||||
no_quarantine = true;
|
||||
};
|
||||
|
||||
taps = [];
|
||||
brews = [
|
||||
];
|
||||
casks = [
|
||||
"ghostty"
|
||||
"secretive"
|
||||
];
|
||||
};
|
||||
|
||||
fonts.packages = with pkgs; [
|
||||
nerd-fonts.bigblue-terminal
|
||||
];
|
||||
|
||||
users.users.jmug.home = "/Users/jmug";
|
||||
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
|
||||
programs.zsh.enable = true;
|
||||
|
||||
# Necessary for using flakes on this system.
|
||||
nix.settings.experimental-features = "nix-command flakes";
|
||||
|
||||
# Set Git commit hash for darwin-version.
|
||||
system.configurationRevision = self.rev or self.dirtyRev or null;
|
||||
|
||||
# Used for backwards compatibility, please read the changelog before changing.
|
||||
# $ darwin-rebuild changelog
|
||||
system.stateVersion = 6;
|
||||
|
||||
# The platform the configuration will be used on.
|
||||
nixpkgs.hostPlatform = "aarch64-darwin";
|
||||
}
|
||||
88
hosts/msft-mac/home.nix
Normal file
88
hosts/msft-mac/home.nix
Normal file
|
|
@ -0,0 +1,88 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
pkgs-unstable,
|
||||
...
|
||||
} : {
|
||||
|
||||
imports = [
|
||||
../../home-modules/default.nix
|
||||
../../home-modules/direnv.nix
|
||||
../../home-modules/ghostty-config.nix
|
||||
../../home-modules/lazygit.nix
|
||||
../../home-modules/nvim.nix
|
||||
../../home-modules/starship.nix
|
||||
../../home-modules/tmux.nix
|
||||
../../home-modules/zsh.nix
|
||||
];
|
||||
|
||||
ghostty = {
|
||||
font-size = "17.2";
|
||||
window-decoration = true;
|
||||
};
|
||||
|
||||
nvim = {
|
||||
enable = true;
|
||||
package = pkgs-unstable.neovim;
|
||||
};
|
||||
|
||||
home = {
|
||||
username = "jmug";
|
||||
homeDirectory = "/Users/jmug";
|
||||
|
||||
packages = with pkgs; [
|
||||
jq
|
||||
yq
|
||||
nerd-fonts.bigblue-terminal
|
||||
nerd-fonts.fira-code
|
||||
|
||||
go
|
||||
gopls
|
||||
gotools
|
||||
mockgen
|
||||
pkgs-unstable.kubernetes-controller-tools
|
||||
pkgs-unstable.kubectl
|
||||
pkgs-unstable.kubectl-node-shell
|
||||
pkgs-unstable.kind
|
||||
pkgs-unstable.kubernetes-helm
|
||||
|
||||
pkgs-unstable.azure-cli
|
||||
|
||||
pkgs-unstable.claude-code
|
||||
(pkgs-unstable.litellm.overrideAttrs (oldAttrs: rec {
|
||||
version = "1.74.9";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "BerriAI";
|
||||
repo = "litellm";
|
||||
tag = "v${version}-stable";
|
||||
hash = "sha256-SGZwt2jzAQbOMlvudqPWat281su6OwT7JG2CNSMjL3A=";
|
||||
};
|
||||
}))
|
||||
];
|
||||
|
||||
stateVersion = "25.05";
|
||||
};
|
||||
|
||||
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";
|
||||
# TODO: Interpolate the name of the host here.
|
||||
radev = "/Users/jmug/dev/aks-rp/bin/aksdev";
|
||||
ksc = "KUBECONFIG=/Users/jmug/Downloads/cxkubeconfig.yaml kubectl";
|
||||
kso = "KUBECONFIG=/Users/jmug/Downloads/overlaykubeconfig.yaml kubectl";
|
||||
k = "kubectl";
|
||||
nrsw = "sudo darwin-rebuild switch --flake /Users/jmug/nixos#msft-mac";
|
||||
};
|
||||
initExtra = ''
|
||||
export GONOPROXY='github.com,golang.org,googlesource.com,opentelemetry.io,uber.org'
|
||||
export GOPRIVATE='goms.io,*.goms.io'
|
||||
export GOPROXY='https://goproxyprod.goms.io'
|
||||
export PATH=$PATH:$HOME/bin
|
||||
export PATH=$PATH:$HOME/go/bin
|
||||
'';
|
||||
};
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue