From 534e199de10ba51af3e0f43ef52f00f64e4c4a62 Mon Sep 17 00:00:00 2001
From: Dmitriy Holkin <alukard.develop@gmail.com>
Date: Mon, 23 Sep 2019 14:04:13 +0400
Subject: [PATCH] Fix LUKS, add i3lock hotkey

---
 install/install.sh                | 9 +++++----
 modules/applications/packages.nix | 1 +
 modules/filesystems.nix           | 2 +-
 modules/workspace/i3/default.nix  | 2 ++
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/install/install.sh b/install/install.sh
index 021d6e1..94d5716 100644
--- a/install/install.sh
+++ b/install/install.sh
@@ -1,14 +1,14 @@
 #!/usr/bin/env bash
 DEVICE=/dev/nvme0n1
 BOOT_PARTITION=/dev/nvme0n1p1
-SWAP_PARTITION=/dev/nvme0n1p2
-ROOT_PARTITION=/dev/nvme0n1p3
+SWAP_PARTITION=/dev/nvme0n1p3
+ROOT_PARTITION=/dev/nvme0n1p2
 SWAP_NAME=cryptswap
 ROOT_NAME=cryptnixos
 
 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 luksOpen $ROOT_PARTITION $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/
 cp ./min-config.nix /mnt/etc/nixos/configuration.nix
 nano /mnt/etc/nixos/configuration.nix
-nixos-install -I nixpkgs=https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz
\ No newline at end of file
+read -p "Press enter to continue"
+nixos-install -I nixpkgs=https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz
diff --git a/modules/applications/packages.nix b/modules/applications/packages.nix
index bb187a8..5b9a257 100644
--- a/modules/applications/packages.nix
+++ b/modules/applications/packages.nix
@@ -14,6 +14,7 @@ with deviceSpecific; {
     xclip
     bc
     sysstat
+    xdotool
 
     lxqt.pavucontrol-qt
     bibata-cursors
diff --git a/modules/filesystems.nix b/modules/filesystems.nix
index 1155c4d..80616c4 100644
--- a/modules/filesystems.nix
+++ b/modules/filesystems.nix
@@ -22,7 +22,7 @@ with deviceSpecific; {
       else
         [ "noatime" "compress=zstd" ];
     };
-    "/nix-store" = {
+    "/nix/store" = {
       options = if isSSD then
         [ "ssd" "noatime" "compress=zstd" ]
       else
diff --git a/modules/workspace/i3/default.nix b/modules/workspace/i3/default.nix
index 9d80933..6175390 100644
--- a/modules/workspace/i3/default.nix
+++ b/modules/workspace/i3/default.nix
@@ -108,6 +108,8 @@ in {
           "${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+l" = "exec ${pkgs.i3lock-fancy}/bin/i3lock-fancy -f Roboto-Medium";
+
           "${modifier}+Print" = script "screenshot"
             "${pkgs.maim}/bin/maim Pictures/$(date +%s).png";
           "${modifier}+Control+Print" = script "screenshot-copy"