master
Elias Almqvist 2 weeks ago
parent 9e1669337b
commit 21ea5d1661
No known key found for this signature in database
GPG Key ID: E31A99CE3E75A158
  1. 22
      nix-darwin/configuration.nix
  2. 16
      nix-darwin/flake.lock
  3. 20
      nix-darwin/flake.nix
  4. 18
      nix-darwin/flake.nix.old
  5. 22
      nix-darwin/home.nix
  6. 1
      nix-darwin/nix.conf

@ -4,22 +4,34 @@
# List packages installed in system profile. To search by name, run: # List packages installed in system profile. To search by name, run:
# $ nix-env -qaP | grep wget # $ nix-env -qaP | grep wget
environment.systemPackages = environment.systemPackages =
[ pkgs.vim [ pkgs.git
]; ];
# 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";
# Enable alternative shell support in nix-darwin. # Auto upgrade nix package and the daemon service.
# programs.fish.enable = true; services.nix-daemon.enable = true;
# Set Git commit hash for darwin-version. # Enable zsh
system.configurationRevision = self.rev or self.dirtyRev or null; programs.zsh.enable = true;
# 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;
# Allow unfree (and optionally broken) packages
nixpkgs.config = {
allowUnfree = true;
# If needed, you can also allow broken packages:
# allowBroken = true;
};
# The platform the configuration will be used on. # The platform the configuration will be used on.
nixpkgs.hostPlatform = "aarch64-darwin"; nixpkgs.hostPlatform = "aarch64-darwin";
users.users.elal = {
name = "elal";
home = "/Users/elal";
};
} }

@ -9,13 +9,13 @@
"locked": { "locked": {
"lastModified": 1738743987, "lastModified": 1738743987,
"narHash": "sha256-O3bnAfsObto6l2tQOmQlrO6Z2kD6yKwOWfs7pA0CpOc=", "narHash": "sha256-O3bnAfsObto6l2tQOmQlrO6Z2kD6yKwOWfs7pA0CpOc=",
"owner": "LnL7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "ae406c04577ff9a64087018c79b4fdc02468c87c", "rev": "ae406c04577ff9a64087018c79b4fdc02468c87c",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "LnL7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"type": "github" "type": "github"
} }
@ -42,16 +42,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1738797219, "lastModified": 1738824222,
"narHash": "sha256-KRwX9Z1XavpgeSDVM/THdFd6uH8rNm/6R+7kIbGa+2s=", "narHash": "sha256-U3SNq+waitGIotmgg/Et3J7o4NvUtP2gb2VhME5QXiw=",
"owner": "NixOS", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1da52dd49a127ad74486b135898da2cef8c62665", "rev": "550e11f27ba790351d390d9eca3b80ad0f0254e7",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "nixos",
"ref": "nixpkgs-unstable", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

@ -1,29 +1,31 @@
{ {
description = "Epsilons darwin configuration"; description = "Epsilons Darwin configuration";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
darwin.url = "github:LnL7/nix-darwin"; darwin.url = "github:lnl7/nix-darwin";
darwin.inputs.nixpkgs.follows = "nixpkgs"; darwin.inputs.nixpkgs.follows = "nixpkgs";
home-manager.url = "github:nix-community/home-manager"; home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
}; };
outputs = inputs: { outputs = inputs@{ nixpkgs, home-manager, darwin, ... }: {
darwinConfigurations = { darwinConfigurations = {
"exa" = inputs.darwin.lib.darwinSystem { exa = darwin.lib.darwinSystem {
system = "aarch64-darwin"; # or "x86_64-darwin" for Intel Macs system = "aarch64-darwin";
modules = [ modules = [
./configuration.nix ./configuration.nix
# This module integrates Home Manager: home-manager.darwinModules.home-manager
inputs.home-manager.darwinModules.home-manager { {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.users.elal = import ./home.nix; home-manager.users.elal = import ./home.nix;
# Optionally, use home-manager.extraSpecialArgs to pass
# arguments to home.nix
} }
]; ];
}; };
}; };
}; };
} }

@ -1,18 +0,0 @@
{
description = "Home Manager configuration";
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
home-manager = {
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs = { self, nixpkgs, home-manager }: {
homeConfigurations."elal" = home-manager.lib.homeConfiguration {
pkgs = nixpkgs.legacyPackages.aarch64-darwin;
modules = [ ./home.nix ];
};
};
}

@ -15,28 +15,6 @@
# release notes. # release notes.
home.stateVersion = "24.05"; # Please read the comment before changing. home.stateVersion = "24.05"; # Please read the comment before changing.
nixpkgs = {
# You can add overlays here
overlays = [
# If you want to use overlays exported from other flakes:
# neovim-nightly-overlay.overlays.default
# Or define it inline, for example:
# (final: prev: {
# hi = final.hello.overrideAttrs (oldAttrs: {
# patches = [ ./change-hello-to-hi.patch ];
# });
# })
];
# Configure your nixpkgs instance
config = {
# Disable if you don't want unfree packages
allowUnfree = true;
# Workaround for https://github.com/nix-community/home-manager/issues/2942
allowUnfreePredicate = _: true;
};
};
imports = [ imports = [
# Modules # Modules
./modules/skhd.nix ./modules/skhd.nix

@ -1 +0,0 @@
experimental-features = nix-command flakes
Loading…
Cancel
Save