lots of updates, idk

7 files changed, 25 insertions, 75 deletions

diff --git a/lib/common.nix b/lib/common.nix
index 3f15754..cdbbf6e 100644
--- a/lib/common.nix
+++ b/lib/common.nix
@@ -224,12 +224,19 @@ in
       ];
     };
 
-    urxvt = {
+    urxvt = let font = size: "xft:Fira Mono:size=${toString size}:ant"; in {
       enable = true;
       fonts = [
-        "xft:Fira Mono:size=8:ant"
-        "xfg:Noto Emoji"
+        (font 6)
+        "xft:Noto Emoji"
       ];
+      keybindings = {
+        # why don't any of these work?
+        "Shift-Control-C" = "eval:selection_to_clipboard";
+        "Shift-Control-V" = "eval:paste_clipboard";
+        "Shift-Control-+" = "command:\033]710;${font 12}\007\033]711;${font 12}\007";
+        "Shift-Control--" = "command:\033]710;${font 8}\007\033]711;${font 8}\007";
+      };
       iso14755 = true; # unicode chars
       #transparent = true;
       #shading = 10;
diff --git a/lib/emacs-packages.nix b/lib/emacs-packages.nix
index eeb85dd..d930e12 100644
--- a/lib/emacs-packages.nix
+++ b/lib/emacs-packages.nix
@@ -8,8 +8,7 @@ ace-link
 all-the-icons
 anzu
 avy
-avy-zap
-# bbdb
+bbdb
 blacken
 carbon-now-sh
 centaur-tabs
@@ -24,6 +23,7 @@ dired-narrow
 direnv
 doom-themes
 doom-modeline
+embark
 editorconfig
 erc-hl-nicks
 evil
@@ -42,6 +42,7 @@ geiser-guile
 general
 # melpaStablePackages.git-timemachine # broken hash
 haskell-mode
+helpful
 highlight-symbol
 htmlize
 ibuffer-vc
diff --git a/lib/email.nix b/lib/email.nix
index 061cf46..23a41a3 100644
--- a/lib/email.nix
+++ b/lib/email.nix
@@ -19,8 +19,7 @@ in
           realName = "Ben Sima";
           address = "ben@bsima.me";
           userName = "ben@simatime.com";
-          # alot is broken in nixpkgs 21.11
-          #alot.sendMailCommand = "${homedir}/bin/sendmail";
+          alot.sendMailCommand = "${homedir}/bin/sendmail";
           imap = {
             host = "simatime.com";
             port = 993;
@@ -47,21 +46,6 @@ in
           passwordCommand = "${pkgs.coreutils}/bin/cat ~/private/ben@simatime.com";
           msmtp.enable = true;
         };
-
-        # "ben@heroprojects.io" = {
-        #   flavor = "gmail.com";
-        #   realName = "Ben Sima";
-        #   address = "ben@heroprojects.io";
-        #   userName = "ben@heroprojects.io";
-        #   mbsync = {
-        #     enable = true;
-        #     create = "both";
-        #     expunge = "none";
-        #   };
-        #   notmuch.enable = true;
-        #   msmtp.enable = true;
-        #   passwordCommand = "cat ~/keybase/private/bsima/ben@heroprojects.io";
-        # };
       };
     };
   };
diff --git a/lib/linux.nix b/lib/linux.nix
index 5ac859a..f5bad73 100644
--- a/lib/linux.nix
+++ b/lib/linux.nix
@@ -4,43 +4,10 @@ let
   homedir = builtins.getEnv "HOME";
   hostname = lib.strings.removeSuffix "\n" (builtins.readFile /etc/hostname);
   gpgid = "66A6AD150399D970DCA4C4E6C8218B7D0BFDECCD";
-  cmdtree = pkgs.stdenv.mkDerivation {
-    name = "cmdtree";
-    src = fetchGit {
-      url = "https://git.sr.ht/~jb55/cmdtree";
-      ref = "master";
-      rev = "5606078e8fa02462f0208d9f9cad98c7673812e6";
-    };
-    buildPhase = ''
-      cp ${./cfg.def.h} ./cfg.def.h
-      make
-    '';
-    installPhase = ''
-      mkdir -p $out/bin
-      cp ./cmdtree $out/bin
-    '';
-    buildInputs = [ pkgs.xorg.libX11 pkgs.xorg.libXft ];
-  };
-
   base16-scheme = "atelier-sulphurpool";
   base16-scheme-filename = lib.strings.concatStrings (lib.strings.splitString "-" base16-scheme);
