diff --git a/nixos/common-services.nix b/nixos/common-services.nix
index f03d326c..9efba6f0 100644
--- a/nixos/common-services.nix
+++ b/nixos/common-services.nix
@@ -37,6 +37,13 @@
         clickMethod = "clickfinger";
       };
 
+      useGlamor = true;
+
+      deviceSection = ''
+        Option "TearFree" "true"
+        Option "AccelMethod" "sna"
+      '';
+
       displayManager.sddm = {
         enable = true;
         enableHidpi = true;
diff --git a/nixos/common.nix b/nixos/common.nix
index 723e7e7f..a8b3e9e2 100644
--- a/nixos/common.nix
+++ b/nixos/common.nix
@@ -35,9 +35,6 @@ in
       users.users.cyryl = {
         isNormalUser = true;
         extraGroups = [ "wheel" "networkmanager" "video" "scanner" "lp" "docker" "vboxusers" "adbusers" ];
-        packages = with pkgs; [
-          unstable.pypi2nix etesync-dav unstable.hopper
-        ];
         shell = pkgs.zsh;
       };
 
diff --git a/nixos/gfx-intel.nix b/nixos/gfx-intel.nix
index 2c0620ff..0df5da13 100644
--- a/nixos/gfx-intel.nix
+++ b/nixos/gfx-intel.nix
@@ -5,6 +5,7 @@
   hardware.opengl = {
     enable = true;
     driSupport = true;
+    s3tcSupport = true;
     extraPackages = with pkgs; [
       vaapiIntel
       vaapiVdpau
diff --git a/nixos/home.nix b/nixos/home.nix
index 6ea0786e..9a1d1b4f 100644
--- a/nixos/home.nix
+++ b/nixos/home.nix
@@ -37,6 +37,7 @@ in
       ./programs/zsh.nix
       ./programs/vim.nix
       ./programs/alacritty.nix
+      ./programs/git.nix
       ./user-xsession.nix
     ];
 
diff --git a/nixos/programs/git.nix b/nixos/programs/git.nix
new file mode 100644
index 00000000..6701e523
--- /dev/null
+++ b/nixos/programs/git.nix
@@ -0,0 +1,11 @@
+{ config, pkgs, lib, ... }:
+{
+  programs.git = {
+    enable = true;
+    userName = "Cyryl Płotnicki";
+    userEmail = "cyplo@cyplo.net";
+    includes = [
+      { path =    "../.gitconfig.linux.private"; }
+    ];
+  };
+}
diff --git a/nixos/up.sh b/nixos/up.sh
index 8d3db4ee..d633365c 100755
--- a/nixos/up.sh
+++ b/nixos/up.sh
@@ -17,7 +17,6 @@ echo "using $DIR as the top level directory"
 cd $DIR
 git submodule update --init --recursive
 
-ln -vfs "$DIR/.gitconfig.linux.private" ~/.gitconfig
 
 mkdir -p ~/.config/Code/User
 ln -vfs "$DIR/.config/Code/User/settings.json" ~/.config/Code/User/settings.json