From 16d3e93063683125fe8c7b7e4fcd6977b050ea21 Mon Sep 17 00:00:00 2001
From: Enrico Fasoli <fazius2009@gmail.com>
Date: Tue, 25 Aug 2015 09:42:45 +0000
Subject: [PATCH] big update

---
 bspwmrc           |  1 +
 configuration.nix | 34 +++++++++++++++++++++++++++++++---
 install           |  2 +-
 install-prezto    | 14 ++++++++++++++
 sxhkdrc           | 14 ++++++--------
 5 files changed, 53 insertions(+), 12 deletions(-)
 create mode 100755 install-prezto

diff --git a/bspwmrc b/bspwmrc
index 987b606..46b0223 100755
--- a/bspwmrc
+++ b/bspwmrc
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 setxkbmap it
+xsetroot -cursor_name left_ptr
 
 bspc config border_width 2
 bspc window_gap 24
diff --git a/configuration.nix b/configuration.nix
index 5c1d29e..e2c934a 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -6,6 +6,8 @@
       ./hardware-configuration.nix
     ];
 
+  # System
+
   boot.loader.grub.enable = true;
   boot.loader.grub.version = 2;
   boot.loader.grub.device = "/dev/sdd";
@@ -19,9 +21,26 @@
     defaultLocale = "en_US.UTF-8";
   };
 
-  nixpkgs.config.allowUnfree = true;
+  # Packages
+
+  nixpkgs.config = {
+    allowUnfree = true;
+    rxvt_unicode = {
+      perlSupport = true;
+    };
+  };
+
   environment.systemPackages = with pkgs; [
-    tmux vim sxhkd w3m rxvt_unicode chromium htop atom git zsh dmenu gnupg ranger syncthing
+    # Development
+    atom git
+    # Desktop and appliations
+    sxhkd tmux htop ranger w3m rxvt_unicode chromium dmenu gnupg
+    # Media
+    mpv cmus
+    # Services
+    syncthing
+    # Other stuff
+    screenfetch
   ];
 
   fonts = {
@@ -32,6 +51,8 @@
     ];
   };
 
+  # Services
+
   services.openssh = {
     enable = true;
     permitRootLogin = "no";
@@ -45,12 +66,19 @@
     windowManager.bspwm.enable = true;
   };
 
+  # User environment
+
+  programs.zsh = {
+    enable = true;
+    shellInit = "export ZDOTDIR=~/.config/zsh";
+  };
+
   users.extraUsers.fazo = {
     isNormalUser = true;
     extraGroups = [ "wheel" ];
     uid = 1000;
     shell = "/run/current-system/sw/bin/zsh";
-    openssh.authorizedKeys.keys = [ ];
+    openssh.authorizedKeys.keys = [ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDIqHaL0uH1ko/jLI3JeetD4bITUF34IE9HTEvF2Go8JYbhk3YSsG0/EoNu8dhA35S45Y7TXUk/K0axcqmFUePVwY271b7L+9I7/ehUg1wHOaNLCf/ueAyRfo5ZUHuH1YnTg9TinwVi0dynjVMaaVDR1YWVgzuw0KTEDW5em5m+jRbDvFrrq72D2GD/fYqkc2Z/cmnRijMi26PCF1xTq4g6BlIUYloCN+ZlDRvkSWiqCcFD3a/QOZXsUBVg80K4QrHVwj4+Bu2M1KDLhmW+8fzMkbwzKumUFt9SwcQh5Tq/MQfzSWOO2wtn1sys0BDKGazJwn9gMFNkcFbRsD5Uqcgh fazo@mac.lan" ];
   };
 
 }
diff --git a/install b/install
index d89d7b8..abc7c2c 100755
--- a/install
+++ b/install
@@ -28,4 +28,4 @@ cp .vimrc ~/
 # Git
 cp .gitconfig ~/
 
-echo "This script does not install prezto"
+echo "Run install-prezto with ZSH to install prezto"
diff --git a/install-prezto b/install-prezto
new file mode 100755
index 0000000..7497e04
--- /dev/null
+++ b/install-prezto
@@ -0,0 +1,14 @@
+#!/usr/bin/env zsh
+
+echo "Installing prezto"
+
+mkdir -p $ZDOTDIR
+
+git clone --recursive https://github.com/fazo96/prezto.git "${ZDOTDIR:-$HOME}/.zprezto"
+
+setopt EXTENDED_GLOB
+for rcfile in "${ZDOTDIR:-$HOME}"/.zprezto/runcoms/^README.md(.N); do
+  ln -s "$rcfile" "${ZDOTDIR:-$HOME}/.${rcfile:t}"
+done  
+
+echo "Done"
diff --git a/sxhkdrc b/sxhkdrc
index 61cce3a..c27f21d 100755
--- a/sxhkdrc
+++ b/sxhkdrc
@@ -4,7 +4,7 @@
 
 super + alt + Escape
 	for id in $(bspc query -W); do bspc window $id -c; done; \
-	bspc quit
+	bspc quit && shutdown
 
 super + w
 	bspc window -c
@@ -85,8 +85,8 @@ super + space
   dmenu_run -fn "-gohu-gohufont-medium-r-normal--14-100-100-100-c-80-iso10646-1"
 
 # make sxhkd reload its configuration files:
-super + Escape
-	pkill -USR1 -x sxhkd
+#super + Escape
+#	pkill -USR1 -x sxhkd
 
 #
 # my stuff
@@ -108,8 +108,6 @@ alt + F12
 
 # screenshots
 Print
-  scrot /tmp/screenshot.png -e 'copyq copy image/png - < $f && rm $f'
-alt + Print
-  scrot -s /tmp/screenshot.png -e 'copyq copy image/png - < $f && rm $f'
-alt + shift + Print
-  scrot "$HOME/pictures/screenshots/%d-%m-%Y %H:%M:%S.png"
+  scrot "~/Pictures/screenshots/%d-%m-%Y %H:%M:%S.png"
+#  scrot /tmp/screenshot.png -e 'copyq copy image/png - < $f && rm $f'
+#  scrot -s /tmp/screenshot.png -e 'copyq copy image/png - < $f && rm $f'