diff --git a/common.nix b/common.nix
index d5ec072..524f108 100644
--- a/common.nix
+++ b/common.nix
@@ -9,7 +9,12 @@
     ./home.nix
   ];
 
-  nixpkgs.config.allowUnfree = true;
+  nixpkgs.config = {
+    allowUnfree = true;
+    permittedInsecurePackages = [
+      "electron-12.2.3"
+    ];
+  };
 
   boot.loader = {
     systemd-boot.enable = true;
@@ -73,9 +78,6 @@
       # Configure keymap in X11
       layout = "de";
       xkbVariant = "";
-
-      # Enable touchpad support (enabled default in most desktopManager).
-      # libinput.enable = true;
     };
 
     # Enable CUPS to print documents.
@@ -84,7 +86,7 @@
     # Enable the OpenSSH daemon.
     openssh = {
       enable = true;
-      permitRootLogin = "no";
+      settings.PermitRootLogin = "no";
     };
   };
 
@@ -134,15 +136,19 @@
     dates = "00:30";
   };
 
-  programs.git = {
-    enable = true;
-    package = pkgs.gitFull;
-  };
+  programs = {
+    git = {
+      enable = true;
+      package = pkgs.gitFull;
+    };
 
-  programs.steam = {
-    enable = true;
-    remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
-    dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
+    steam = {
+      enable = true;
+      remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
+      dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
+    };
+
+    zsh.enable = true;
   };
 
   environment = {
diff --git a/home.nix b/home.nix
index f789f31..1fab343 100644
--- a/home.nix
+++ b/home.nix
@@ -3,13 +3,6 @@
   pkgs,
   ...
 }: {
-  # override insync build version
-  nixpkgs.config.packageOverrides = pkgs: {
-    my = import (builtins.fetchTarball https://github.com/kaesaecracker/nixpkgs/archive/0fa91456d2f6dfb9cd4008e81c89c2fec8512415.tar.gz) {
-      config = config.nixpkgs.config;
-    };
-  };
-
   # Define user account
   users.users.vinzenz = {
     isNormalUser = true;
@@ -36,54 +29,46 @@
         EDITOR = "nano";
       };
 
-      packages = with pkgs;
-        []
-        # Apps
-        ++ [
-          keepassxc
-          steam
-          wine-staging
-          my.insync-v3
-          # gnome-secrets
-          tdesktop
-          lutris
-          amberol
-          simple-scan
-          gnome.gpaste
-          wireguard-tools
-          # steamlink
-          element-desktop
-          youtube-music
-        ]
-        # system monitoring
-        ++ [
-          btop
-          iotop
-          radeontop
-          lsof
-          wirelesstools
-          #lm-sensors
-        ]
-        # command line niceness
-        ++ [
-          tldr
-          powerline
-          powerline-fonts
-          thefuck
-        ]
-        # development
-        ++ [
-          dotnet-sdk_7
-          # gnome workbench
-          jetbrains.rider
-          alejandra
-          arduino
-          uucp
-          screen
-          jetbrains.pycharm-professional
-          kdiff3
-          docker
-        ];
+      packages = with pkgs; [
+        ## Apps
+        keepassxc
+        steam
+        wine-staging
+        insync
+        # gnome-secrets
+        tdesktop
+        lutris
+        amberol
+        simple-scan
+        gnome.gpaste
+        wireguard-tools
+        # steamlink
+        element-desktop
+        # youtube-music
+        etcher
+        ## system monitoring
+        iotop
+        radeontop
+        lsof
+        wirelesstools
+        # lm-sensors
+        ## command line niceness
+        tldr
+        powerline
+        powerline-fonts
+        thefuck
+        ## development
+        dotnet-sdk_7
+        # gnome workbench
+        jetbrains.rider
+        alejandra
+        arduino
+        uucp
+        screen
+        jetbrains.pycharm-professional
+        kdiff3
+        docker
+      ];
 
       file.".nanorc".text = ''
         set linenumbers
@@ -102,7 +87,6 @@
       home-manager.enable = true;
 
       firefox.enable = true;
-      atuin.enable = true;
       command-not-found.enable = true;
       dircolors.enable = true;
       fzf.enable = true;
@@ -115,6 +99,8 @@
         enableAutosuggestions = true;
         enableVteIntegration = true;
 
+        initExtra = "eval \"$(direnv hook zsh)\"";
+
         shellAliases = {
           my-update = "sudo nixos-rebuild switch";
           my-fmt = "alejandra .";
@@ -131,8 +117,6 @@
           theme = "agnoster";
           plugins = ["git" "sudo" "docker" "systemadmin" "thefuck"];
         };
-
-        initExtra = "eval \"$(direnv hook zsh)\"";
       };
 
       git = {
@@ -167,14 +151,10 @@
           vscode-extensions.ms-python.python
         ];
         userSettings = {
-          "files.insertFinalNewline" = true;
           "git.autofetch" = true;
           "update.mode" = "none";
           "editor.fontFamily" = "'Fira Code', 'Droid Sans Mono', 'monospace', monospace";
           "editor.fontLigatures" = true;
-          "[nix]" = {
-            "editor.tabSize" = 2;
-          };
           "redhat.telemetry.enabled" = false;
           "markdown.extension.tableFormatter.normalizeIndentation" = true;
           "markdown.extension.toc.orderedList" = false;
@@ -234,6 +214,9 @@
           indent_style = "space";
           indent_size = 4;
         };
+        "*.nix" = {
+          indent_size = 2;
+        };
       };
     };
   };