removed DF terminal script, fixed few things in config

.Xresources

@@ -1,42 +1,41 @@
 !! COLORS
 
 ! special
-*foreground:   #9b9081
-*background:   #181b20
-*cursorColor:  #9b9081
+*.foreground:   #586e75
+*.background:   #fdf6e3
+*.cursorColor:  #586e75
 
 ! black
-*color0:       #353535
-*color8:       #5f5f5f
+*.color0:       #002b36
+*.color8:       #657b83
 
 ! red
-*color1:       #744b40
-*color9:       #785850
+*.color1:       #dc322f
+*.color9:       #dc322f
 
 ! green
-*color2:       #6d6137
-*color10:      #6f6749
+*.color2:       #859900
+*.color10:      #859900
 
 ! yellow
-*color3:       #765636
-*color11:      #776049
+*.color3:       #b58900
+*.color11:      #b58900
 
 ! blue
-*color4:       #61564b
-*color12:      #696057
+*.color4:       #268bd2
+*.color12:      #268bd2
 
 ! magenta
-*color5:       #6b4a49
-*color13:      #6f5a59
+*.color5:       #6c71c4
+*.color13:      #6c71c4
 
 ! cyan
-*color6:       #435861
-*color14:      #525f66
+*.color6:       #2aa198
+*.color14:      #2aa198
 
 ! white
-*color7:       #b3b3b3
-*color15:      #cdcdcd
-
+*.color7:       #93a1a1
+*.color15:      #fdf6e3
 
 !! STYLE
 
@@ -49,7 +48,8 @@ URxvt*scrollstyle:       rxvt
 URxvt*internalBorder:    18
 
 ! font
-*font:                   -gohu-gohufont-medium-r-normal--14-100-100-100-c-80-iso10646-1
+! *font:                   -gohu-gohufont-medium-r-normal--14-100-100-100-c-80-iso10646-1
+*font:                   xft:DejaVu Sans Mono:size=12
 URxvt*LetterSpace:       -1
 
 ! cursor

.nvimrc

@@ -74,19 +74,19 @@ let s:p = {'normal': {}, 'inactive': {},
           \'insert': {}, 'replace' : {},
           \'visual': {}, 'tabline' : {}}
 
-let s:p.normal.left     = [ [ 07, 14 ], [ 08, 00 ] ]
-let s:p.insert.left     = [ [ 07, 05 ], [ 14, 00 ] ]
-let s:p.visual.left     = [ [ 00, 03 ], [ 14, 00 ] ]
-let s:p.replace.left    = [ [ 00, 02 ], [ 14, 00 ] ]
-let s:p.inactive.left   = [ [ 12, 00 ], [ 15, 00 ] ]
-let s:p.tabline.left    = [ [ 14, 00 ] ]
-let s:p.normal.right    = [ [ 12, 00 ], [ 03, 00 ] ]
-let s:p.tabline.right   = [ [ 12, 00 ], [ 03, 00 ] ]
-let s:p.inactive.right  = [ [ 12, 00 ], [ 13, 00 ] ]
-let s:p.normal.middle   = [ [ 12, 00 ] ]
-let s:p.inactive.middle = [ [ 12, 00 ] ]
-let s:p.tabline.middle  = [ [ 14, 00 ] ]
-let s:p.tabline.tabsel  = [ [ 14, 00 ] ]
+let s:p.normal.left     = [ [ 15, 14 ], [ 08, 15 ] ]
+let s:p.insert.left     = [ [ 15, 05 ], [ 14, 15 ] ]
+let s:p.visual.left     = [ [ 15, 03 ], [ 14, 15 ] ]
+let s:p.replace.left    = [ [ 15, 02 ], [ 14, 15 ] ]
+let s:p.inactive.left   = [ [ 12, 15 ], [ 15, 15 ] ]
+let s:p.tabline.left    = [ [ 14, 15 ] ]
+let s:p.normal.right    = [ [ 12, 15 ], [ 03, 15 ] ]
+let s:p.tabline.right   = [ [ 12, 15 ], [ 03, 15 ] ]
+let s:p.inactive.right  = [ [ 12, 15 ], [ 13, 15 ] ]
+let s:p.normal.middle   = [ [ 12, 15 ] ]
+let s:p.inactive.middle = [ [ 12, 15 ] ]
+let s:p.tabline.middle  = [ [ 14, 15 ] ]
+let s:p.tabline.tabsel  = [ [ 14, 15 ] ]
 let s:p.normal.error    = [ [ 00, 05 ] ]
 let s:p.normal.warning  = [ [ 00, 02 ] ]
 

