1
0

Compare commits

...

5 Commits

8 changed files with 50 additions and 12 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

10
pkgs/nixfiles/default.nix Normal file
View File

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

View File

@ -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

View File

@ -2,6 +2,7 @@ self: super: {
anycast_healthchecker = self.python3.pkgs.callPackage ./anycast_healthchecker {}; anycast_healthchecker = self.python3.pkgs.callPackage ./anycast_healthchecker {};
flask-excel = self.python3.pkgs.callPackage ./flask-excel {}; flask-excel = self.python3.pkgs.callPackage ./flask-excel {};
iot-data = self.python3.pkgs.callPackage ./iot-data {}; iot-data = self.python3.pkgs.callPackage ./iot-data {};
nixfiles-updated-inputs = self.callPackage ./nixfiles {};
pyexcel-xlsx = self.python3.pkgs.callPackage ./pyexcel-xlsx {}; pyexcel-xlsx = self.python3.pkgs.callPackage ./pyexcel-xlsx {};
pyexcel-webio = self.python3.pkgs.callPackage ./pyexcel-webio {}; pyexcel-webio = self.python3.pkgs.callPackage ./pyexcel-webio {};
uptimestatus = self.python3.pkgs.callPackage ./uptimestatus {}; uptimestatus = self.python3.pkgs.callPackage ./uptimestatus {};