AtaraxiaDev/nixos-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pass correct nixpkgs, add repl

Browse Source
This commit is contained in:
Dmitriy Kholkin 2024-08-04 13:40:32 +03:00
parent c3b15d99ec
commit 0c46437a19
Signed by: AtaraxiaDev
GPG Key ID: FD266B810DF48DF2
3 changed files with 43 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
flake.nix
View File

@ -97,9 +97,9 @@
patches = p; patches = p;
}; };
# Get nixosSystem func from patched nixpkgs # Get nixosSystem func from patched nixpkgs
nixosSystem = n: p: import ((nixpkgs-patched n p) + "/nixos/lib/eval-config.nix"); nixosSystem = n: import (n + "/nixos/lib/eval-config.nix");
# Make host config # Make host config
mkHost = name: nixosSystem: mkHost = name: nixosSystem: self-nixpkgs:
nixosSystem { nixosSystem {
system = builtins.readFile (./machines + "/${name}/system"); system = builtins.readFile (./machines + "/${name}/system");
modules = builtins.attrValues self.customModules ++ [ modules = builtins.attrValues self.customModules ++ [
@ -108,7 +108,7 @@
{ nixpkgs.config.allowUnfree = true; } { nixpkgs.config.allowUnfree = true; }
inputs.sops-nix.nixosModules.sops inputs.sops-nix.nixosModules.sops
]; ];
specialArgs = { inherit self; inherit inputs; secrets = ./secrets; }; specialArgs = { inherit self inputs self-nixpkgs; secrets = ./secrets; };
}; };
patchesPath = map (x: ./patches + "/${x}"); patchesPath = map (x: ./patches + "/${x}");
@ -152,8 +152,10 @@
}; };
flake = let flake = let
unstable = nixosSystem inputs.nixpkgs unstable-patches; unstable-nixpkgs = nixpkgs-patched inputs.nixpkgs unstable-patches;
stable = nixosSystem inputs.nixpkgs-stable stable-patches; stable-nixpkgs = nixpkgs-patched inputs.nixpkgs-stable stable-patches;
unstable-system = nixosSystem unstable-nixpkgs;
stable-system = nixosSystem stable-nixpkgs;
shared-patches = patchesPath [ ]; shared-patches = patchesPath [ ];
unstable-patches = shared-patches ++ patchesPath [ unstable-patches = shared-patches ++ patchesPath [
@ -173,15 +175,14 @@
customProfiles = builtins.listToAttrs (findModules ./profiles); customProfiles = builtins.listToAttrs (findModules ./profiles);
customRoles = import ./roles; customRoles = import ./roles;
secretsDir = ./secrets; secretsDir = ./secrets;
nixpkgs-unstable-patched = nixpkgs-patched inputs.nixpkgs unstable-patches; inherit unstable-nixpkgs;
nixosConfigurations = withSystem "x86_64-linux" ({ ... }: nixosConfigurations = withSystem "x86_64-linux" ({ ... }:
{ {
AMD-Workstation = mkHost "AMD-Workstation" unstable; AMD-Workstation = mkHost "AMD-Workstation" unstable-system unstable-nixpkgs;
Dell-Laptop = mkHost "Dell-Laptop" unstable; Dell-Laptop = mkHost "Dell-Laptop" unstable-system unstable-nixpkgs;
Home-Hypervisor = mkHost "Home-Hypervisor" unstable; Home-Hypervisor = mkHost "Home-Hypervisor" unstable-system unstable-nixpkgs;
NixOS-VPS = mkHost "NixOS-VPS" stable; NixOS-VPS = mkHost "NixOS-VPS" stable-system stable-nixpkgs;
NixOS-VM = mkHost "NixOS-VM" unstable;
} }
); );

26
profiles/nix/default.nix
View File

@ -1,10 +1,10 @@
{ config, lib, pkgs, inputs, ... }: { { config, lib, pkgs, inputs, self-nixpkgs, ... }: {
nix = { nix = {
package = pkgs.lix; package = pkgs.lix;
nixPath = lib.mkForce [ "self=/etc/self/compat" "nixpkgs=/etc/nixpkgs" ]; nixPath = [ "self=/etc/self" "nixpkgs=/etc/nixpkgs" ];
registry.nixpkgs.flake = self-nixpkgs;
registry.self.flake = inputs.self; registry.self.flake = inputs.self;
registry.nixpkgs.flake = inputs.nixpkgs;
optimise.automatic = lib.mkDefault true; optimise.automatic = lib.mkDefault true;
@ -18,7 +18,6 @@
# Prevent Nix from fetching the registry every time # Prevent Nix from fetching the registry every time
flake-registry = ${inputs.flake-registry}/flake-registry.json flake-registry = ${inputs.flake-registry}/flake-registry.json
''; '';
settings = { settings = {
auto-optimise-store = false; auto-optimise-store = false;
require-sigs = true; require-sigs = true;
@ -32,6 +31,7 @@
"https://numtide.cachix.org" "https://numtide.cachix.org"
"https://devenv.cachix.org" "https://devenv.cachix.org"
"https://ezkea.cachix.org" "https://ezkea.cachix.org"
"https://nyx.chaotic.cx"
]; ];
trusted-public-keys = [ trusted-public-keys = [
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
@ -43,14 +43,30 @@
"numtide.cachix.org-1:2ps1kLBUWjxIneOy1Ik6cQjb41X0iXVXeHigGmycPPE=" "numtide.cachix.org-1:2ps1kLBUWjxIneOy1Ik6cQjb41X0iXVXeHigGmycPPE="
"devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw=" "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw="
"ezkea.cachix.org-1:ioBmUbJTZIKsHmWWXPe1FSFbeVe+afhfgqgTSNd34eI=" "ezkea.cachix.org-1:ioBmUbJTZIKsHmWWXPe1FSFbeVe+afhfgqgTSNd34eI="
"nyx.chaotic.cx-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8="
"chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8="
]; ];
trusted-users = [ "root" config.mainuser "deploy" "@wheel" ]; trusted-users = [ "root" config.mainuser "deploy" "@wheel" ];
use-xdg-base-directories = true; use-xdg-base-directories = true;
}; };
}; };
environment.etc.nixpkgs.source = inputs.nixpkgs; environment.etc.nixpkgs.source = self-nixpkgs;
environment.etc.self.source = inputs.self; environment.etc.self.source = inputs.self;
environment.systemPackages = let
repl-home = "/home/${config.mainuser}/nixos-config/repl.nix";
repl = pkgs.writeShellScriptBin "repl" ''
# source /etc/set-environment
if [ -f "${repl-home}" ]; then
echo "use home flake"
nix repl "${repl-home}" "$@"
else
echo "use system flake"
nix repl "/etc/self/repl.nix" "$@"
fi
'';
in [ repl ];
persist.state.homeDirectories = [ ".local/share/nix" ]; persist.state.homeDirectories = [ ".local/share/nix" ];
} }

10
repl.nix Normal file
View File

@ -0,0 +1,10 @@
let
flake = builtins.getFlake (toString ./.);
nixpkgs = import <nixpkgs> { };
in
{ inherit flake; }
// flake
// builtins
// nixpkgs
// nixpkgs.lib
// flake.nixosConfigurations