From edc6346d0d13f18c5f182b2e75f55b542ac9c583 Mon Sep 17 00:00:00 2001
From: Dmitriy Holkin <alukard.develop@gmail.com>
Date: Wed, 15 Jan 2020 05:48:39 +0400
Subject: [PATCH] update

---
 modules/network.nix          |  2 +-
 modules/packages.nix         |  7 -------
 modules/workspace/locale.nix | 10 ++++++----
 modules/xserver.nix          |  4 ++--
 4 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/modules/network.nix b/modules/network.nix
index a6e9ebe..829dacf 100644
--- a/modules/network.nix
+++ b/modules/network.nix
@@ -17,7 +17,7 @@
       networks.SladkiySon.pskRaw =
         "86b1c8c60d3e99145bfe90e0af9bf552540d34606bb0d00b314f5b5960e46496";
       networks.AlukardAP_5GHz = {
-        pskRaw = "fb8a89b5602442be083d2a1e67db55c6ff05a306551bcd08a79b6c6bbc97fc30";
+        pskRaw = "d1733d7648467a8a9cae9880ef10a2ca934498514b4da13b53f236d7c68b8317";
         priority = 1;
       };
       networks.POAS = {
diff --git a/modules/packages.nix b/modules/packages.nix
index 2f25431..d1f121c 100644
--- a/modules/packages.nix
+++ b/modules/packages.nix
@@ -39,13 +39,6 @@ in {
     packageOverrides = pkgs: {
       i3lock-fancy = pkgs.callPackage ./applications/i3lock-fancy.nix {};
       git-with-libsecret = pkgs.git.override { withLibsecret = true; };
-      mullvad-vpn = pkgs.mullvad-vpn.overrideAttrs (oldAttrs: rec {
-        version = "2019.8";
-        src = pkgs.fetchurl {
-          url = "https://www.mullvad.net/media/app/MullvadVPN-${version}_amd64.deb";
-          sha256 = "0cjc8j8pqgdhnax4mvwmvnxfcygjsp805hxalfaj8wa5adph96hz";
-        };
-      });
     };
   };
 }
\ No newline at end of file
diff --git a/modules/workspace/locale.nix b/modules/workspace/locale.nix
index 6e14f5d..39b104d 100644
--- a/modules/workspace/locale.nix
+++ b/modules/workspace/locale.nix
@@ -1,8 +1,10 @@
 { pkgs, config, lib, ... }: {
-  i18n = {
-    defaultLocale = "en_GB.UTF-8";
-    consoleFont = "cyr-sun16";
-    consoleKeyMap = "ruwin_cplk-UTF-8";
+
+  i18n.defaultLocale = "en_GB.UTF-8";
+
+  console = {
+    font = "cyr-sun16";
+    keyMap = "ruwin_cplk-UTF-8";
   };
 
   time.timeZone = "Europe/Volgograd";
diff --git a/modules/xserver.nix b/modules/xserver.nix
index a1b5bd7..89999cb 100644
--- a/modules/xserver.nix
+++ b/modules/xserver.nix
@@ -57,14 +57,14 @@ with deviceSpecific; with themes; {
       autoLogin.user = "alukard";
     };
 
-    desktopManager.default = "none";
+    displayManager.defaultSession = "none+i3";
+
     desktopManager.xterm.enable = false;
 
     windowManager.i3 = {
       enable = true;
       package = pkgs.i3-gaps;
     };
-    windowManager.default = "i3";
 
     layout = "us,ru";
     xkbOptions = "grp:win_space_toggle";