refactor(nix): Mix stable and unstable packages
Also replace inkscape with brew cask inkscape on macOS
This commit is contained in:
parent
90c0934bf2
commit
26c9cfbaed
13 changed files with 133 additions and 72 deletions
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
description = "null2264's Nix Setup";
|
||||
|
||||
outputs = inputs@{ self, nix-darwin, nixpkgs, home-manager, system-manager, ... }:
|
||||
outputs = inputs@{ self, nix-darwin, nixpkgs-stable, nixpkgs-unstable, home-manager, system-manager, ... }:
|
||||
let
|
||||
vars = {
|
||||
floorp = {
|
||||
|
@ -13,42 +13,43 @@
|
|||
{
|
||||
darwinConfigurations = (
|
||||
import ./systems/darwin {
|
||||
inherit (nixpkgs) lib;
|
||||
inherit inputs nixpkgs nix-darwin home-manager vars;
|
||||
inherit (nixpkgs-unstable) lib;
|
||||
inherit inputs nixpkgs-stable nixpkgs-unstable nix-darwin home-manager vars;
|
||||
}
|
||||
);
|
||||
|
||||
systemConfigs = ( # sudo is required, sadly
|
||||
import ./systems/nix {
|
||||
inherit (nixpkgs) lib;
|
||||
inherit inputs nixpkgs system-manager home-manager vars;
|
||||
inherit (nixpkgs-unstable) lib;
|
||||
inherit inputs nixpkgs-stable nixpkgs-unstable system-manager home-manager vars;
|
||||
}
|
||||
);
|
||||
|
||||
homeConfigurations = (
|
||||
import ./users {
|
||||
inherit (nixpkgs) lib;
|
||||
inherit inputs nixpkgs home-manager vars;
|
||||
inherit (nixpkgs-unstable) lib;
|
||||
inherit inputs nixpkgs-stable nixpkgs-unstable home-manager vars;
|
||||
}
|
||||
);
|
||||
};
|
||||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/2d2a9ddbe3f2c00747398f3dc9b05f7f2ebb0f53";
|
||||
nixpkgs-stable.url = "github:NixOS/nixpkgs/release-24.05";
|
||||
nixpkgs-unstable.url = "github:NixOS/nixpkgs/2d2a9ddbe3f2c00747398f3dc9b05f7f2ebb0f53";
|
||||
|
||||
nix-darwin = {
|
||||
url = "github:LnL7/nix-darwin/470f87c1827b51169ed4f91cdbdfd48417bfff3d";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
inputs.nixpkgs.follows = "nixpkgs-stable";
|
||||
};
|
||||
firefox-darwin = {
|
||||
url = "github:bandithedoge/nixpkgs-firefox-darwin";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
inputs.nixpkgs.follows = "nixpkgs-stable";
|
||||
};
|
||||
brew-nix = {
|
||||
url = "github:BatteredBunny/brew-nix/d3d3a2666e5330e83b6a64b1eb3e1e9380f6da9b";
|
||||
inputs.nix-darwin.follows = "nix-darwin";
|
||||
inputs.brew-api.follows = "brew-api";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
inputs.nixpkgs.follows = "nixpkgs-stable";
|
||||
};
|
||||
brew-api = {
|
||||
url = "github:BatteredBunny/brew-api";
|
||||
|
@ -57,12 +58,12 @@
|
|||
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager/64c6325b28ebd708653dd41d88f306023f296184";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
inputs.nixpkgs.follows = "nixpkgs-unstable"; # we need unstable (24.11) for programs.floorp. FIXME: switch to stable once 24.11 become stable
|
||||
};
|
||||
|
||||
system-manager = {
|
||||
url = "github:numtide/system-manager/c93e62f2e962b54fd961798731d25eaa5778dbe2";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
inputs.nixpkgs.follows = "nixpkgs-stable";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue