From 923b52b4b294675ad2d6c24447e0db582274824c Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Mon, 9 Aug 2021 03:40:36 -0600
Subject: [PATCH] Random tweaks

---
 dotfiles/config/xmonad/flake.nix       | 3 +++
 dotfiles/lib/functions/toggle_taffybar | 3 ++-
 nixos/cachix.nix                       | 6 ------
 nixos/essential.nix                    | 5 ++++-
 nixos/extra.nix                        | 1 +
 nixos/home-manager.nix                 | 2 +-
 6 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/dotfiles/config/xmonad/flake.nix b/dotfiles/config/xmonad/flake.nix
index 2df37579..18bd063d 100644
--- a/dotfiles/config/xmonad/flake.nix
+++ b/dotfiles/config/xmonad/flake.nix
@@ -20,6 +20,9 @@
   rec {
     devShell = pkgs.haskellPackages.shellFor {
       packages = p: [ p.imalison-xmonad ];
+      buildInputs = with pkgs.haskellPackages; [
+        cabal-install haskell-language-server hlint ghcid ormolu implicit-hie
+      ];
     };
     defaultPackage = pkgs.haskellPackages.imalison-xmonad;
   }) // { inherit overlay overlays; } ;
diff --git a/dotfiles/lib/functions/toggle_taffybar b/dotfiles/lib/functions/toggle_taffybar
index 5b13b244..d92047d3 100755
--- a/dotfiles/lib/functions/toggle_taffybar
+++ b/dotfiles/lib/functions/toggle_taffybar
@@ -1,7 +1,8 @@
 #!/usr/bin/env sh
 
 function toggle_taffybar {
-	dbus-send --print-reply=literal --dest=taffybar.toggle /taffybar/toggle taffybar.toggle.toggleCurrent
+	dbus-send --print-reply=literal --dest=taffybar.toggle \
+			  /taffybar/toggle taffybar.toggle.toggleCurrent
 }
 
 toggle_taffybar
diff --git a/nixos/cachix.nix b/nixos/cachix.nix
index 87f5c327..8167ccdb 100644
--- a/nixos/cachix.nix
+++ b/nixos/cachix.nix
@@ -2,14 +2,8 @@
   nix = {
     binaryCaches = [
       "https://cache.nixos.org/"
-      "https://hie-nix.cachix.org"
-      "https://taffy.cachix.org"
-      "https://waymonad.cachix.org"
     ];
     binaryCachePublicKeys = [
-      "hie-nix.cachix.org-1:EjBSHzF6VmDnzqlldGXbi0RM3HdjfTU3yDRi9Pd0jTY="
-      "taffy.cachix.org-1:H0iiOGeXnLOAptADO4i3AiDIOladTcZYxXp+P0lOvHw="
-      "waymonad.cachix.org-1:Z4Nbjc3iYJNFZi0eAgzqLWFBuDRClAy1prZBv7eK64A="
     ];
   };
 }
diff --git a/nixos/essential.nix b/nixos/essential.nix
index b3a02044..2bde7fca 100644
--- a/nixos/essential.nix
+++ b/nixos/essential.nix
@@ -22,12 +22,15 @@ in
     python-with-my-packages
 
     alacritty
-    emacs
+    (emacsWithPackages (epkgs: with epkgs.melpaPackages; [
+      vterm
+    ]))
     firefox
     vlc
     transmission-gtk
     dolphin
     element-desktop
+    gpick
 
     # Appearance
     numix-icon-theme-circle
diff --git a/nixos/extra.nix b/nixos/extra.nix
index cf72cc10..b22c6bc4 100644
--- a/nixos/extra.nix
+++ b/nixos/extra.nix
@@ -5,6 +5,7 @@
   environment.systemPackages = with pkgs; [
     asciidoctor
     vscode
+    signal-desktop
     gource
     gimp
     texlive.combined.scheme-full
diff --git a/nixos/home-manager.nix b/nixos/home-manager.nix
index cbe0906d..6c0fb311 100644
--- a/nixos/home-manager.nix
+++ b/nixos/home-manager.nix
@@ -55,7 +55,7 @@
 
   services.random-background = {
     enable = true;
-    display = "center";
+    display = "scale";
     interval = "1h";
     imageDirectory = "%h/Pictures/wallpaper/use";
   };