diff --git a/darwin/darwin-configuration.nix b/darwin/darwin-configuration.nix
new file mode 100644
index 0000000..80b24db
--- /dev/null
+++ b/darwin/darwin-configuration.nix
@@ -0,0 +1,24 @@
+{ config, pkgs, ... }:
+
+{
+  # List packages installed in system profile. To search by name, run:
+  # $ nix-env -qaP | grep wget
+  environment.systemPackages =
+    [ pkgs.vim
+    ];
+
+  # Use a custom configuration.nix location.
+  # $ darwin-rebuild switch -I darwin-config=$HOME/.config/nixpkgs/darwin/configuration.nix
+  # environment.darwinConfig = "$HOME/.config/nixpkgs/darwin/configuration.nix";
+
+  # Auto upgrade nix package and the daemon service.
+  services.nix-daemon.enable = true;
+  # nix.package = pkgs.nix;
+
+  # Create /etc/bashrc that loads the nix-darwin environment.
+  programs.zsh.enable = true;  # default shell on catalina
+
+  # Used for backwards compatibility, please read the changelog before changing.
+  # $ darwin-rebuild changelog
+  system.stateVersion = 4;
+}
diff --git a/home/home.nix b/home/home.nix
index da34058..a2c1d40 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -3,7 +3,7 @@
 with pkgs;
 let
   # nix-channel --add https://nixos.org/channels/nixos-unstable nixos-unstable
-  unstable = import <nixos-unstable> { };
+  #unstable = import <nixos-unstable> { };
   # nix-channel --add https://github.com/nix-community/NUR/archive/master.tar.gz NUR
   nur = import <NUR> { inherit pkgs; };
   myNur = nur.repos.schmittlauch;
@@ -103,9 +103,9 @@ let
     lsof
     mosh
     openssh
-    sshfsFuse
+    sshfs-fuse
     cryfs
-    smbnetfs # for FUSE smb mounting
+    #smbnetfs # for FUSE smb mounting
     sshuttle
     thefuck
     gnupg
@@ -118,12 +118,12 @@ let
     pdfgrep
     torsocks
     ncdu
-    psmisc # for killall
+    #psmisc # for killall
     dos2unix
-    reptyr # re-bind running program to other tty
+    #reptyr # re-bind running program to other tty
     xclip
     unzip
-    myNur.lolcommits # from NUR
+    #myNur.lolcommits # from NUR
   ];
 
   nixHelpers = [
@@ -172,15 +172,16 @@ let
     curl
     httpie
     gdb
-    strace
-    ltrace
-    valgrind
-    zeal
+    #strace
+    #ltrace
+    #valgrind
+    #zeal
     gcc
     shellcheck
     mtr
     ripgrep
     gitui
+    pre-commit
 
     # Haskell
     ghc
@@ -242,7 +243,7 @@ let
     fira-code
     ubuntu_font_family
     twemoji-color-font
-    opensans-ttf
+    open-sans
     (iosevka-bin.override {
       variant = "curly-slab";
     })
@@ -259,22 +260,27 @@ in
 {
 
   home.packages =
-    desktopApps
-    ++ latexApps
+    cliApps
+    #++ desktopApps
+    #++ latexApps
     ++ pythonApps
-    ++ graphicsApps
-    ++ cliApps
-    ++ multimediaApps
+    #++ graphicsApps
+    #++ multimediaApps
     ++ devTools
-    ++ kdeTools
+    #++ kdeTools
     ++ fonts
     ++ nixHelpers
-    ++ games
+    #++ games
   ;
 
   programs.home-manager.enable = true;
-  programs.home-manager.path = "$HOME/.nix-defexpr/channels/home-manager";
-  home.stateVersion = "18.09";
+  #programs.home-manager.path = "$HOME/.nix-defexpr/channels/home-manager";
+  home.stateVersion = "22.05";
+
+  # Home Manager needs a bit of information about you and the
+  # paths it should manage.
+  home.username = "os";
+  home.homeDirectory = "/Users/os";
 
   programs.direnv =
     {
@@ -288,20 +294,20 @@ in
 
   programs.bat.enable = true;
 
-  services.gpg-agent =
-    {
-      enable = true;
-      enableSshSupport = true;
-      pinentryFlavor = "qt";
-    };
+#  services.gpg-agent =
+#    {
+#      enable = true;
+#      enableSshSupport = true;
+#      pinentryFlavor = "qt";
+#    };
 
-  programs.ssh =
-    {
-      enable = true;
-      # ssh host config
-      matchBlocks =
-        import ./secrets/ssh_hosts.nix;
-    };
+#  programs.ssh =
+#    {
+#      enable = true;
+#      # ssh host config
+#      matchBlocks =
+#        import ./secrets/ssh_hosts.nix;
+#    };
 
   programs.tmux = {
     enable = true;
@@ -319,12 +325,12 @@ in
     terminal = "screen-256color";
   };
 
-  systemd.user.startServices = true;
+  #systemd.user.startServices = true;
 
-  services.lorri.enable = true;
+  #services.lorri.enable = true;
 
   # media button control support from Bluetooth devices
-  services.mpris-proxy.enable = true;
+  #services.mpris-proxy.enable = true;
 
   fonts.fontconfig.enable = true;
 
diff --git a/home/overlays.nix b/home/overlays.nix
index 74aa9ce..01142ce 100644
--- a/home/overlays.nix
+++ b/home/overlays.nix
@@ -4,7 +4,7 @@
     self: super:
       rec {
         #jami-ring-daemon = super.qt5.callPackage ./ov/jami/ring-daemon.nix {};
-        myVim = with super; (vim_configurable.override { python = python3; }).customize {
+        myVim = with super; vim_configurable.customize {
           # executable/ package name
           name = "vim";
           vimrcConfig.packages.myVimPackage = with pkgs.vimPlugins; {