Merge branch 'main' of github.com:LarssonMartin1998/.dotfiles

This commit is contained in:
Martin Larsson 2025-03-21 19:07:37 +00:00
commit b977ec6ed2
3 changed files with 46 additions and 19 deletions

View file

@ -110,25 +110,32 @@
};
};
darwinConfigurations."darwin" = makeSystemConfig {
name = "darwin";
system = "aarch64-darwin";
builder = nix-darwin.lib.darwinSystem;
extraModules = [
./nix/system/darwin.nix
nix-homebrew.darwinModules.nix-homebrew
{
nix-homebrew = {
enable = true;
enableRosetta = true;
darwinConfigurations =
let
baseDarwinConfig = makeSystemConfig {
name = "darwin";
system = "aarch64-darwin";
builder = nix-darwin.lib.darwinSystem;
extraModules = [
./nix/system/darwin.nix
nix-homebrew.darwinModules.nix-homebrew
{
nix-homebrew = {
enable = true;
enableRosetta = true;
};
}
];
specialArgs = {
self = self;
nix-homebrew = nix-homebrew;
};
}
];
specialArgs = {
self = self;
nix-homebrew = nix-homebrew;
};
in
{
"darwin" = baseDarwinConfig;
"darwin_work" = baseDarwinConfig;
};
};
homeConfigurations = {
"wsl" = makeHomeConfig {
@ -154,6 +161,15 @@
system = "aarch64-darwin";
extraModules = [ ./nix/pkgs/darwin.nix ];
};
"darwin_work" = makeHomeConfig {
name = "work";
system = "aarch64-darwin";
extraModules = [
./nix/pkgs/darwin.nix
./nix/pkgs/darwin_work.nix
];
};
};
};
}

13
nix/pkgs/darwin_work.nix Normal file
View file

@ -0,0 +1,13 @@
{ pkgs, ... }:
{
home = {
packages = with pkgs; [
(python311.withPackages (pythonPkgs: [
pythonPkgs.pip
pythonPkgs.setuptools
]))
pcre
ccache
];
};
}

View file

@ -119,8 +119,6 @@ in
tree-sitter
codelldb
bottom
python311
pcre
];
file = symlinkFiles;