Fix LUKS, add i3lock hotkey

This commit is contained in:
Dmitriy Holkin 2019-09-23 14:04:13 +04:00
parent 501c1eb165
commit 534e199de1
4 changed files with 9 additions and 5 deletions

View File

@ -1,14 +1,14 @@
#!/usr/bin/env bash #!/usr/bin/env bash
DEVICE=/dev/nvme0n1 DEVICE=/dev/nvme0n1
BOOT_PARTITION=/dev/nvme0n1p1 BOOT_PARTITION=/dev/nvme0n1p1
SWAP_PARTITION=/dev/nvme0n1p2 SWAP_PARTITION=/dev/nvme0n1p3
ROOT_PARTITION=/dev/nvme0n1p3 ROOT_PARTITION=/dev/nvme0n1p2
SWAP_NAME=cryptswap SWAP_NAME=cryptswap
ROOT_NAME=cryptnixos ROOT_NAME=cryptnixos
gdisk $DEVICE gdisk $DEVICE
mkfs.vfat -n BOOT $BOOT_PARTITION # mkfs.vfat -n BOOT $BOOT_PARTITION
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
mkfs.btrfs -f -L root /dev/mapper/$ROOT_NAME mkfs.btrfs -f -L root /dev/mapper/$ROOT_NAME
@ -34,4 +34,5 @@ mkfs.ext2 -L $SWAP_NAME $SWAP_PARTITION 1M
nixos-generate-config --root /mnt/ nixos-generate-config --root /mnt/
cp ./min-config.nix /mnt/etc/nixos/configuration.nix cp ./min-config.nix /mnt/etc/nixos/configuration.nix
nano /mnt/etc/nixos/configuration.nix nano /mnt/etc/nixos/configuration.nix
read -p "Press enter to continue"
nixos-install -I nixpkgs=https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz nixos-install -I nixpkgs=https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz

View File

@ -14,6 +14,7 @@ with deviceSpecific; {
xclip xclip
bc bc
sysstat sysstat
xdotool
lxqt.pavucontrol-qt lxqt.pavucontrol-qt
bibata-cursors bibata-cursors

View File

@ -22,7 +22,7 @@ with deviceSpecific; {
else else
[ "noatime" "compress=zstd" ]; [ "noatime" "compress=zstd" ];
}; };
"/nix-store" = { "/nix/store" = {
options = if isSSD then options = if isSSD then
[ "ssd" "noatime" "compress=zstd" ] [ "ssd" "noatime" "compress=zstd" ]
else else

View File

@ -108,6 +108,8 @@ in {
"${modifier}+y" = "exec ${pkgs.youtube-to-mpv}/bin/yt-mpv"; "${modifier}+y" = "exec ${pkgs.youtube-to-mpv}/bin/yt-mpv";
"${modifier}+Shift+y" = "exec ${pkgs.youtube-to-mpv}/bin/yt-mpv --no-video"; "${modifier}+Shift+y" = "exec ${pkgs.youtube-to-mpv}/bin/yt-mpv --no-video";
"${modifier}+Shift+l" = "exec ${pkgs.i3lock-fancy}/bin/i3lock-fancy -f Roboto-Medium";
"${modifier}+Print" = script "screenshot" "${modifier}+Print" = script "screenshot"
"${pkgs.maim}/bin/maim Pictures/$(date +%s).png"; "${pkgs.maim}/bin/maim Pictures/$(date +%s).png";
"${modifier}+Control+Print" = script "screenshot-copy" "${modifier}+Control+Print" = script "screenshot-copy"