Update changes + submodule updates

14 files changed, 71 insertions, 56 deletions

diff --git a/extras/notes b/extras/notes
-Subproject a2c0f60dbd6d33b5727ca2bfe0eb6152e3a03b1
+Subproject 6e7779686fcedab88e763b855f2c7de7c11d4f1
diff --git a/hardware/thinkpad-e14/default.nix b/hardware/thinkpad-e14/default.nix
index b6500ea..7b75faa 100644
--- a/hardware/thinkpad-e14/default.nix
+++ b/hardware/thinkpad-e14/default.nix
@@ -76,9 +76,11 @@ in {
       #     cat $out/lib/udev/rules.d/*
       #   '';
       # }))
-      android-udev-rules
+      # android-udev-rules
       platformio-core.udev
       openocd
+      zsa-udev-rules
+      logitech-udev-rules
     ];
   };
 
@@ -95,7 +97,7 @@ in {
   };
 
   nixpkgs.config.packageOverrides = pkgs: {
-    vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
+    intel-vaapi-driver = pkgs.intel-vaapi-driver.override { enableHybridCodec = true; };
   };
   hardware.graphics = {
     enable = true;
@@ -105,8 +107,8 @@ in {
     extraPackages = with pkgs; [
       intel-media-driver
       # intel-vaapi-driver
-      vaapiIntel
-      vaapiVdpau
+      intel-vaapi-driver
+      libva-vdpau-driver
       libvdpau-va-gl
       intel-gmmlib
       vulkan-tools
diff --git a/home.nix b/home.nix
index fcf135f..784a24e 100644
--- a/home.nix
+++ b/home.nix
@@ -52,7 +52,7 @@ in
 
   services.syncthing = {
     enable = true;
-    tray = false;
+    tray = { enable = false; };
   };
 
   services.udiskie = {
diff --git a/modules/email.home/README.md b/modules/email.home/README.md
new file mode 100644
index 0000000..43dfad5
--- /dev/null
+++ b/modules/email.home/README.md
@@ -0,0 +1,10 @@
+### Authentication
+
+Download credentials from google cloud platform: https://console.cloud.google.com/apis/credentials
+
+```
+cd ~/mail/account.gmail/
+gmi auth -c <path-to-downloaded-creds> -f
+```
+
+
diff --git a/modules/email.home/aerc.theme.nix b/modules/email.home/aerc.theme.nix
index e4a0868..3e3ecd5 100644
--- a/modules/email.home/aerc.theme.nix
+++ b/modules/email.home/aerc.theme.nix
@@ -2,51 +2,53 @@ let
   xresources = (import ../xresources.home.nix {}).xresources.properties;
   accent = xresources."*.accent";
 in {
-  "title.bg" = accent;
-  "title.fg" = "black";
-  "title.bold" = true;
-  "header.bold" = true;
-  "header.fg" = accent;
-  "tab.bold" = true;
-  "tab.selected.fg" = "white";
-  "tab.selected.bg" = accent;
-  "tab.selected.bold" = true;
-  "dirlist*.selected.bg" = accent;
-  "dirlist*.selected.fg" = "white";
-  "dirlist*.selected.bold" = false;
-  "*error.bold" = true;
-  "*error.fg" = "red";
-  "*warning.fg" = "yellow";
-  "*success.fg" = "green";
-  "statusline_default.bg" = "#303030";
-  "statusline_error.fg" = "red";
-  "msglist_unread.fg" = "#ffffff";
-  "msglist_unread.bold" = true;
-  "msglist_deleted.fg" = "#666666";
-  "msglist_*.selected.bg" = accent;
-  "msglist_marked.fg" = "black";
-  "msglist_marked.selected.fg" = "black";
-  "msglist_marked.bg" = "#BD93F9";
-  "msglist_marked.selected.bg" = "#9956f5";
-  "completion_pill.reverse" = false;
-  "selector_focused.bold" = false;
-  "selector_focused.bg" = accent;
-  "selector_focused.fg" = "white";
-  "selector_chooser.bold" = false;
-  "selector_chooser.bg" = accent;
-  "selector_chooser.fg" = "white";
-  "default.selected.bold" = false;
-  "default.selected.fg" = "white";
-  "default.selected.bg" = accent;
-  "completion_default.selected.bg" = accent;
-  "completion_default.selected.fg" = "white";
-  "part_filename.bold" = true;
-  "part_mimetype.fg" = accent;
-  "part_filename.selected.bg" = accent;
-  "part_filename.selected.fg" = "white";
-  "part_mimetype.selected.bg" = accent;
-  "part_mimetype.selected.fg" = "white";
-  "part_mimetype.selected.bold" = true;
-  "part_switcher.selected.bg" = accent;
-  "part_switcher.selected.fg" = "white";
+  global = {
+    "title.bg" = accent;
+    "title.fg" = "black";
+    "title.bold" = "true";
+    "header.bold" = "true";
+    "header.fg" = accent;
+    "tab.bold" = "true";
+    "tab.selected.fg" = "white";
+    "tab.selected.bg" = accent;
+    "tab.selected.bold" = "true";
+    "dirlist*.selected.bg" = accent;
+    "dirlist*.selected.fg" = "white";
+    "dirlist*.selected.bold" = "false";
+    "*error.bold" = "true";
+    "*error.fg" = "red";
+    "*warning.fg" = "yellow";
+    "*success.fg" = "green";
+    "statusline_default.bg" = "#303030";
+    "statusline_error.fg" = "red";
+    "msglist_unread.fg" = "#ffffff";
+    "msglist_unread.bold" = "true";
+    "msglist_deleted.fg" = "#666666";
+    "msglist_*.selected.bg" = accent;
+    "msglist_marked.fg" = "black";
+    "msglist_marked.selected.fg" = "black";
+    "msglist_marked.bg" = "#BD93F9";
+    "msglist_marked.selected.bg" = "#9956f5";
+    "completion_pill.reverse" = "false";
+    "selector_focused.bold" = "false";
+    "selector_focused.bg" = accent;
+    "selector_focused.fg" = "white";
+    "selector_chooser.bold" = "false";
+    "selector_chooser.bg" = accent;
+    "selector_chooser.fg" = "white";
+    "default.selected.bold" = "false";
+    "default.selected.fg" = "white";
+    "default.selected.bg" = accent;
+    "completion_default.selected.bg" = accent;
+    "completion_default.selected.fg" = "white";
+    "part_filename.bold" = "true";
+    "part_mimetype.fg" = accent;
+    "part_filename.selected.bg" = accent;
+    "part_filename.selected.fg" = "white";
+    "part_mimetype.selected.bg" = accent;
+    "part_mimetype.selected.fg" = "white";
+    "part_mimetype.selected.bold" = "true";
+    "part_switcher.selected.bg" = accent;
+    "part_switcher.selected.fg" = "white";
+  };
 }
diff --git a/modules/keyboard/default.nix b/modules/keyboard/default.nix
index 47486ce..56daec4 100644
--- a/modules/keyboard/default.nix
+++ b/modules/keyboard/default.nix
@@ -1,7 +1,7 @@
 { ... }:
 {
   services.kmonad = {
-    enable = true;
+    enable = false;
     keyboards = {
       k2 = {
         name = "k2";
diff --git a/modules/music/client.home.nix b/modules/music/client.home.nix
index 73c7d4d..375b503 100644
--- a/modules/music/client.home.nix
+++ b/modules/music/client.home.nix
@@ -3,7 +3,7 @@ let
   cfg = import ./config.nix moduleAttrs;
 in
 {
-  home.packages = with pkgs; [ mpc_cli playerctl ];
+  home.packages = with pkgs; [ mpc playerctl ];
 
   programs.ncmpcpp = {
     enable = true;
diff --git a/modules/sound/default.nix b/modules/sound/default.nix
index aed4f94..1a83018 100644
--- a/modules/sound/default.nix
+++ b/modules/sound/default.nix
@@ -12,7 +12,7 @@
   environment.systemPackages = with pkgs; [
     alsa-utils
     qjackctl
-    ardour
+    # ardour
     fluidsynth
     a2jmidid
     pavucontrol
diff --git a/modules/torrent.nix b/modules/torrent.nix
index 0a52973..64c6d3b 100644
--- a/modules/torrent.nix
+++ b/modules/torrent.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ pkgs, ... }:
 let
   downloadsDir = "/home/imsohexy/Downloads/_downloads";
   incompleteDownloadsDir = "${downloadsDir}/_incomplete";
@@ -16,6 +16,7 @@ in
   services.transmission = {
     enable = true;
     group = group;
+    package = pkgs.transmission_4;
     settings = {
       "download-dir" = downloadsDir;
       "download-queue-enabled" = true;
diff --git a/packages/bslock/source b/packages/bslock/source
-Subproject 041e36d529871e7c0d7e2d1f46b198daa8e68b6
+Subproject c88c55a7214194a6f61b1392842efa9565c5ba4
diff --git a/packages/dmenu/source b/packages/dmenu/source
-Subproject 2e5063d7383048fc903056ef1a07413787e60dc
+Subproject 47dd5a859cddf6116bc73a64684eea2170f44f4
diff --git a/packages/dwm/source b/packages/dwm/source
-Subproject 25592e4e56b5a2082b8af1269742afbb4a52650
+Subproject 7aba9c5b43c20b7f7f3eea67ad55fa85a7b2e85
diff --git a/packages/shotkey/source b/packages/shotkey/source
-Subproject 8bc06c025219e7bb48151b1affb74d2bf463e1e
+Subproject dfdf18b5ac8dc0b2568bed2456c47acc823bceb
diff --git a/packages/st/source b/packages/st/source
-Subproject 3f19e6b7d142162ba9fe5b8c84fed38e196c9ba
+Subproject 1c8273f519e6666dd949da0d6df778975630c77