bin/dwarffortress

@@ -1,2 +0,0 @@
-#!/bin/sh
-urxvt -xrm "*color0: #181b20" -e dwarf-fortress

bin/lock

@@ -1,2 +1,2 @@
 #!/bin/sh
-DISPLAY=":0.0" /run/current-system/sw/bin/i3lock -c 1d1f21
+DISPLAY=":0.0" /run/current-system/sw/bin/i3lock -c 1d1f21 -i ~/Pictures/lockscreen.png

bspwmrc

@@ -5,21 +5,28 @@ setxkbmap it
 # Dont show ugly X shaped cursor
 xsetroot -cursor_name left_ptr
 udiskie &
-
+unclutter -idle 1 &
+amixer set Master 0
+xrandr --dpi 108
+ 
 # Start lemonbar
 sh ~/.config/bspwm/lemonbar.sh &
 
 # Set up desktops on monitors
-bspc monitor DVI-I-0 -d 1 2 3 4 5
-bspc monitor HDMI-0 -d 6 7 8 9
+bspc monitor -d 1 2 3 4 5 6
 
 # Set up bspwm theme
-bspc config border_width 2
-bspc window_gap 24
-bspc config -m DVI-I-0 top_padding 20
-bspc config focused_border_color '#858585'
-bspc config normal_border_color '#2e343D'
-bspc config split_ratio 0.52
+bspc config -m focused border_width 2
+bspc config -m focused window_gap 24
+PADDING=16
+bspc config -m focused top_padding $PADDING
+bspc config -m focused bottom_padding $PADDING
+bspc config -m focused right_padding $PADDING
+bspc config -m focused left_padding $PADDING
+bspc config focused_border_color '#2e343D'
+bspc config normal_border_color '#858585'
+bspc config presel_border_color '#c5c5c'
+bspc config split_ratio 0.5
 bspc config borderless_monocle true
 bspc config gapless monocle true
 bspc config focus_follows_pointer true

configuration.nix

@@ -8,29 +8,46 @@
 
   # System
 
-  boot.loader.grub.enable = true;
-  boot.loader.grub.version = 2;
-  boot.loader.grub.device = "/dev/sdd";
-
-  hardware.opengl.driSupport32Bit = true;
+  boot = {
+    kernelPackages = pkgs.linuxPackages_4_1;
+    initrd.luks.devices = [ { device = "/dev/sda3"; name = "crypted"; allowDiscards = true; } ];
+    loader = {
+      grub.enable = false;
+      gummiboot.enable = true;
+      generationsDir = {
+        enable = false;
+        copyKernels = false;
+      };
+    };
+    kernel = {
+      sysctl = {
+        "kernel.nmi_watchdog" = 0; # Disable watchdog
+        "vm.swappiness" = 0; # Avoid swapping as much as possible
+        "vm.laptop_mode" = 5; # Use laptop mode (Knob at 5)
+        "vm.dirty_writeback_centisecs" = 6000; # Aggregate disk IO
+      };
+    };
+    extraModprobeConfig = ''
+      options snd_hda_intel index=1,0
+      options snd_hda_intel power_save=1
+    '';
+  };
 
   # SSD
   boot.tmpOnTmpfs = true; # save some writes
   fileSystems."/".options = "discard,noatime";
 
-  # Mount Data disk
-  fileSystems."/mnt/Dati" = {
-    device = "/dev/sdd3";
-    options = "nofail,relatime,defaults";
-  };
-
   time.timeZone = "Europe/Rome";
 
+  hardware.opengl.driSupport32Bit = true;
+
   virtualisation.virtualbox.host.enable = true;
 
+  powerManagement.enable = true;
+
   # Networking
 
-  networking.hostName = "ape";
+  networking.hostName = "warren";
   networking.hostId = "6bc261fc";
   networking.firewall.enable = false;
   networking.wireless.enable = true;
@@ -52,9 +69,6 @@
         visualizerSupport = true;
         clockSupport = true;
       };
