From 387412db8ed308985a08498e85770af27a8afa3d Mon Sep 17 00:00:00 2001
From: clerie <git@clerie.de>
Date: Sat, 29 Jul 2023 12:19:18 +0200
Subject: [PATCH 1/3] pkgs/nixfiles: add script that updates flake inputs and
 pushes it to upstream

---
 flake.nix                                |  1 +
 pkgs/nixfiles/default.nix                | 10 ++++++++++
 pkgs/nixfiles/nixfiles-updated-inputs.sh | 13 +++++++++++++
 pkgs/overlay.nix                         |  1 +
 4 files changed, 25 insertions(+)
 create mode 100644 pkgs/nixfiles/default.nix
 create mode 100755 pkgs/nixfiles/nixfiles-updated-inputs.sh

diff --git a/flake.nix b/flake.nix
index dd2b267..81ec93b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -94,6 +94,7 @@
         anycast_healthchecker
         flask-excel
         iot-data
+        nixfiles-updated-inputs
         pyexcel-xlsx
         pyexcel-webio
         uptimestatus
diff --git a/pkgs/nixfiles/default.nix b/pkgs/nixfiles/default.nix
new file mode 100644
index 0000000..20353ce
--- /dev/null
+++ b/pkgs/nixfiles/default.nix
@@ -0,0 +1,10 @@
+{ pkgs, ... }:
+
+pkgs.writeShellApplication {
+  name = "nixfiles-updated-inputs.sh";
+  text = builtins.readFile ./nixfiles-updated-inputs.sh;
+  runtimeInputs = [
+    pkgs.git
+  ];
+}
+
diff --git a/pkgs/nixfiles/nixfiles-updated-inputs.sh b/pkgs/nixfiles/nixfiles-updated-inputs.sh
new file mode 100755
index 0000000..b8a2806
--- /dev/null
+++ b/pkgs/nixfiles/nixfiles-updated-inputs.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+NOW="$(date --utc --iso-8601=minutes)"
+
+git fetch origin master
+git checkout updated-inputs
+git merge -s ort -X theirs origin/master -m "Update from master ${NOW}"
+nix flake update
+git add flake.lock
+git commit -m "Flake update ${NOW}" || true
+git push origin updated-inputs
diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix
index 347a132..b4514a6 100644
--- a/pkgs/overlay.nix
+++ b/pkgs/overlay.nix
@@ -2,6 +2,7 @@ self: super: {
   anycast_healthchecker = self.python3.pkgs.callPackage ./anycast_healthchecker {};
   flask-excel = self.python3.pkgs.callPackage ./flask-excel {};
   iot-data = self.python3.pkgs.callPackage ./iot-data {};
+  nixfiles-updated-inputs = self.callPackage ./nixfiles {};
   pyexcel-xlsx = self.python3.pkgs.callPackage ./pyexcel-xlsx {};
   pyexcel-webio = self.python3.pkgs.callPackage ./pyexcel-webio {};
   uptimestatus = self.python3.pkgs.callPackage ./uptimestatus {};

From e2dbc5244c8f4ff0c645d700f63128abfdff7932 Mon Sep 17 00:00:00 2001
From: clerie <git@clerie.de>
Date: Sat, 5 Aug 2023 16:19:50 +0200
Subject: [PATCH 2/3] hosts/krypton: add krita

---
 hosts/krypton/programs.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hosts/krypton/programs.nix b/hosts/krypton/programs.nix
index ce16701..9cc240c 100644
--- a/hosts/krypton/programs.nix
+++ b/hosts/krypton/programs.nix
@@ -16,6 +16,8 @@
     tio
     xournalpp
     onlyoffice-bin
+
+    krita
   ];
 
   services.syncthing = {

From b83055e0afd436cea7a57d7c2734f9c7c5d624fa Mon Sep 17 00:00:00 2001
From: clerie <git@clerie.de>
Date: Sat, 5 Aug 2023 20:03:40 +0200
Subject: [PATCH 3/3] configuration/desktop: custom connectivity check url

---
 configuration/desktop/default.nix    |  1 +
 configuration/desktop/networking.nix | 10 ++++++++++
 2 files changed, 11 insertions(+)
 create mode 100644 configuration/desktop/networking.nix

diff --git a/configuration/desktop/default.nix b/configuration/desktop/default.nix
index 49c7ef5..f99eecc 100644
--- a/configuration/desktop/default.nix
+++ b/configuration/desktop/default.nix
@@ -4,6 +4,7 @@
   imports = [
     ./fonts.nix
     ./gnome.nix
+    ./networking.nix
     ./power.nix
     ./printing.nix
     ./xserver.nix
diff --git a/configuration/desktop/networking.nix b/configuration/desktop/networking.nix
new file mode 100644
index 0000000..51268be
--- /dev/null
+++ b/configuration/desktop/networking.nix
@@ -0,0 +1,10 @@
+{ ... }:
+
+{
+
+  networking.networkmanager.extraConfig = ''
+    [connectivity]
+    uri=http://ping.clerie.de/nm-check.txt
+  '';
+
+}