From 23d086d057370d9144470246c4a32e260ff978c4 Mon Sep 17 00:00:00 2001
From: Gabriel Simmer <gsimmer@protonmail.com>
Date: Sun, 11 Dec 2022 18:14:50 +0000
Subject: [PATCH] Xess tweaks

---
 flake.lock  | 74 ++++++++++++++++++++++++++---------------------------
 flake.nix   | 15 ++++++-----
 src/main.rs |  2 +-
 3 files changed, 47 insertions(+), 44 deletions(-)

diff --git a/flake.lock b/flake.lock
index d647379..fb3924e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,24 @@
 {
   "nodes": {
+    "Xess": {
+      "inputs": {
+        "nixpkgs": "nixpkgs",
+        "utils": "utils"
+      },
+      "locked": {
+        "lastModified": 1667763126,
+        "narHash": "sha256-wKn3q3hICvEfs0m3CaeJmLCSyWVuVw/5LgDdh3QSXkU=",
+        "owner": "Xe",
+        "repo": "Xess",
+        "rev": "882799a25ce4fa4df014ad701aaa5a9b23ff9e85",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Xe",
+        "repo": "Xess",
+        "type": "github"
+      }
+    },
     "crane": {
       "inputs": {
         "flake-compat": "flake-compat",
@@ -70,22 +89,6 @@
       }
     },
     "nixpkgs": {
-      "locked": {
-        "lastModified": 1669507072,
-        "narHash": "sha256-RQAHgHM7wfgUTWbEjb8Ki43tQUUcwIg1Ra+PNustAVI=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "9e6b054555c9b10310543cd213ce7c70bb0cbc5f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
       "locked": {
         "lastModified": 1640319671,
         "narHash": "sha256-ZkKmakwaOaLiZOpIZWbeJZwap5CzJ30s4UJTfydYIYc=",
@@ -101,12 +104,28 @@
         "type": "github"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1669507072,
+        "narHash": "sha256-RQAHgHM7wfgUTWbEjb8Ki43tQUUcwIg1Ra+PNustAVI=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "9e6b054555c9b10310543cd213ce7c70bb0cbc5f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
+        "Xess": "Xess",
         "crane": "crane",
         "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs",
-        "xess": "xess"
+        "nixpkgs": "nixpkgs_2"
       }
     },
     "rust-overlay": {
@@ -148,25 +167,6 @@
         "repo": "flake-utils",
         "type": "github"
       }
-    },
-    "xess": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_2",
-        "utils": "utils"
-      },
-      "locked": {
-        "lastModified": 1667763126,
-        "narHash": "sha256-wKn3q3hICvEfs0m3CaeJmLCSyWVuVw/5LgDdh3QSXkU=",
-        "owner": "Xe",
-        "repo": "Xess",
-        "rev": "882799a25ce4fa4df014ad701aaa5a9b23ff9e85",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Xe",
-        "repo": "Xess",
-        "type": "github"
-      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index cd33348..ef3de3d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,10 +11,10 @@
 
     flake-utils.url = "github:numtide/flake-utils";
 
-    xess.url = "github:Xe/Xess";
+    Xess.url = "github:Xe/Xess";
   };
 
-  outputs = { self, nixpkgs, crane, flake-utils, xess, ... }:
+  outputs = { self, nixpkgs, crane, flake-utils, Xess, ... }:
     flake-utils.lib.eachDefaultSystem (system:
       let
         pkgs = import nixpkgs {
@@ -38,14 +38,17 @@
           inherit my-crate;
         };
 
-        packages.default = my-crate;
-
         apps.default = flake-utils.lib.mkApp {
           drv = my-crate;
         };
 
-        packages = {
-          xess = xess.packages.${system}.customized ./static/css/theme.css;
+        packages = rec {
+          xess = Xess.packages.${system}.customized ./static/css/theme.css;
+          bin = my-crate;
+          default = pkgs.symlinkJoin {
+            name = "dref-${bin.version}";
+            paths = [ bin xess ];
+          };
         };
 
         devShells.default = pkgs.mkShell {
diff --git a/src/main.rs b/src/main.rs
index 533eb79..611071f 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -36,7 +36,7 @@ fn header(page_title: &str) -> Markup {
 		(DOCTYPE)
 		meta charset="utf-8";
         title { (page_title) }
-		link rel="stylesheet" href="/static/css/style.css";
+		link rel="stylesheet" href="/static/css/xess.css";
 	}
 }