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

add networks, fix install script

Browse Source
This commit is contained in:
Dmitriy Holkin 2019-10-10 20:11:05 +04:00
parent 3d0ddd87e8
commit 16bc3114c6
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
install/install.sh
View File

@ -1,9 +1,9 @@
#!/usr/bin/env bash #!/usr/bin/env bash
ENCRYPT_ROOT=false ENCRYPT_ROOT=true
ENCRYPT_SWAP=false ENCRYPT_SWAP=false
FORMAT_BOOT_PARTITION=false FORMAT_BOOT_PARTITION=false
DEVICE_NAME=NixOS-VM DEVICE_NAME=Dell-Laptop
DEVICE=/dev/nvme0n1 DEVICE=/dev/nvme0n1
BOOT_PARTITION=/dev/nvme0n1p1 BOOT_PARTITION=/dev/nvme0n1p1
SWAP_PARTITION=/dev/nvme0n1p3 SWAP_PARTITION=/dev/nvme0n1p3
@ -19,9 +19,9 @@ if [[ "$FORMAT_BOOT_PARTITION" == true ]]; then
fi fi
# Create luks partition # Create luks partition
if [[ "$ENCRYPT_ROOT" == true ]]; then if [[ "$ENCRYPT_ROOT" == true ]]; then
ROOT_NAME=/dev/mapper/$ROOT_NAME
cryptsetup --type luks2 --cipher aes-xts-plain64 --key-size 256 --hash sha512 luksFormat $ROOT_PARTITION cryptsetup --type luks2 --cipher aes-xts-plain64 --key-size 256 --hash sha512 luksFormat $ROOT_PARTITION
cryptsetup luksOpen $ROOT_PARTITION $ROOT_NAME cryptsetup luksOpen $ROOT_PARTITION $ROOT_NAME
ROOT_NAME=/dev/mapper/$ROOT_NAME
mkfs.btrfs -f -L root $ROOT_NAME mkfs.btrfs -f -L root $ROOT_NAME
mount -t btrfs -o compress=zstd,noatime,ssd $ROOT_NAME /mnt mount -t btrfs -o compress=zstd,noatime,ssd $ROOT_NAME /mnt
else else

16
modules/network.nix
View File

@ -10,12 +10,20 @@
}; };
networks.Alukard.pskRaw = networks.Alukard.pskRaw =
"5ef5fe07c1f062e4653fce9fe138cc952c20e284ae1ca50babf9089b5cba3a5a"; "5ef5fe07c1f062e4653fce9fe138cc952c20e284ae1ca50babf9089b5cba3a5a";
networks.AlukardAP.pskRaw = networks.AlukardAP = {
"b8adc07cf1a9c7a7a5946c2645283b27ab91a8af4c065e5f9cde03ed1815811c"; pskRaw = "b8adc07cf1a9c7a7a5946c2645283b27ab91a8af4c065e5f9cde03ed1815811c";
priority= 3;
};
networks.SladkiySon.pskRaw = networks.SladkiySon.pskRaw =
"86b1c8c60d3e99145bfe90e0af9bf552540d34606bb0d00b314f5b5960e46496"; "86b1c8c60d3e99145bfe90e0af9bf552540d34606bb0d00b314f5b5960e46496";
networks.AlukardAP_5GHz.pskRaw = networks.AlukardAP_5GHz = {
"fb8a89b5602442be083d2a1e67db55c6ff05a306551bcd08a79b6c6bbc97fc30"; pskRaw = "fb8a89b5602442be083d2a1e67db55c6ff05a306551bcd08a79b6c6bbc97fc30";
priority= 2;
};
networks.POAS = {
pskRaw = "6cfdb04f3e2d4279a4651608c9c73277708c67f7f1435b61228ecf00841e5155";
priority = 1;
};
# interfaces = ["wlan0"]; # interfaces = ["wlan0"];
userControlled.enable = true; userControlled.enable = true;
}; };

2
modules/power.nix
View File

@ -16,7 +16,7 @@ with deviceSpecific; {
CPU_HWP_ON_BAT=balance_power CPU_HWP_ON_BAT=balance_power
CPU_BOOST_ON_AC=1 CPU_BOOST_ON_AC=1
CPU_BOOST_ON_BAT=0 CPU_BOOST_ON_BAT=0
DISK_DEVICES="nvme0n1 sda" DISK_DEVICES="sda"
DISK_APM_LEVEL_ON_AC="255 254" DISK_APM_LEVEL_ON_AC="255 254"
DISK_APM_LEVEL_ON_BAT="128 128" DISK_APM_LEVEL_ON_BAT="128 128"
''; '';