-      chromium = pkgs.chromium.override {
-        enablePepperFlash = true;
-      };
     };
   };
 
@@ -65,27 +79,27 @@
     # Libs and Tools
     xsel urxvt_perls xclip python34Packages.udiskie encfs
     # Desktop Environment helpers
-    dmenu bar i3lock sxhkd
+    dmenu bar-xft i3lock sxhkd
     # Games
     minecraft steam dwarf_fortress
     # Applications
     neovim ranger weechat bc w3m gnupg zathura go14Packages.ipfs.bin
     tmux htop rxvt_unicode pandoc mosh ncdu cv pv tree screenfetch
-    scrot iotop iftop
+    scrot iotop iftop unzip zip p7zip transmission
     # Desktop Applications
     chromium libreoffice gparted
     # Media
     beets mpd mpc_cli ncmpcpp popcorntime mpv
     # Drivers, file systems and other compatibility-aimed packages
-    ntfs3g exfat utillinuxCurses gptfdisk encfs
-    # Other stuff
+    ntfs3g exfat utillinuxCurses gptfdisk encfs xlibs.xbacklight
+    acpi powertop
   ];
 
   fonts = {
     enableFontDir = true;
     enableGhostscriptFonts = true;
     fonts = with pkgs; [
-      gohufont
+      gohufont dejavu_fonts
     ];
   };
 
@@ -103,7 +117,12 @@
     # Desktop Environment
     xserver = {
       enable = true;
-      videoDrivers = [ "nvidia" ];
+      #deviceSection = ''
+      #  Identifier  "Intel Graphics"
+      #  Driver      "intel"
+      #  Option      "AccelMethod"  "sna"
+      #  Option      "TearFree"    "true"
+      #'';
       layout = "it";
       windowManager.bspwm.enable = true;
       desktopManager.xterm.enable = false;
@@ -113,6 +132,22 @@
         url    = "https://github.com/rnhmjoj/nix-slim/archive/0.2.0.tar.gz";
         sha256 = "08m6ks6crdyr02ll50gy3vpn3rzq6rp5jm2bli526r432xacdmj1";
       };
+      displayManager.desktopManagerHandlesLidAndPower = false;
+      synaptics = {
+        enable = true;
+        buttonsMap = [1 3 2];
+        tapButtons = false;
+        maxSpeed = "2.5";
+        accelFactor = "0.03";
+        palmDetect = true;
+        twoFingerScroll = true;
+        #additionalOptions = ''
+        #  Option "LockedDrags" = "true"
+        #  Option "AccelerationProfile" "-111"
+        #  Option "VertScrollDelta" = "-111"
+        #  Option "HorizScrollDelta" = "-111"
+        #'';
+      };
     };
 
     mpd = {
@@ -130,7 +165,7 @@
         }
         audio_output {
           type "alsa"
-          name "Fazo-PC"
+          name "warren"
           mixer_type "software"
         }
       '';
@@ -142,23 +177,31 @@
       longitude = "45.47";
     };
 
-    transmission = {
-      enable = false;
-      settings = {
-        download-dir = "/mnt/Dati/Download/";
-      };
-    };
-
     syncthing = {
       enable = true;
       user = "fazo";
       dataDir = "/home/fazo/.config/syncthing";
     };
