diff --git a/default.nix b/default.nix
index 1c8df14..8fcf88d 100644
--- a/default.nix
+++ b/default.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ pkgs, lib, ... }:
 let sources = import ./nix/sources.nix;
 in {
   imports = [ "${sources.home-manager}/nixos" ./modules ];
@@ -13,6 +13,6 @@ in {
   sound.enable = true;
   hardware.pulseaudio.enable = true;
 
-  system.stateVersion = "10.09";
+  system.stateVersion = "20.03";
 }
 
diff --git a/modules/applications/default.nix b/modules/applications/default.nix
index 439b661..c228589 100644
--- a/modules/applications/default.nix
+++ b/modules/applications/default.nix
@@ -10,6 +10,7 @@
     ./memes.nix
     ./alacritty.nix
     ./rofi.nix
+    ./postgres.nix
   ];
 }
 
diff --git a/modules/applications/locale.nix b/modules/applications/locale.nix
index e82619f..a0afb99 100644
--- a/modules/applications/locale.nix
+++ b/modules/applications/locale.nix
@@ -1,9 +1,9 @@
 { ... }: {
-  i18n = {
-    consoleFont = "Lat2-Terminus16";
-    consoleKeyMap = "us";
-    defaultLocale = "en_US.UTF-8";
-  };
-
+  i18n.defaultLocale = "en_US.UTF-8";
   time.timeZone = "Europe/Bucharest";
+
+  console = {
+    keyMap = "us";
+    font = "Lat2-Terminus16";
+  };
 }
diff --git a/modules/applications/misc.nix b/modules/applications/misc.nix
index 879aa16..d47d2a9 100644
--- a/modules/applications/misc.nix
+++ b/modules/applications/misc.nix
@@ -21,7 +21,9 @@
 
     # other stuff
     spectacle # take screenshots
-    unstable.elementary-planner # project planner
     vlc # video player
+    gimp # image editing
+    korganizer # calendar
+    akonadi
   ];
 }
diff --git a/modules/dev/haskell/default.nix b/modules/dev/haskell/default.nix
index 0cd6b48..2e17a8e 100644
--- a/modules/dev/haskell/default.nix
+++ b/modules/dev/haskell/default.nix
@@ -3,10 +3,9 @@ let hie = pkgs.all-hies.selection { selector = p: { inherit (p) ghc865; }; };
 in {
   home-manager.users.adrielus.home = {
     file.".ghci".source = ./ghci;
-    # file.".stack/config.yaml".source = ./stack.yaml;
 
     packages = with pkgs;
       [ ghc ghcid hlint cabal-install snack stack hie ]
-      ++ (with haskellPackages; [ brittany hoogle hpack pointfree pointful ]);
+      ++ (with haskellPackages; [ brittany hoogle hpack pointfree ]);
   };
 }
diff --git a/modules/dev/haskell/ghci b/modules/dev/haskell/ghci
index efc3000..5dfbb66 100644
--- a/modules/dev/haskell/ghci
+++ b/modules/dev/haskell/ghci
@@ -7,4 +7,4 @@
 
 :def pointfree \str -> return $ ":! pointfree " ++ show str
 :def pf        \str -> return $ ":! pointfree " ++ show str
-:def pointful  \str -> return $ ":! pointful " ++ show str
\ No newline at end of file
+-- :def pointful  \str -> return $ ":! pointful " ++ show str
\ No newline at end of file
diff --git a/modules/dev/javascript.nix b/modules/dev/javascript.nix
index 66927da..2a727e9 100644
--- a/modules/dev/javascript.nix
+++ b/modules/dev/javascript.nix
@@ -1,14 +1,16 @@
 { pkgs, ... }:
-let fromNpm = import ./npm { inherit pkgs; };
+let
+  fromNpm = import ./npm { inherit pkgs; };
+  node = pkgs.nodejs_latest;
 in {
   home-manager.users.adrielus.home.packages = with pkgs;
     with nodePackages;
     with fromNpm; [
-      nodejs
+      node
       node2nix
 
       pnpm
-      yarn
+      (yarn.override { nodejs = node; })
 
       tsdx
     ];
diff --git a/modules/overlay.nix b/modules/overlay.nix
index a5a8fff..15c9189 100644
--- a/modules/overlay.nix
+++ b/modules/overlay.nix
@@ -19,7 +19,7 @@ in {
 
         # unstable stuff
         brave = unstable.brave;
-        ghc = unstable.ghc;
+        # ghc = unstable.ghc;
         vscodium = unstable.vscodium;
       })
   ];
diff --git a/nix/sources.json b/nix/sources.json
index 05ed547..0e92827 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -5,10 +5,10 @@
         "homepage": "",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "5da9ef7669c524ecb353db0ac590a63324b4b3aa",
