1 files changed, 7 insertions, 38 deletions
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 = {