+
+    logind.extraConfig = ''
+      HandlePowerKey=ignore
+    '';
+
+    upower.enable = true;
+
+    tlp = {
+      enable = true;
+      extraConfig = ''
+        CPU_SCALING_GOVERNOR_ON_AC=performance
+        CPU_SCALING_GOVERNOR_ON_BAT=powersave
+      '';
+    };
   };
 
   # Custom Services
 
   systemd.services.ipfs = {
+    enable = false;
     after = [ "network.target" ];
     wantedBy = [ "multi-user.target" ];
     path = [ pkgs.bash pkgs.fuse ];

install-prezto

@@ -9,7 +9,7 @@ fi
 
 mkdir -p $ZDOTDIR
 
-git clone --recursive https://maxwell.ydns.eu:44333/fazo96/prezto.git "${ZDOTDIR:-$HOME}/.zprezto"
+git -c http.sslVerify=false clone --recursive https://maxwell.ydns.eu:44333/fazo96/prezto.git "${ZDOTDIR:-$HOME}/.zprezto"
 
 setopt EXTENDED_GLOB
 for rcfile in "${ZDOTDIR:-$HOME}"/.zprezto/runcoms/^README.md(.N); do

lemonbar.sh

@@ -1,15 +1,16 @@
 GREY="#5f5f5f"
-WHITE="#9b9081"
-WHITE2="#b3b3b3"
+WHITE="#93a1a1"
+WHITE2="#fdf6e3"
 BLACK="#181b20"
-RED="#6b4a49"
-BLUE="#435861"
-GREEN="#6f6749"
-GREEN2="#6d6137"
-BROWN="#776049"
+RED="#dc322f"
+BLUE="#2aa198"
+GREEN="#859900"
+BROWN="#b58900"
+FG="#586e75"
+BG="#dfdfdf"
 
 buildClock() {
-  echo -n "%{F$WHITE2}$(date "+%A, %e %B, %k:%M:%S")"
+  echo -n "%{F$FG}$(date "+%A, %e %B, %k:%M")"
 }
 
 getVolume() {
@@ -18,12 +19,8 @@ getVolume() {
   COLOR=
   if [ $ONOFF == "[off]" ]; then
     COLOR=$RED
-  elif [ $VOLUME -gt 60 ]; then
-    COLOR=$GREEN2
-  elif [ $VOLUME -gt 35 ]; then
-    COLOR=$GREEN
   else
-    COLOR=$GREY
+    COLOR=$FG
   fi  
   VOLUME=$(spark $VOLUME 0 100 | tail -n 1 | cut -b1-3)
   echo -n "%{F$COLOR}$VOLUME"
@@ -35,7 +32,7 @@ getMPD(){
   PERC=$(echo "$(echo $MPD2 | cut -d ' ' -f4 | cut -b2-3 | cut -d '%' -f1) 0 100" | spark | tail -n 1 | cut -b1-3)
   #PERC=$(echo "$(echo $MPD2 | cut -d ' ' -f4 | cut -b2-3 | cut -d '%' -f1) 0 100" | spark | cut -b 1-3)
   if [ "$(mpc | wc -l)" -gt 1 ]; then
-    echo -n "%{F$BLUE}♫ %{F$BROWN}$MPD1 %{F$BLUE}♫ $PERC %{F$GREY}$(echo -n $MPD2 | cut -d ' ' -f1,2)"
+    echo -n "%{F$BLUE}♫ %{F#6c71c4}$MPD1 %{F$BLUE}♫ $PERC %{F$FG}$(echo -n $MPD2 | cut -d ' ' -f1,2)"
   fi
 }
 
@@ -45,11 +42,11 @@ getNET(){
   NNAME=$(echo $NDATA | cut -d' ' -f2)
 
   if [ "$NSTATE" == "c" ]; then
-    NCOLOR="$GREY"
+    NCOLOR="$BLACK"
   elif [ "$NSTATE" == "R" ]; then
     NCOLOR="$BLUE"
   elif [ "$NSTATE" == "O" ]; then
-    NCOLOR="$GREEN"
+    NCOLOR="$FG"
   else
     NCOLOR="$RED"
   fi
@@ -62,16 +59,16 @@ getNET(){
 }
 
 getDISK(){
-  echo -n "%{F$BLUE}$(echo "$(du -ms ~ | cut -d$'\t' -f1)/1000" | bc) GB"
+  echo -n "%{F$FG}$(echo "$(du -ms ~ | cut -d$'\t' -f1)/1000" | bc) GB"
 }
 
 separator(){
-  echo -n "%{F$GREY}◆"
+  echo -n "  "
 }
 
 getLOAD(){
   LOAD=$(echo -n "$(cat /proc/loadavg | cut -d ' ' -f 1-3) $(egrep -c '^processor' /proc/cpuinfo)00 0" | sed 's/\(0\.\|0\.0\|\.\)//g' | sed 's/800/300/g' | spark | tail -n 1 | cut -b 1-9)
-  echo -n "%{F$BLUE}$LOAD"
+  echo -n "%{F$FG}$LOAD"
 }
 
 getMEM(){
@@ -81,16 +78,25 @@ getMEM(){
     not_apps=$((not_apps+mem))
   done
   USEDMEM=$(echo "$((total-not_apps))/1000" | bc)
-  echo -n "%{F$BLUE}$USEDMEM MB"
+  echo -n "%{F$FG}$USEDMEM MB"
+}
+
+getBAT(){
+  BAT=$(acpi -b | head -n1 | cut -d ' ' -f4 | cut -d '%' -f1)
+  echo -n "%{F$FG}$BAT $(echo $BAT 0 100 | spark | cut -b 1-3)"
+}
+
+getWORKSPC(){
+  FOC="$(bspc query -D -d focused)"
+  echo -n "%{B$FG}%{F$BG}   $FOC   %{B$BG}"
 }
 
 buildBar () {
   while true
   do
-    echo " $(getMPD) %{c}$(buildClock) %{r} $(getLOAD) $(separator) $(getMEM) $(separator) $(getDISK) $(separator) $(getNET) $(separator) $(getVolume) "
-    sleep 1
+    echo " $(getMPD) %{c}$(buildClock) %{r} $(getLOAD) $(separator) $(getMEM) $(separator) $(getDISK) $(separator) $(getNET) $(separator) $(getVolume) $(separator) $(getBAT) "
+    sleep 5
   done
 }
 
-buildBar | lemonbar -p -g "1920x20" -B "$BLACK" -F "$GREY" -f -gohu-gohufont-medium-r-normal--14-100-100-100-c-80-iso10646-1
-
+buildBar | lemonbar -p -g "1890x20+15" -B "#dfdfdf" -F "$FG" -f "xft:DejaVu Sans Mono:size=11"

sxhkdrc

@@ -82,32 +82,31 @@ super + Return
 	urxvt
 
 super + space
-  dmenu_run -fn "-gohu-gohufont-medium-r-normal--14-100-100-100-c-80-iso10646-1"
+  dmenu_run -i -nf "#586e75" -nb "#dfdfdf" -fn "xft:DejaVu Sans Mono:size=12"
 
 # make sxhkd reload its configuration files:
 #super + Escape
 #	pkill -USR1 -x sxhkd
 
 # media
+XF86MonBrightnessUp
+  xbacklight -inc 1
+XF86MonBrightnessDown
+  xbacklight -dec 1
 XF86AudioRaiseVolume
 	amixer set Master 3+ unmute
 XF86AudioLowerVolume
   amixer set Master 3- unmute
 XF86AudioMute
   sh ~/bin/togglemute.sh
-XF86AudioPlay
-  mpc toggle
 XF86HomePage
   chromium
-XF86Calculator
-  urxvt -e bc
-XF86Mail
-  chromium --app=https://inbox.google.com
 
 # lock
 
 XF86Sleep
-  i3lock -u -c 1d1f21 -i ~/Pictures/background.png
+XF86LaunchB
+  i3lock -u -c 1d1f21 -i ~/Pictures/lockscreen.png
 
 # screenshots
 Print

zathurarc

@@ -1,22 +1,20 @@
 # general
-set font                      "gohufont normal 11"
-set default-bg                "#181b20"
+set font                      "xft:DejaVu Sans Mono:size=14"
+set default-bg                "#fdf6e3"
 
-set statusbar-fg              "#cdcdcd"
-set statusbar-bg              "#525f66"
+set statusbar-fg              "#586e75"
+set statusbar-bg              "#fdf6e3"
 
-set highlight-color           "#b3b3b3"
-set highlight-active-color    "#765636"
+set highlight-color           "#2aa198"
+set highlight-active-color    "#6c71c4"
 
-set inputbar-fg               "#9b9081"
-set inputbar-bg               "#181b20"
+set inputbar-fg               "#586e75"
+set inputbar-bg               "#fdf6e3"
 
-
-# dark mode
+# light mode
 set recolor                   true
-set recolor-lightcolor        "#181b20"
-set recolor-darkcolor         "#9b9081"
-
+set recolor-lightcolor        "#fdf6e3"
+set recolor-darkcolor         "#586e75"
 
 # nofitications
 set notification-error-fg     "#cdcdcd"
@@ -26,8 +24,8 @@ set notification-warning-bg   "#6d6137"
 
 # completion bar
 set n-completion-items        5
-set completion-bg             "#cdcdcd"
-set completion-fg             "#525f66"
+set completion-bg             "#fdf6e3"
+set completion-fg             "#586e75"
 set completion-highlight-fg   "#cdcdcd"
 set completion-highlight-bg   "#435861"