-        "sha256": "0dzw60l2f1604fw7fb293zq52p2jy73wad437z62hgpxpq7qb7nk",
+        "rev": "66432256212d9532e8df9dfc207a545e3c2b35fd",
+        "sha256": "06piqg32cvkrk6g9z46j3xvzpc8r323qic8976wpzr43smpqndq8",
         "type": "tarball",
-        "url": "https://github.com/nix-community/NUR/archive/5da9ef7669c524ecb353db0ac590a63324b4b3aa.tar.gz",
+        "url": "https://github.com/nix-community/NUR/archive/66432256212d9532e8df9dfc207a545e3c2b35fd.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "agnoster": {
@@ -41,10 +41,10 @@
         "homepage": "",
         "owner": "xzfc",
         "repo": "cached-nix-shell",
-        "rev": "25704a2b02ea61987551023709590f14aedfd9f3",
-        "sha256": "1mvrfap94nz086gyvz3sirxbny0fzdq11lwajfxijk3k01pnlr4x",
+        "rev": "9bd1649452280c20b4978bc0122208e2c6cd46f0",
+        "sha256": "1wn5srs27l3csidlhyavgfc99hxs5nwii6m8dgizkyqkjcrwp85p",
         "type": "tarball",
-        "url": "https://github.com/xzfc/cached-nix-shell/archive/25704a2b02ea61987551023709590f14aedfd9f3.tar.gz",
+        "url": "https://github.com/xzfc/cached-nix-shell/archive/9bd1649452280c20b4978bc0122208e2c6cd46f0.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "easy-purescript-nix": {
@@ -60,15 +60,15 @@
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "home-manager": {
-        "branch": "release-19.09",
+        "branch": "release-20.03",
         "description": "Manage a user environment using Nix",
         "homepage": "https://rycee.gitlab.io/home-manager/",
         "owner": "rycee",
         "repo": "home-manager",
-        "rev": "b78b5fa4a073dfcdabdf0deb9a8cfd56050113be",
-        "sha256": "03w8fy9shw42kv1pcqq0vkmm54nw3gdpjqd2yncgn0926sacgdnp",
+        "rev": "a378bccd609c159fa8d421233b9c5eae04f02042",
+        "sha256": "1cfh0aj60qriadvn5xvsp24p1xr06g68m3pfvzwahv2bd2cg261r",
         "type": "tarball",
-        "url": "https://github.com/rycee/home-manager/archive/b78b5fa4a073dfcdabdf0deb9a8cfd56050113be.tar.gz",
+        "url": "https://github.com/rycee/home-manager/archive/a378bccd609c159fa8d421233b9c5eae04f02042.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "niv": {
@@ -84,15 +84,15 @@
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs": {
-        "branch": "nixos-19.09",
+        "branch": "nixos-20.03",
         "description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to",
         "homepage": "https://github.com/NixOS/nixpkgs",
         "owner": "NixOS",
         "repo": "nixpkgs-channels",
-        "rev": "9237a09d8edbae9951a67e9a3434a07ef94035b7",
-        "sha256": "05bizymljzzd665bpsjbhxamcgzq7bkjjzjfapkl2nicy774ak4x",
+        "rev": "d6c1b566b770cf4cf0c6d4a693da6bdf28c2c3b0",
+        "sha256": "00vm9shmpywx9dzaj0c7vap1ldimdsr7lw2n8p70qza87nmp9dai",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs-channels/archive/9237a09d8edbae9951a67e9a3434a07ef94035b7.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs-channels/archive/d6c1b566b770cf4cf0c6d4a693da6bdf28c2c3b0.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs-unstable": {
@@ -101,10 +101,10 @@
         "homepage": "https://github.com/NixOS/nixpkgs",
         "owner": "nixos",
         "repo": "nixpkgs-channels",
-        "rev": "22a3bf9fb9edad917fb6cd1066d58b5e426ee975",
-        "sha256": "089hqg2r2ar5piw9q5z3iv0qbmfjc4rl5wkx9z16aqnlras72zsa",
+        "rev": "fce7562cf46727fdaf801b232116bc9ce0512049",
+        "sha256": "14rvi69ji61x3z88vbn17rg5vxrnw2wbnanxb7y0qzyqrj7spapx",
         "type": "tarball",
-        "url": "https://github.com/nixos/nixpkgs-channels/archive/22a3bf9fb9edad917fb6cd1066d58b5e426ee975.tar.gz",
+        "url": "https://github.com/nixos/nixpkgs-channels/archive/fce7562cf46727fdaf801b232116bc9ce0512049.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "snack": {