removed nixpkgs-small, trying env var
This commit is contained in:
parent
a689137a11
commit
cc4e8b86cd
1
base.nix
1
base.nix
@ -48,7 +48,6 @@
|
|||||||
console = {
|
console = {
|
||||||
font = "Lat2-Terminus16";
|
font = "Lat2-Terminus16";
|
||||||
keyMap = "us";
|
keyMap = "us";
|
||||||
# useXkbConfig = true; # use xkbOptions in tty.
|
|
||||||
};
|
};
|
||||||
security = {
|
security = {
|
||||||
polkit.enable = true;
|
polkit.enable = true;
|
||||||
|
|||||||
17
flake.lock
generated
17
flake.lock
generated
@ -373,22 +373,6 @@
|
|||||||
"url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
|
"url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-small": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1731518944,
|
|
||||||
"narHash": "sha256-tmzIz0iCCnnqXFS/lGkl1/+lGMn8lTiMshzd0v8LwYk=",
|
|
||||||
"owner": "nixos",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "18979df9f0be9d69f0e4d35059914c1a868c79b8",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nixos",
|
|
||||||
"ref": "nixos-unstable-small",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs-stable": {
|
"nixpkgs-stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730741070,
|
"lastModified": 1730741070,
|
||||||
@ -517,7 +501,6 @@
|
|||||||
"nixos-cosmic": "nixos-cosmic",
|
"nixos-cosmic": "nixos-cosmic",
|
||||||
"nixpkgs": "nixpkgs_3",
|
"nixpkgs": "nixpkgs_3",
|
||||||
"nixpkgs-chrome": "nixpkgs-chrome",
|
"nixpkgs-chrome": "nixpkgs-chrome",
|
||||||
"nixpkgs-small": "nixpkgs-small",
|
|
||||||
"sops-nix": "sops-nix",
|
"sops-nix": "sops-nix",
|
||||||
"ucodenix": "ucodenix",
|
"ucodenix": "ucodenix",
|
||||||
"zen-browser": "zen-browser"
|
"zen-browser": "zen-browser"
|
||||||
|
|||||||
21
flake.nix
21
flake.nix
@ -2,7 +2,6 @@
|
|||||||
description = "JawZ NixOS flake setup";
|
description = "JawZ NixOS flake setup";
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
|
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
|
||||||
nixpkgs-small.url = "github:nixos/nixpkgs?ref=nixos-unstable-small";
|
|
||||||
nixpkgs-chrome.url = "github:nixos/nixpkgs?rev=05bbf675397d5366259409139039af8077d695ce";
|
nixpkgs-chrome.url = "github:nixos/nixpkgs?rev=05bbf675397d5366259409139039af8077d695ce";
|
||||||
ucodenix.url = "github:e-tho/ucodenix";
|
ucodenix.url = "github:e-tho/ucodenix";
|
||||||
nix-gaming.url = "github:fufexan/nix-gaming";
|
nix-gaming.url = "github:fufexan/nix-gaming";
|
||||||
@ -23,10 +22,7 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
outputs =
|
outputs =
|
||||||
{
|
{ self, ... }@inputs:
|
||||||
self,
|
|
||||||
...
|
|
||||||
}@inputs:
|
|
||||||
let
|
let
|
||||||
inherit (self) outputs;
|
inherit (self) outputs;
|
||||||
lib = inputs.nixpkgs.lib // inputs.home-manager.lib;
|
lib = inputs.nixpkgs.lib // inputs.home-manager.lib;
|
||||||
@ -37,21 +33,16 @@
|
|||||||
inherit system;
|
inherit system;
|
||||||
config.allowUnfree = true;
|
config.allowUnfree = true;
|
||||||
};
|
};
|
||||||
makePkgsMain =
|
pkgs = makePkgs inputs.nixpkgs;
|
||||||
name: makePkgs (if name == "workstation" then inputs.nixpkgs else inputs.nixpkgs-small);
|
|
||||||
createConfig =
|
|
||||||
name:
|
|
||||||
let
|
|
||||||
pkgs = makePkgsMain name;
|
|
||||||
pkgs-chrome = makePkgs inputs.nixpkgs-chrome;
|
pkgs-chrome = makePkgs inputs.nixpkgs-chrome;
|
||||||
in
|
overlayFile = import ./overlay.nix { inherit pkgs pkgs-chrome; };
|
||||||
{
|
createConfig = name: {
|
||||||
inherit system;
|
inherit system;
|
||||||
specialArgs = {
|
specialArgs = {
|
||||||
inherit inputs outputs pkgs;
|
inherit inputs outputs;
|
||||||
};
|
};
|
||||||
modules = [
|
modules = [
|
||||||
{ nixpkgs.overlays = [ (import ./overlay.nix { inherit pkgs pkgs-chrome; }) ]; }
|
{ nixpkgs.overlays = [ overlayFile ]; }
|
||||||
./hosts/${name}/configuration.nix
|
./hosts/${name}/configuration.nix
|
||||||
inputs.sops-nix.nixosModules.sops
|
inputs.sops-nix.nixosModules.sops
|
||||||
inputs.nixos-cosmic.nixosModules.default
|
inputs.nixos-cosmic.nixosModules.default
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user