seang96/nixos-config
1
0
Fork 0
mirror of https://github.com/buckley310/nixos-config.git synced 2024-09-14 18:14:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

move NIX_PATH from cli to baseline

Browse source
This commit is contained in:
Sean Buckley 2021-08-03 12:11:50 -04:00
parent 96ebc2f60b
commit f4a7bae858
2 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
modules/baseline.nix
View file

@ -1,4 +1,9 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
let
sc-scripts = map
(x: (pkgs.writeShellScriptBin "sc-${x}" "nixos-rebuild ${x} --refresh --flake github:buckley310/nixos-config"))
[ "switch" "build" "boot" ];
in
{ {
time.timeZone = "US/Eastern"; time.timeZone = "US/Eastern";
i18n.supportedLocales = [ "en_US.UTF-8/UTF-8" ]; i18n.supportedLocales = [ "en_US.UTF-8/UTF-8" ];
@ -13,9 +18,14 @@
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
environment.variables.NIXPKGS_ALLOW_UNFREE = "1"; environment.variables.NIXPKGS_ALLOW_UNFREE = "1";
environment.systemPackages = map environment.systemPackages = sc-scripts ++ [
(x: (pkgs.writeShellScriptBin "sc-${x}" "nixos-rebuild ${x} --refresh --flake github:buckley310/nixos-config")) (pkgs.runCommand "nixpkgs" { } ''
[ "switch" "build" "boot" ]; mkdir -p $out/share
ln -s ${pkgs.path} $out/share/nixpkgs
'')
];
nix.nixPath = [ "nixpkgs=/run/current-system/sw/share/nixpkgs" ];
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [
"e /nix/var/log - - - 30d" "e /nix/var/log - - - 30d"

9
modules/cli.nix
View file

@ -1,4 +1,4 @@
{ config, pkgs, lib, modulesPath, ... }: { config, pkgs, lib, ... }:
let let
powerlineOpts = [ powerlineOpts = [
"-mode=flat" "-mode=flat"
@ -79,15 +79,8 @@ in
echo echo
'') '')
(runCommand "nixpkgs" { } ''
mkdir -p $out/share
ln -s ${modulesPath}/../.. $out/share/nixpkgs
'')
]; ];
nix.nixPath = [ "nixpkgs=/run/current-system/sw/share/nixpkgs" ];
environment.etc."pip.conf".text = '' environment.etc."pip.conf".text = ''
[install] [install]
no-warn-script-location = false no-warn-script-location = false