From 283c1deef0a47c612b6eb8a6d35634e40baee929 Mon Sep 17 00:00:00 2001
From: clay53 <clayton@claytondoesthings.xyz>
Date: Thu, 10 Apr 2025 15:41:08 -0400
Subject: [PATCH] osm-bikeability

---
 configuration.nix |  8 +++++++-
 flake.lock        | 45 +++++++++++++++++++++++++++++++++++++++------
 flake.nix         | 10 +++++++---
 3 files changed, 53 insertions(+), 10 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index db6d380..5c0e6d4 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -8,7 +8,13 @@ in
     [
       ./hardware-configuration.nix
       "${inputs.home-manager}/nixos"
+      inputs.mapnix.nixosModules.default
     ];
+  
+  services.mapnix = {
+    openstreetmap-carto-src = inputs.osm-bikeability;
+    enable = true;
+  };
 
   boot = {
     loader = {
@@ -157,7 +163,6 @@ in
       jdk8
       slack
       inputs.penn-nix.packages.x86_64-linux.waypoint-client
-      #vscode-fhs
       inputs.cnvim.packages.x86_64-linux.default
       osu-lazer-bin
       wl-clipboard
@@ -166,6 +171,7 @@ in
       element-desktop
       gh
       vscode-fhs
+      code-cursor
       firefox
       popsicle
       kdePackages.kget
diff --git a/flake.lock b/flake.lock
index a21b2c3..a8d705d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -195,11 +195,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1743438213,
-        "narHash": "sha256-ZZDN+0v1r4I1xkQWlt8euOJv5S4EvElUCZMrDjTCEsY=",
+        "lastModified": 1744172174,
+        "narHash": "sha256-Ud0ClYf8YHhbYmg1piPJx2iuYOh62HQiRzDObD2gzsk=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ccd7df836e1f42ea84806760f25b77b586370259",
+        "rev": "4040c5779ce56d36805bc7a83e072f0f894eae7d",
         "type": "github"
       },
       "original": {
@@ -238,6 +238,21 @@
         "type": "github"
       }
     },
+    "mapnix": {
+      "locked": {
+        "lastModified": 1744186434,
+        "narHash": "sha256-N7otnO9pwhZIb1iil7p4r0AX7koADMNMbb//F83Zn5A=",
+        "owner": "clay53",
+        "repo": "mapnix",
+        "rev": "88e62ecab79ae43072335efa6fdccdc7484250c0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "clay53",
+        "repo": "mapnix",
+        "type": "github"
+      }
+    },
     "nix-darwin": {
       "inputs": {
         "nixpkgs": [
@@ -262,11 +277,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1743315132,
-        "narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=",
+        "lastModified": 1744098102,
+        "narHash": "sha256-tzCdyIJj9AjysC3OuKA+tMD/kDEDAF9mICPDU7ix0JA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "52faf482a3889b7619003c0daec593a1912fddc1",
+        "rev": "c8cd81426f45942bb2906d5ed2fe21d2f19d95b7",
         "type": "github"
       },
       "original": {
@@ -345,6 +360,22 @@
         "type": "github"
       }
     },
+    "osm-bikeability": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1742811408,
+        "narHash": "sha256-vOufDLf9M8EDxvPUPH1UQ/DmQFxpKA3HxwzxyXZr4PQ=",
+        "owner": "clay53",
+        "repo": "osm-bikeability",
+        "rev": "cd97f2c1dd9c018a907112f2321999396fdebeec",
+        "type": "github"
+      },
+      "original": {
+        "owner": "clay53",
+        "repo": "osm-bikeability",
+        "type": "github"
+      }
+    },
     "penn-nix": {
       "inputs": {
         "flake-utils": "flake-utils_2",
@@ -368,7 +399,9 @@
       "inputs": {
         "cnvim": "cnvim",
         "home-manager": "home-manager_2",
+        "mapnix": "mapnix",
         "nixpkgs": "nixpkgs",
+        "osm-bikeability": "osm-bikeability",
         "penn-nix": "penn-nix"
       }
     },
diff --git a/flake.nix b/flake.nix
index 4fc0f6b..c81e900 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,9 +10,13 @@
       url = "github:clay53/cnvim";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    #mapnix = {
-    #  url = "path:/home/clhickey/osm-biking-filter/mapnik/flake.nix";
-    #};
+    mapnix = {
+      url = "github:clay53/mapnix";
+    };
+    osm-bikeability = {
+      url = "github:clay53/osm-bikeability";
+      flake = false;
+    };
   };
   outputs = { self, nixpkgs, ... }@inputs: {
     nixosConfigurations.clhickey-nixos = nixpkgs.lib.nixosSystem {