From 61fd89e65e40a253ff95cfe41696a7ae5836d38a Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Tue, 9 Jun 2020 22:13:48 +0200
Subject: Fix sxiv config

---
 gui/apps/file.nix |  9 ++++++++-
 gui/apps/sxiv.nix | 10 ----------
 gui/pkgs/sxiv.nix |  7 ++-----
 3 files changed, 10 insertions(+), 16 deletions(-)
 delete mode 100644 gui/apps/sxiv.nix

(limited to 'gui')

diff --git a/gui/apps/file.nix b/gui/apps/file.nix
index d52cfc3..7fa1f64 100644
--- a/gui/apps/file.nix
+++ b/gui/apps/file.nix
@@ -3,7 +3,7 @@
 {
   home = {
     packages = let
-      custom-sxiv = import ./sxiv.nix pkgs;
+      custom-sxiv = pkgs.callPackage ../pkgs/sxiv.nix { };
     in with pkgs; [
     # browser
       pcmanfm
@@ -41,4 +41,11 @@
       XDG_DOWNLOAD_DIR="$HOME/downloads/"
     '';
   };
+
+# sxiv config
+  xresources.extraConfig = ''
+    Sxiv.font: Iosevka:size=12
+    Sxiv.foreground: #909636
+    Sxiv.background: #161616
+  '';
 }
diff --git a/gui/apps/sxiv.nix b/gui/apps/sxiv.nix
deleted file mode 100644
index 48390dc..0000000
--- a/gui/apps/sxiv.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ pkgs, ... }:
-
-pkgs.callPackage ../pkgs/sxiv.nix {
-  theme = {
-    font_name = "Iosevka";
-    font_size = "12";
-    bg = "#161616";
-    fg = "#909636";
-  };
-}
diff --git a/gui/pkgs/sxiv.nix b/gui/pkgs/sxiv.nix
index 0f9e95d..385c209 100644
--- a/gui/pkgs/sxiv.nix
+++ b/gui/pkgs/sxiv.nix
@@ -1,15 +1,12 @@
-{ pkgs, theme, ... }:
+{ pkgs, ... }:
 
 let
-  config = with theme; ''
+  config = ''
     #ifdef _WINDOW_CONFIG
       enum {
         WIN_WIDTH  = 800,
         WIN_HEIGHT = 600
       };
-      static const char * const BAR_FONT = "${font_name}:size=${font_size}";
-      static const char * const BG_COLOR = "${bg}";
-      static const char * const FG_COLOR = "${fg}";
     #endif
     #ifdef _IMAGE_CONFIG
       static const float zoom_levels[] = {
-- 
cgit v1.2.3