Changing the structure of the configuration
This commit is contained in:
parent
be8c206e60
commit
c06849e70f
12 changed files with 2 additions and 24 deletions
4
.gitignore
vendored
4
.gitignore
vendored
|
|
@ -1,4 +1,2 @@
|
||||||
/hardware-configuration.nix
|
|
||||||
/hardware.nix
|
|
||||||
/result
|
/result
|
||||||
*.qcow2
|
*.qcow2
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,6 @@
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
./packages.nix
|
./packages.nix
|
||||||
./system.nix
|
./system.nix
|
||||||
# ./hardware.nix # Set in the up.sh script among the files in hardware/
|
|
||||||
./networking.nix
|
./networking.nix
|
||||||
./user/user.nix
|
./user/user.nix
|
||||||
./specialisation.nix
|
./specialisation.nix
|
||||||
|
|
@ -10,7 +10,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { self, nixpkgs, nixos-hardware, nix-flatpak, ... }@attrs: {
|
outputs = { self, nixpkgs, nixos-hardware, nix-flatpak, ... }@attrs: {
|
||||||
nixosConfigurations.lyes-nix = nixpkgs.lib.nixosSystem {
|
nixosConfigurations.lyes-pc = nixpkgs.lib.nixosSystem {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
specialArgs = attrs;
|
specialArgs = attrs;
|
||||||
modules = [
|
modules = [
|
||||||
|
|
|
||||||
19
up.sh
19
up.sh
|
|
@ -1,19 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
rm *.qcow2 result 2> /dev/null
|
|
||||||
|
|
||||||
# if [ -n "$1" ]; then
|
|
||||||
# echo "Changing hardware"
|
|
||||||
# cp hardware/"$1".nix hardware.nix
|
|
||||||
# exit 0
|
|
||||||
# fi
|
|
||||||
|
|
||||||
if [ "$EUID" -ne 0 ]; then
|
|
||||||
echo "Please run as root"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "Updating configuration"
|
|
||||||
rm hardware-configuration.nix
|
|
||||||
sudo cp -rf * /etc/nixos/
|
|
||||||
cp /etc/nixos/hardware-configuration.nix .
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue