nixos: improve console and fix ridcully

2 files changed, 15 insertions, 0 deletions

diff --git a/nixos/machine/ridcully.nix b/nixos/machine/ridcully.nix
index 4c0bba9..7151878 100644
--- a/nixos/machine/ridcully.nix
+++ b/nixos/machine/ridcully.nix
@@ -23,18 +23,22 @@ with lib;
     fileSystems = {
       "/" = {
         device = "/dev/mapper/encroot";
+        fsType = "btrfs";
         options = ["compress=lzo" "subvol=@nix"];
       };
       "/home" = {
         device = "/dev/mapper/encroot";
+        fsType = "btrfs";
         options = ["compress=lzo" "subvol=@home"];
       };
       "/boot" = {
         device = "/dev/disk/by-uuid/C1A0-B7C9";
+        fsType = "vfat";
       };
 
       "/home2" = {
         device = "/dev/mapper/enchdd";
+        fsType = "btrfs";
         options = ["compress=lzo" "subvol=@home"];
       };
     };
diff --git a/nixos/modules/generic.nix b/nixos/modules/generic.nix
index 34f952c..b8b2a6e 100644
--- a/nixos/modules/generic.nix
+++ b/nixos/modules/generic.nix
@@ -98,6 +98,17 @@ with lib;
 
     time.timeZone = "Europe/Prague";
     i18n.defaultLocale = "en_US.UTF-8";
+
+    console = {
+      colors = [
+        "2e3440" "3b4252" "434c5e" "4c566a" "d8dee9" "e5e9f0" "eceff4" "8fbcbb"
+        "88c0d0" "81a1c1" "5e81ac" "bf616a" "d08770" "ebcb8b" "a3be8c" "b48ead"
+      ];
+      earlySetup = true;
+      useXkbConfig = true;
+    };
+    services.xserver.xkbOptions = "grp:alt_shift_toggle,caps:escape";
+    services.gpm.enable = true;
   };
 
 }