From f0855976af1d054b45bd2f55b0e1d9aa466a610c Mon Sep 17 00:00:00 2001
From: Gabriel Arazas <foo.dogsquared@gmail.com>
Date: Tue, 10 Nov 2020 16:20:03 +0800
Subject: [PATCH] Update the Nix modules and config

---
 hosts/zilch/config/unison/default.prf               |  6 ++++++
 hosts/zilch/default.nix                             |  3 +--
 modules/desktop/audio.nix                           |  1 +
 modules/dev/android.nix                             |  2 +-
 modules/dev/base.nix                                | 13 ++++++++++++-
 modules/dev/data.nix                                |  1 +
 modules/dev/perl.nix                                |  2 +-
 templates/themes/fair-and-square/cookiecutter.json  |  2 +-
 .../{{ cookiecutter.slug }}/config/dunst/dunstrc    |  6 +++---
 9 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/hosts/zilch/config/unison/default.prf b/hosts/zilch/config/unison/default.prf
index 0121dfb3..07845500 100755
--- a/hosts/zilch/config/unison/default.prf
+++ b/hosts/zilch/config/unison/default.prf
@@ -16,6 +16,12 @@ path = .ssh
 # My Cachix signing key
 path = .config/cachix
 
+# My Cookiecutter templates
+path = templates
+
+# My encrypted files
+path = secrets
+
 # Some regexps specifying names and paths to ignore
 ignore = Name temp.*
 ignore = Name *~
diff --git a/hosts/zilch/default.nix b/hosts/zilch/default.nix
index 1637499a..81791478 100755
--- a/hosts/zilch/default.nix
+++ b/hosts/zilch/default.nix
@@ -105,7 +105,7 @@
       cc.enable = true;
       data = {
         enable = true;
-        dhall.enable = true;
+        #dhall.enable = true;
       };
       documentation = {
         enable = true;
@@ -123,7 +123,6 @@
         racket.enable = true;
       };
       math.enable = true;
-      perl.enable = true;
       perl = {
         enable = true;
         raku.enable = true;
diff --git a/modules/desktop/audio.nix b/modules/desktop/audio.nix
index 35c29281..7e084b2c 100755
--- a/modules/desktop/audio.nix
+++ b/modules/desktop/audio.nix
@@ -42,6 +42,7 @@ in {
         carla # A plugin host useful for a consistent hub for them soundfonts and SFZs.
         fluidsynth # Synth for fluid sounds.
         geonkick # Create them percussions.
+        giada # A hardcore loop machine for wannabe musicians like me.
         helm # A great synthesizer plugin.
         hydrogen # Them drum beats composition will get good.
         lmms # A decent libre FL Studio clone.
diff --git a/modules/dev/android.nix b/modules/dev/android.nix
index 3513c038..281c5973 100755
--- a/modules/dev/android.nix
+++ b/modules/dev/android.nix
@@ -26,7 +26,7 @@ in {
     programs.adb.enable = true;
 
     # Install Anbox emulation.
-    virtualisation.anbox.enable = true;
+    #virtualisation.anbox.enable = true;
 
     my.user.extraGroups = [ "adbusers" ];
   };
diff --git a/modules/dev/base.nix b/modules/dev/base.nix
index 1bd330f4..e30b4aac 100755
--- a/modules/dev/base.nix
+++ b/modules/dev/base.nix
@@ -29,8 +29,19 @@ in {
 
     # Augment your shell with automatic environment variables loading and unloading.
     my.home.programs = {
-      direnv.enable = true;
+      direnv = {
+        enable = true;
+        enableBashIntegration = true;
+        enableFishIntegration = true;
+        enableZshIntegration = true;
+      };
       fish.enable = true;
     };
   };
+
+  my.zsh = {
+    rc = ''
+      eval "$(${pkgs.direnv}/bin/direnv hook zsh)"
+    '';
+  };
 }
diff --git a/modules/dev/data.nix b/modules/dev/data.nix
index 62b6d79a..9fa5947e 100755
--- a/modules/dev/data.nix
+++ b/modules/dev/data.nix
@@ -27,6 +27,7 @@ in {
       pup # A cute little puppy that can understand HTML.
       sqlite # A cute little battle-tested library for your data abominations.
       sqlitebrowser # Skim the DB and create a quick scraping script for it.
+      yq # A YAML parser on the command-line.
     ] ++
 
     (if cfg.dhall.enable then [
diff --git a/modules/dev/perl.nix b/modules/dev/perl.nix
index 55904fdd..de3189f4 100755
--- a/modules/dev/perl.nix
+++ b/modules/dev/perl.nix
@@ -27,6 +27,6 @@ in {
   config = mkIf cfg.enable {
     my.packages = [ perlWithPackages ]
     ++ (if cfg.raku.enable then [
-      rakudo
+      pkgs.rakudo
     ] else []); };
 }
diff --git a/templates/themes/fair-and-square/cookiecutter.json b/templates/themes/fair-and-square/cookiecutter.json
index c3dab4b1..8747f218 100755
--- a/templates/themes/fair-and-square/cookiecutter.json
+++ b/templates/themes/fair-and-square/cookiecutter.json
@@ -17,7 +17,7 @@
     "base0C": "#81A1C1",
     "base0D": "#B48EAD",
     "base0E": "#8FBCBB",
-    "base0F": "#ECEFF4"
+    "base0F": "#ECEFF4",
     "font": {
       "mono": {
         "name": "Iosevka",
diff --git a/templates/themes/fair-and-square/{{ cookiecutter.slug }}/config/dunst/dunstrc b/templates/themes/fair-and-square/{{ cookiecutter.slug }}/config/dunst/dunstrc
index 216a37ee..e66a3490 100755
--- a/templates/themes/fair-and-square/{{ cookiecutter.slug }}/config/dunst/dunstrc	
+++ b/templates/themes/fair-and-square/{{ cookiecutter.slug }}/config/dunst/dunstrc	
@@ -29,7 +29,7 @@
     # the top and down respectively.
     # The width can be negative.  In this case the actual width is the
     # screen width minus the width defined in within the geometry option.
-    geometry = "350x50-10+50"
+    geometry = "350x50-10-50"
 
     # Show how many messages are currently hidden (because of geometry).
     indicate_hidden = yes
@@ -283,8 +283,8 @@
 [urgency_low]
     # IMPORTANT: colors have to be defined in quotation marks.
     # Otherwise the "#" and following would be interpreted as a comment.
-    background = "{{ cookiecutter.base00 }}"
-    foreground = "{{ cookiecutter.base0F }}"
+    background = "{{ cookiecutter.base01 }}"
+    foreground = "{{ cookiecutter.base07 }}"
     timeout = 10
     # Icon for notifications with low urgency, uncomment to enable
     #icon = /path/to/icon