From 34ce16b66f380c1a5c3d21d81859dab5aec86d58 Mon Sep 17 00:00:00 2001
From: Enrico Fasoli <fazius2009@gmail.com>
Date: Thu, 27 Aug 2015 13:01:41 +0000
Subject: [PATCH] stuff, I guess

---
 bspwmrc           |  2 +-
 configuration.nix | 36 +++++++++++++++++++++++-------------
 install           |  1 +
 lemonbar.sh       |  4 ++--
 sxhkdrc           |  2 +-
 5 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/bspwmrc b/bspwmrc
index c0f2745..8b2705f 100755
--- a/bspwmrc
+++ b/bspwmrc
@@ -7,7 +7,7 @@ xsetroot -cursor_name left_ptr
 
 # Start lemonbar
 sh ~/.config/bspwm/lemonbar.sh &
-# Start mpd
+# Daemons
 mpd
 
 # Set up desktops on monitors
diff --git a/configuration.nix b/configuration.nix
index 6404cc7..f822125 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -12,6 +12,8 @@
   boot.loader.grub.version = 2;
   boot.loader.grub.device = "/dev/sdd";
 
+  fileSystems."/".options = "discard,noatime";
+
   time.timeZone = "Italy/Rome";
 
   networking.hostName = "Fazo-PC"; # Define your hostname.
@@ -34,14 +36,15 @@
 
   environment.systemPackages = with pkgs; [
     # Development
-    atom git
+    atom git nodejs
     # Desktop and appliations
-    sxhkd tmux htop ranger w3m rxvt_unicode chromium dmenu gnupg irssi bar bc
+    sxhkd tmux htop vim ranger w3m rxvt_unicode chromium dmenu gnupg irssi bar bc i3lock
     # Games
     minecraft
     # Media
-    mpv beets mpd mpc_cli
+    mpv beets mpd mpc_cli popcorntime
     # System utilities, drivers...
+    ntfs3g
     # Services
     syncthing transmission
     # Other stuff
@@ -58,17 +61,24 @@
 
   # Services
 
-  services.openssh = {
-    enable = true;
-    permitRootLogin = "no";
-    passwordAuthentication = false;
-  };
+  services = {
+    # SSH
+    openssh = {
+      enable = true;
+      permitRootLogin = "no";
+      passwordAuthentication = false;
+    };
 
-  services.xserver = {
-    enable = true;
-    videoDrivers = [ "nvidia" ];
-    layout = "it";
-    windowManager.bspwm.enable = true;
+    # Desktop Environment
+    xserver = {
+      enable = true;
+      videoDrivers = [ "nvidia" ];
+      layout = "it";
+      windowManager.bspwm.enable = true;
+      desktopManager.xterm.enable = false;
+      desktopManager.default = "none";
+      windowManager.default = "bspwm";
+    };
   };
 
   # User environment
diff --git a/install b/install
index d4cf81f..40847c8 100755
--- a/install
+++ b/install
@@ -6,6 +6,7 @@ echo "Installing dotfiles"
 sudo cp configuration.nix /etc/nixos/
 echo "Activating NixOS configuration"
 sudo nixos-rebuild switch
+mkdir -p ~/.nixpkgs/
 cp config.nix ~/.nixpkgs/
 
 # Custom Binaries
diff --git a/lemonbar.sh b/lemonbar.sh
index 61d363f..06d26e1 100755
--- a/lemonbar.sh
+++ b/lemonbar.sh
@@ -9,7 +9,7 @@ getVolume() {
 getMPD(){
   echo -n "♫ "
   if [ "$(mpc | wc -l)" -gt 1 ]; then
-    echo -n "$(mpc | cut -d$'\n' -f1) | $(mpc | cut -d$'\n' -f2)"
+    echo -n "$(mpc | cut -d$'\n' -f1) ♫ $(mpc | cut -d$'\n' -f2)"
   fi
 }
 
@@ -21,7 +21,7 @@ buildBar () {
   while true
   do
     echo "$(getVolume) $(getMPD) %{c}$(buildClock)%{r}$(getNET)"
-    sleep 1
+    sleep 0.5
   done
 }
 
diff --git a/sxhkdrc b/sxhkdrc
index 787fdfa..b001f65 100755
--- a/sxhkdrc
+++ b/sxhkdrc
@@ -107,7 +107,7 @@ XF86Mail
 # lock
 
 XF86Sleep
-  lock
+  i3lock -u -c 1d1f21 -i ~/Pictures/background.png
 
 # screenshots
 Print