@@ -67,4 +67,9 @@
 export EDITOR=vim
 export LC_ALL="en_US.UTF-8"
 
-[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
+# fzf
+[ -f ~/.fzf.zsh ]
+if [ -n "${commands[fzf-share]}" ]; then
+  source "$(fzf-share)/key-bindings.zsh"
+  source "$(fzf-share)/completion.zsh"
+fi

@@ -6,8 +6,8 @@
 cp ./vimconfigbase.vim ~/vimconfigbase.vim
 cp ./.vimrc ~/.vimrc
 
-mkdir ~/.config
-mkdir ~/.config/nvim
+mkdir -p ~/.config
+mkdir -p ~/.config/nvim
 cp ./init.vim ~/.config/nvim/init.vim
 
 cp ./.zshrc ~/.zshrc
@@ -18,9 +18,10 @@ cp ./bin/ltx ~/bin/
 cp ./bin/screens ~/bin/
 cp ./bin/wk ~/bin/
 
+cp -r ./alacritty ~/.config/
+cp -r ./i3status ~/.config/
+
 
 # assuming that Rust is installed
-echo "installing delta (gitdiff tool)"
-cargo install git-delta
 echo "append .gitconfig of this repo lines to the .gitconfig system file to use delta gitdiff tool"
 cat .gitconfig >> ~/.gitconfig

@@ -8,7 +8,7 @@ {
   imports =
     [
       ./hardware-configuration.nix
-      ./extra-hardware-configuration.nix
+      ./surface-extra-hardware-configuration.nix
       ./private-configuration.nix
     ];
 
@@ -80,6 +80,7 @@ wget
 	tmux
 	git
 	delta
+	tig
 	mosh
 	bat
 	ripgrep
@@ -89,10 +90,19 @@ xfce.thunar
 	screenfetch
 	htop
 	alacritty
+	zathura
+	mate.atril
 	firefox
 	qutebrowser
+	chromium
+	xfce.ristretto
+	pavucontrol
   ];
 
+  programs.zsh.enable = true;
+  users.defaultUserShell = pkgs.zsh;
+  environment.shells = with pkgs; [zsh];
+
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
   # programs.mtr.enable = true;
@@ -100,9 +110,6 @@ # programs.gnupg.agent = {
   #   enable = true;
   #   enableSSHSupport = true;
   # };
-  programs.zsh.enable = true;
-  users.defaultUserShell = pkgs.zsh;
-  environment.shells = with pkgs; [zsh];
 
   # List services that you want to enable:
 
@@ -126,4 +133,7 @@
   # gvfs needed for Thunar to detect external disks
   services.gvfs.enable = true;
 
+  # bluetooth related
+  hardware.bluetooth.enable = true;
+  services.blueman.enable = true;
 }

@@ -0,0 +1,32 @@
+# This is a custom file for a surface.
+
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  # Set an usable key configuration: Ctrl at capslock, Win at Alt, Alt at Ctrl
+  services.xserver.displayManager.sessionCommands =''
+    ${pkgs.xorg.xmodmap}/bin/xmodmap "${pkgs.writeText  "xkb-layout" ''
+      !
+      ! Swap Caps_Lock and Control_L
+      !
+      
+	remove Lock = Caps_Lock
+	remove Control = Control_L
+	! keysym Control_L = Caps_Lock
+	keysym Control_L = Mode_switch
+	keysym Caps_Lock = Control_L
+	add Lock = Caps_Lock
+	add Control = Control_L
+
+	! map arrows to more ergonomic position
+	keycode  43 = h H Left
+	keycode  44 = j J Down
+	keycode  45 = k K Up 
+	keycode  46 = l L Right 
+    ''}"
+  '';
+
+
+  # add pulseaudio support to manage audio
+  hardware.pulseaudio.enable = true;
+}