teutat3s/os
2
0
Fork 0
forked from pub-solar/os
Code Pull requests Activity

nix#registry: update names

Browse source 
Continuing the work from 487fa7ea26,
simplify the registry entries a bit more by simply refering to the
input flakes. Also add alias `orch` for easy search `override`.
This commit is contained in:
Timothy DeHerrera 2021-03-01 20:11:23 -07:00
parent 8733f2b5dc
commit 44bae21564
No known key found for this signature in database
GPG key ID: 8985725DB5B0C122
2 changed files with 21 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
hosts/default.nix
View file

@ -37,49 +37,31 @@ let
modules; modules;
}; };
global = global = {
let home-manager.useGlobalPkgs = true;
inherit (lock) nodes; home-manager.useUserPackages = true;
lock = builtins.fromJSON (builtins.readFile ../flake.lock); hardware.enableRedistributableFirmware = lib.mkDefault true;
in
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
hardware.enableRedistributableFirmware = lib.mkDefault true; networking.hostName = hostName;
networking.hostName = hostName; nix.nixPath = [
"nixpkgs=${nixos}"
"nixos-config=${self}/compat/nixos"
"home-manager=${home}"
];
nix.nixPath = [ nixpkgs = { inherit pkgs; };
"nixpkgs=${nixos}"
"nixos-config=${self}/compat/nixos"
"home-manager=${home}"
];
nixpkgs = { inherit pkgs; }; nix.registry = {
devos.flake = self;
nix.registry = { nixos.flake = nixos;
flk.flake = self; override.flake = override;
nixos = {
exact = true;
from = {
id = "nixos";
type = "indirect";
};
to = {
inherit (nixos) lastModified narHash rev;
path = override.outPath;
type = "path";
};
};
};
system.configurationRevision = lib.mkIf (self ? rev) self.rev;
}; };
system.configurationRevision = lib.mkIf (self ? rev) self.rev;
};
local = { local = {
require = [ require = [
(import "${toString ./.}/${hostName}.nix") (import "${toString ./.}/${hostName}.nix")

19
profiles/core/default.nix
View file

@ -67,7 +67,8 @@ in
ns = "n search --no-update-lock-file"; ns = "n search --no-update-lock-file";
nf = "n flake"; nf = "n flake";
nepl = "n repl '<nixpkgs>'"; nepl = "n repl '<nixpkgs>'";
srch = "nsni"; srch = "ns nixos";
orch = "ns override";
nrb = ifSudo "sudo nixos-rebuild"; nrb = ifSudo "sudo nixos-rebuild";
mn = '' mn = ''
manix "" | grep '^# ' | sed 's/^# \(.*\) (.*/\1/;s/ (.*//;s/^# //' | sk --preview="manix '{}'" | xargs manix manix "" | grep '^# ' | sed 's/^# \(.*\) (.*/\1/;s/ (.*//;s/^# //' | sk --preview="manix '{}'" | xargs manix
@ -94,21 +95,7 @@ in
dn = ifSudo "s systemctl stop"; dn = ifSudo "s systemctl stop";
jtl = "journalctl"; jtl = "journalctl";
} // lib.mapAttrs' };
(n: v:
let
prefix = lib.concatStrings (lib.take 2 (lib.stringToCharacters n));
ref = from:
if from ? ref
then "ns ${from.id}/${from.ref}"
else "ns ${from.id}";
in
lib.nameValuePair
"ns${prefix}"
(ref v.from)
)
config.nix.registry;
}; };
fonts = { fonts = {