WIP - overlay in flake
This commit is contained in:
parent
28d295b574
commit
8249e20585
3 changed files with 19 additions and 29 deletions
|
@ -1,10 +1,5 @@
|
||||||
{config, pkgs, lib, ...}:
|
{config, pkgs, lib, ...}:
|
||||||
{
|
{
|
||||||
nixpkgs.config = {
|
|
||||||
packageOverrides = pkgs: {
|
|
||||||
inherit mergedPkgs;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
ddev
|
ddev
|
||||||
|
|
|
@ -1,13 +0,0 @@
|
||||||
# overlays.nix
|
|
||||||
|
|
||||||
{ self, nixpkgs, myNixpkgs }:
|
|
||||||
|
|
||||||
let
|
|
||||||
myOverlay = final: prev: {
|
|
||||||
# Replace 'examplePackage' with the package you want to override
|
|
||||||
jetbrains.phpstorm = myNixpkgs.jetbrains.phpstorm;
|
|
||||||
};
|
|
||||||
in
|
|
||||||
{
|
|
||||||
overlays = [ myOverlay ];
|
|
||||||
}
|
|
30
flake.nix
30
flake.nix
|
@ -1,20 +1,28 @@
|
||||||
# /etc/nixos/flake.nix
|
# /etc/nixos/flake.nix
|
||||||
{
|
{
|
||||||
inputs = {
|
inputs = {
|
||||||
# NOTE: Replace "nixos-23.11" with that which is in system.stateVersion of
|
|
||||||
# configuration.nix. You can also use latter versions if you wish to
|
|
||||||
# upgrade.
|
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||||
# nixos-needsreboot.url = "https://flakehub.com/f/thefossguy/nixos-needsreboot/*.tar.gz";
|
|
||||||
};
|
};
|
||||||
outputs = inputs@{ self, nixpkgs, ... }: {
|
outputs = { nixpkgs, ... }:
|
||||||
# NOTE: 'nixos' is the default hostname set by the installer
|
let
|
||||||
nixosConfigurations.valhalla = nixpkgs.lib.nixosSystem {
|
pkgs = import nixpkgs { system = "x86_64-linux";
|
||||||
# NOTE: Change this to aarch64-linux if you are on ARM
|
overlays = [
|
||||||
system = "x86_64-linux";
|
( final: prev: {
|
||||||
modules = [ ./hosts/desktop/valhalla/configuration.nix ];
|
jetbrains.phpstorm = prev.jetbrains.phpstorm.overrideAttrs (old: {
|
||||||
|
src = prev.fetchFromGithub {
|
||||||
|
owner = "freelock";
|
||||||
|
repo = "nixpkgs";
|
||||||
|
rev = "b324cfea863d9191518b96774e1317a6d933075f";
|
||||||
|
hash ="";
|
||||||
|
};
|
||||||
|
});
|
||||||
|
} )
|
||||||
|
];
|
||||||
|
};
|
||||||
|
in {
|
||||||
|
nixosConfigurations.valhalla = pkgs.nixos {
|
||||||
|
imports = [ ./hosts/desktop/valhalla/configuration.nix ];
|
||||||
};
|
};
|
||||||
# environment.systemPackages = [nixos-needsreboot.packages.${nixpkgs.system}.default];
|
|
||||||
nixosConfigurations.katmai = nixpkgs.lib.nixosSystem {
|
nixosConfigurations.katmai = nixpkgs.lib.nixosSystem {
|
||||||
# NOTE: Change this to aarch64-linux if you are on ARM
|
# NOTE: Change this to aarch64-linux if you are on ARM
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
|
|
Loading…
Reference in a new issue