-  base16 = pkgs.stdenv.mkDerivation {
-    name = "base16-builder";
-    src = pkgs.fetchFromGitHub {
-      owner = "auduchinok";
-      repo = "base16-builder";
-      rev = "51e3ad4d447fc3f1f539d0bfe33c851728fb6b5f";
-      sha256 = "1qir689h38c6jr7fbbqbc3029544zgv41lrrqdcq26kcwxcwjrz1";
-    };
-    nativeBuildInputs = [pkgs.ruby];
-    buildPhase = "${pkgs.ruby}/bin/ruby base16 -s schemes/${base16-scheme}.yml";
-    installPhase = ''
-      mkdir -p $out
-      cp -r output/* $out
-    '';
-  };
   theme = lib.removeSuffix "\n" (builtins.readFile "${homedir}/.local/share/xtheme");
-  xresources = "${base16}/xresources/base16-${base16-scheme-filename}.${theme}.256.xresources";
+  xresourcesFile = "${pkgs.base16}/xresources/base16-${base16-scheme-filename}.${theme}.256.xresources";
 
   # used in polybar and dunst
   colors = { # derived from spacemacs
@@ -111,7 +78,9 @@ in
       libnotify
       lshw
       mplayer
+      muchsync
       mumble
+      nyxt
       pandoc
       pavucontrol
       pinentry
@@ -138,7 +107,7 @@ in
 
   xresources = {
     properties = {
-      "XTerm*font" = "-*-FiraMono-medium-r-normal--18-*-*-*-*-*-iso10646-1";
+      "XTerm*font" = "-*-FiraMono-medium-r-normal--10-*-*-*-*-*-iso10646-1";
       "XTerm*faceName" = "FireMono";
       "XTerm*faceSize" = "10";
       "XTerm*termName" = "xterm-256color";
@@ -151,7 +120,7 @@ in
       #"Xautolock.notify:" = 30;
       #"Xautolock.notifier:" = "notify-send -u critical -t 10000 -- 'Locking screen in 30 seconds'";
     };
-    extraConfig = builtins.readFile(xresources);
+    extraConfig = builtins.readFile xresourcesFile;
   };
 
   services = {
@@ -337,7 +306,7 @@ in
       temperature = {
         # orange = 1000, white = 5000
         day = 5000;
-        night = 2300;
+        night = 1800;
       };
     };
 
@@ -345,7 +314,7 @@ in
       enable = true;
       enableXinerama = true;
       imageDirectory = "%h/wallpaper";
-      interval = "5m";
+      interval = "30m";
     };
 
     gpg-agent = {
diff --git a/lib/packages.nix b/lib/packages.nix
index caf2449..9d0251e 100644
--- a/lib/packages.nix
+++ b/lib/packages.nix
@@ -39,21 +39,6 @@ let
   #  ];
   #  doCheck = false;
   #};
-
-  zebra = pkgs.stdenv.mkDerivation {
-    name = "zebra";
-    src = fetchGit {
-      url = "https://github.com/jb55/zebra";
-      ref = "master";
-      rev = "8fd29bc1c2e9b7b695d61e0f1329c819f57f74bb";
-      #sha256 = "11apyy90n26l3c4diqg8y8m4a4ndz9mp8nr8prcxkcsckpa3vqi2";
-    };
-    buildPhase = "make";
-    installPhase = ''
-      mkdir -p $out/bin
-      cp ./zebra $out/bin
-    '';
-  };
 in {
   home.packages = [
     amfora
diff --git a/lib/ssh.nix b/lib/ssh.nix
index 2d1ab46..48b79ad 100644
--- a/lib/ssh.nix
+++ b/lib/ssh.nix
@@ -4,6 +4,7 @@ let
   homedir = builtins.getEnv "HOME";
 in {
   programs.ssh = {
+    controlMaster = "auto";
     enable = true;
     forwardAgent = true;
     matchBlocks = {
diff --git a/lib/userstyles.css b/lib/userstyles.css
index dfafb89..1b1449b 100644
--- a/lib/userstyles.css
+++ b/lib/userstyles.css
@@ -4,3 +4,6 @@ input, input#hoogle
 /* gwern.net */
 .markdownBody a:link, .markdownBody a:link *, #footer a:link
 { text-shadow: none }
+
+/* gitolite.com */
+body { background: transparent }