suck my ball
This commit is contained in:
parent
66a49eb513
commit
509f16b469
2 changed files with 60 additions and 59 deletions
|
|
@ -27,6 +27,7 @@
|
||||||
...
|
...
|
||||||
} @ inputs: {
|
} @ inputs: {
|
||||||
formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.alejandra;
|
formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.alejandra;
|
||||||
|
formatter.aarch64-darwin = nixpkgs.legacyPackages.aarch64-darwin.alejandra;
|
||||||
nixosConfigurations.goingmerry = nixpkgs.lib.nixosSystem {
|
nixosConfigurations.goingmerry = nixpkgs.lib.nixosSystem {
|
||||||
specialArgs = {inherit inputs;};
|
specialArgs = {inherit inputs;};
|
||||||
modules = [
|
modules = [
|
||||||
|
|
@ -59,11 +60,11 @@
|
||||||
specialArgs = {inherit inputs;};
|
specialArgs = {inherit inputs;};
|
||||||
modules = [
|
modules = [
|
||||||
./hosts/mac/configuration.nix
|
./hosts/mac/configuration.nix
|
||||||
nix-homebrew.darwinModules.nix-homebrew
|
nix-homebrew.darwinModules.nix-homebrew
|
||||||
{
|
{
|
||||||
nix-homebrew = {
|
nix-homebrew = {
|
||||||
enable = true;
|
enable = true;
|
||||||
user = "admin";
|
user = "ichlebemietfreiindeinemapfel";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -1,66 +1,66 @@
|
||||||
{
|
{
|
||||||
config,
|
config,
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
system.primaryUser = "admin";
|
system.primaryUser = "ichlebemietfreiindeinemapfel";
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
vim
|
vim
|
||||||
neovim
|
neovim
|
||||||
alacritty
|
alacritty
|
||||||
element-desktop
|
element-desktop
|
||||||
mkalias
|
mkalias
|
||||||
flutter
|
flutter
|
||||||
pass
|
pass
|
||||||
];
|
];
|
||||||
|
|
||||||
homebrew = {
|
homebrew = {
|
||||||
enable = true;
|
enable = true;
|
||||||
casks = [
|
casks = [
|
||||||
];
|
];
|
||||||
brews = [
|
brews = [
|
||||||
];
|
];
|
||||||
#masApps = [];
|
#masApps = [];
|
||||||
onActivation.cleanup = "zap";
|
onActivation.cleanup = "zap";
|
||||||
onActivation.autoUpdate = true;
|
onActivation.autoUpdate = true;
|
||||||
onActivation.upgrade = true;
|
onActivation.upgrade = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
# Necessary for using flakes on this system.
|
# Necessary for using flakes on this system.
|
||||||
nix.settings.experimental-features = "nix-command flakes";
|
nix.settings.experimental-features = "nix-command flakes";
|
||||||
programs.zsh.enable = true;
|
programs.zsh.enable = true;
|
||||||
|
|
||||||
# Enable alternative shell support in nix-darwin.
|
# Enable alternative shell support in nix-darwin.
|
||||||
# programs.fish.enable = true;
|
# programs.fish.enable = true;
|
||||||
|
|
||||||
system.activationScripts.applications.text = let
|
system.activationScripts.applications.text = let
|
||||||
env = pkgs.buildEnv {
|
env = pkgs.buildEnv {
|
||||||
name = "system-applications";
|
name = "system-applications";
|
||||||
paths = config.environment.systemPackages;
|
paths = config.environment.systemPackages;
|
||||||
pathsToLink = "/Applications";
|
pathsToLink = "/Applications";
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
pkgs.lib.mkForce ''
|
pkgs.lib.mkForce ''
|
||||||
# Set up applications.
|
# Set up applications.
|
||||||
echo "setting up /Applications..." >&2
|
echo "setting up /Applications..." >&2
|
||||||
rm -rf /Applications/Nix\ Apps
|
rm -rf /Applications/Nix\ Apps
|
||||||
mkdir -p /Applications/Nix\ Apps
|
mkdir -p /Applications/Nix\ Apps
|
||||||
find ${env}/Applications -maxdepth 1 -type l -exec readlink '{}' + |
|
find ${env}/Applications -maxdepth 1 -type l -exec readlink '{}' + |
|
||||||
while read -r src; do
|
while read -r src; do
|
||||||
app_name=$(basename "$src")
|
app_name=$(basename "$src")
|
||||||
echo "copying $src" >&2
|
echo "copying $src" >&2
|
||||||
${pkgs.mkalias}/bin/mkalias "$src" "/Applications/Nix Apps/$app_name"
|
${pkgs.mkalias}/bin/mkalias "$src" "/Applications/Nix Apps/$app_name"
|
||||||
done
|
done
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# Set Git commit hash for darwin-version.
|
# Set Git commit hash for darwin-version.
|
||||||
#system.configurationRevision = self.rev or self.dirtyRev or null;
|
#system.configurationRevision = self.rev or self.dirtyRev or null;
|
||||||
|
|
||||||
# Used for backwards compatibility, please read the changelog before changing.
|
# Used for backwards compatibility, please read the changelog before changing.
|
||||||
# $ darwin-rebuild changelog
|
# $ darwin-rebuild changelog
|
||||||
system.stateVersion = 6;
|
system.stateVersion = 6;
|
||||||
|
|
||||||
# The platform the configuration will be used on.
|
# The platform the configuration will be used on.
|
||||||
nixpkgs.hostPlatform = "x86_64-darwin";
|
nixpkgs.hostPlatform = "aarch64-darwin";
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue