1
0

Compare commits

..

No commits in common. "7424f402e3c3d2e576a44a09276add4647c48e5c" and "781c240ba95f3d87061a363c3bbd168b6cb2d5b0" have entirely different histories.

8 changed files with 12 additions and 50 deletions

View File

@ -4,7 +4,6 @@
imports = [
./fonts.nix
./gnome.nix
./networking.nix
./power.nix
./printing.nix
./xserver.nix

View File

@ -1,10 +0,0 @@
{ ... }:
{
networking.networkmanager.extraConfig = ''
[connectivity]
uri=http://ping.clerie.de/nm-check.txt
'';
}

View File

@ -183,11 +183,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1691871742,
"narHash": "sha256-6yDNjfbAMpwzWL4y75fxs6beXHRANfYX8BNSPjYehck=",
"lastModified": 1690200740,
"narHash": "sha256-aRkEXGmCbAGcvDcdh/HB3YN+EvoPoxmJMOaqRZmf6vM=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "430a56dd16fe583a812b2df44dca002acab2f4f6",
"rev": "ba9650b14e83b365fb9e731f7d7c803f22d2aecf",
"type": "github"
},
"original": {
@ -215,11 +215,11 @@
},
"nixpkgs-krypton": {
"locked": {
"lastModified": 1691654369,
"narHash": "sha256-gSILTEx1jRaJjwZxRlnu3ZwMn1FVNk80qlwiCX8kmpo=",
"lastModified": 1690548937,
"narHash": "sha256-x3ZOPGLvtC0/+iFAg9Kvqm/8hTAIkGjc634SqtgaXTA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ce5e4a6ef2e59d89a971bc434ca8ca222b9c7f5e",
"rev": "2a9d660ff0f7ffde9d73be328ee6e6f10ef66b28",
"type": "github"
},
"original": {
@ -231,11 +231,11 @@
},
"nixpkgs-schule": {
"locked": {
"lastModified": 1691654369,
"narHash": "sha256-gSILTEx1jRaJjwZxRlnu3ZwMn1FVNk80qlwiCX8kmpo=",
"lastModified": 1690548937,
"narHash": "sha256-x3ZOPGLvtC0/+iFAg9Kvqm/8hTAIkGjc634SqtgaXTA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ce5e4a6ef2e59d89a971bc434ca8ca222b9c7f5e",
"rev": "2a9d660ff0f7ffde9d73be328ee6e6f10ef66b28",
"type": "github"
},
"original": {
@ -247,11 +247,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1691654369,
"narHash": "sha256-gSILTEx1jRaJjwZxRlnu3ZwMn1FVNk80qlwiCX8kmpo=",
"lastModified": 1690548937,
"narHash": "sha256-x3ZOPGLvtC0/+iFAg9Kvqm/8hTAIkGjc634SqtgaXTA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ce5e4a6ef2e59d89a971bc434ca8ca222b9c7f5e",
"rev": "2a9d660ff0f7ffde9d73be328ee6e6f10ef66b28",
"type": "github"
},
"original": {

View File

@ -94,7 +94,6 @@
anycast_healthchecker
flask-excel
iot-data
nixfiles-updated-inputs
pyexcel-xlsx
pyexcel-webio
uptimestatus

View File

@ -16,8 +16,6 @@
tio
xournalpp
onlyoffice-bin
krita
];
services.syncthing = {

View File

@ -1,10 +0,0 @@
{ pkgs, ... }:
pkgs.writeShellApplication {
name = "nixfiles-updated-inputs.sh";
text = builtins.readFile ./nixfiles-updated-inputs.sh;
runtimeInputs = [
pkgs.git
];
}

View File

@ -1,13 +0,0 @@
#!/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

View File

@ -2,7 +2,6 @@ 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 {};