Update build default.nix

This commit is contained in:
Alexander Bantyev 2020-04-21 01:29:16 +03:00
parent 2ddc809118
commit 7f216a1d71
2 changed files with 4 additions and 6 deletions

2
build
View File

@ -7,7 +7,7 @@ nixpkgs=$(nix eval --raw '(import ./nix/sources.nix).nixpkgs')
nix-store --realise $nixpkgs nix-store --realise $nixpkgs
export NIX_PATH=nixpkgs=$nixpkgs:nixos-config=/etc/nixos/configuration.nix export NIX_PATH=nixpkgs=$nixpkgs:nixos-config="`pwd`"
if [[ -n $INSIDE_EMACS ]] if [[ -n $INSIDE_EMACS ]]
then then

View File

@ -5,21 +5,19 @@
# This is main nixos configuration # This is main nixos configuration
# To use this configuration: # To use this configuration:
# 1. Add your own secret.nix to this folder # 1. Add your own secret.nix to this folder
# 2. Replace /etc/nixos/configuration.nix with the following: # 2. ./install or ./bootstrap
# import /path/to/this/nixos-config "Vendor-Type"
# 3. Log in to application and services where neccesary # 3. Log in to application and services where neccesary
device: # This is the device we're on now
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
let sources = import ./nix/sources.nix; let sources = import ./nix/sources.nix;
in { in rec {
imports = [ imports = [
"${./hardware-configuration}/${device}.nix" "${./hardware-configuration}/${device}.nix"
"${sources.home-manager}/nixos" "${sources.home-manager}/nixos"
(import ./modules device) (import ./modules device)
]; ];
inherit device; device = builtins.replaceStrings ["\n"] [""] (builtins.readFile /etc/hostname);
system.stateVersion = "18.03"; system.stateVersion = "18.03";
} }