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 + ''; + +} 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/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 = { 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 {};