From 14150bb91bfe1a389885cdc3c8a5314dd4d29ba7 Mon Sep 17 00:00:00 2001
From: yokodake <ngyj@cinnabar.fr>
Date: Thu, 5 Mar 2020 11:39:32 +0100
Subject: [PATCH] updating nix config (deprecated warnings)

trace: warning: In file hw-laptop.nix
a list is being assigned to the option config.boot.initrd.luks.devices.
This will soon be an error as type loaOf is deprecated.
See https://github.com/NixOS/nixpkgs/pull/63103 for more information.
Do
  boot.initrd.luks.devices =
    { main = {...}; }
instead of
  boot.initrd.luks.devices =
    [ { name = "main"; ...} ]

trace: warning: The option `i18n.consoleKeyMap' defined in `configuration.nix' has been renamed to `console.keyMap'.

trace: warning: The following options are deprecated:
  - services.xserver.desktopManager.default
  - services.xserver.windowManager.default
Please use
  services.xserver.displayManager.defaultSession = "none+xmonad";
instead.
---
 configuration.nix | 17 +++++++----------
 hw-laptop.nix     |  9 ++++-----
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 4f13d0a..03f3df2 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -9,10 +9,8 @@
   systemd.packages = [ pkgs.systemd-cryptsetup-generator ];
 
   # Select internationalisation properties.
-  i18n = {
-    consoleKeyMap = "us";
-    defaultLocale = "en_US.UTF-8";
-  };
+  console.keyMap = "us";
+  i18n.defaultLocale = "en_US.UTF-8";
 
   # Set your time zone.
   time.timeZone = "Europe/Paris";
@@ -32,16 +30,14 @@
       layout = "us,us(intl)";
       xkbOptions = "grp:shift_caps_toggle,nbsp:level2";
 
-      desktopManager = {
-        default = "none";
-        xterm.enable = false;
-      };
+      desktopManager.xterm.enable = false;
 
       #windowManager.i3.enable = true;
       windowManager.xmonad.enable = true;
       windowManager.xmonad.extraPackages = self: [ self.xmonad-contrib ];
       windowManager.xmonad.haskellPackages = pkgs.haskell.packages.ghc865;
-      windowManager.default = "xmonad";
+
+      displayManager.defaultSession = "none+xmonad";
     };
     sshd.enable = true;
   };
@@ -104,10 +100,12 @@
     anki
     binutils
     cabal2nix
+    clang-tools
     curl
     emacs
     feh
     ffmpeg
+    filezilla
     firefox-devedition-bin
     git
     haskell.compiler.ghc881
@@ -151,7 +149,6 @@
     xscreensaver
     zathura
     zip
-    clang-tools
   ];
 
   nix.gc.automatic = true;
diff --git a/hw-laptop.nix b/hw-laptop.nix
index 8d9ab82..97e1cf2 100644
--- a/hw-laptop.nix
+++ b/hw-laptop.nix
@@ -32,13 +32,12 @@
     [ { device = "/dev/disk/by-uuid/f9af689c-8d7c-4646-a573-58f0ea55e75d"; }
     ];
 
-  boot.initrd.luks.devices = [
-    {
-      name = "main";
+  boot.initrd.luks.devices = {
+    main = {
       device = "/dev/disk/by-uuid/84b64e62-2879-4f44-85e4-db209dc6e8b1";
       preLVM = true;
-    }
-  ];
+    };
+  };
 
   nix.maxJobs = lib.mkDefault 4;
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";