From d7fd73dc61aa2ad6a9cd733499d799c49eb50aa9 Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Thu, 11 Nov 2021 05:19:34 +0100 Subject: [PATCH] grocy-scanner tests and github stuff --- nixos/configs/sterni/configuration.nix | 1 + nixos/configs/sterni/scanner.nix | 9 ++ nixos/flake.lock | 111 ++++++++++++++++++++----- nixos/flake.nix | 9 +- nixos/system/desktop/home-manager.nix | 4 + nixos/system/desktop/packages.nix | 3 + 6 files changed, 115 insertions(+), 22 deletions(-) create mode 100644 nixos/configs/sterni/scanner.nix diff --git a/nixos/configs/sterni/configuration.nix b/nixos/configs/sterni/configuration.nix index b4e7708..35e5011 100644 --- a/nixos/configs/sterni/configuration.nix +++ b/nixos/configs/sterni/configuration.nix @@ -11,6 +11,7 @@ #./wifi-access-point.nix #./wireshark.nix + ./scanner.nix ]; diff --git a/nixos/configs/sterni/scanner.nix b/nixos/configs/sterni/scanner.nix new file mode 100644 index 0000000..bf3e1a2 --- /dev/null +++ b/nixos/configs/sterni/scanner.nix @@ -0,0 +1,9 @@ +{ config, lib, pkgs, ... }: +{ + services.grocy-scanner = { + enable = true; + host = "https://grocy.ingolf-wagner.de"; + device = "/dev/input/by-id/usb-Belon.cn_2.4G_Wireless_Device_Belon_Smart-event-kbd"; + apiKeyFile = toString (pkgs.writeText "key" "my-api-key-not"); + }; +} diff --git a/nixos/flake.lock b/nixos/flake.lock index c01dde6..acf8e85 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -1,5 +1,24 @@ { "nodes": { + "barcode-reader": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1636602745, + "narHash": "sha256-oCpDOT83cQwIz1frgZwhl+g5uzQIOvHfYglbqF7OZ5g=", + "owner": "mrVanDalo", + "repo": "barcode-reader", + "rev": "7ffb09892cd67186b2cb33f001bfe27e1acd6e5d", + "type": "github" + }, + "original": { + "owner": "mrVanDalo", + "repo": "barcode-reader", + "type": "github" + } + }, "cluster-module": { "locked": { "lastModified": 1635790675, @@ -220,6 +239,21 @@ } }, "flake-utils_2": { + "locked": { + "lastModified": 1634851050, + "narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c91f3de5adaf1de973b797ef7485e441a65b8935", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { "locked": { "lastModified": 1629481132, "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=", @@ -234,7 +268,7 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_4": { "locked": { "lastModified": 1631561581, "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=", @@ -249,6 +283,27 @@ "type": "github" } }, + "grocy-scanner": { + "inputs": { + "barcode-reader": "barcode-reader", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1636604175, + "narHash": "sha256-aHiQyNGlBDId3CfB7iN6zeN8aolqSWIOJatxdTHf5i8=", + "owner": "mrVanDalo", + "repo": "grocy-scanner", + "rev": "3716b209a8b945b98628a1131304f30f8176b81f", + "type": "github" + }, + "original": { + "owner": "mrVanDalo", + "repo": "grocy-scanner", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -330,16 +385,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1635719588, - "narHash": "sha256-pWjdy0NheM97NsPE6+jUnr5LYyeA0sBGTdw4mfXMGZQ=", + "lastModified": 1636416043, + "narHash": "sha256-Esz9X97OeAsNoJUVuqlCu2LDWcyLE24huUonhOY3JGw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f0869b1a2c0b150aac26e10bb5c2364ffb2e804f", + "rev": "db6044d5debaff0749420c3553d1b89fc6c5c5f8", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-21.05", "repo": "nixpkgs", "type": "github" } @@ -347,7 +401,7 @@ "nixpkgs-fmt": { "inputs": { "fenix": "fenix", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "naersk": "naersk", "nixpkgs": [ "nixpkgs" @@ -369,11 +423,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1635702959, - "narHash": "sha256-ZKxX9DjJJGJqq20pE4dIj1G4ssCLVXXRFerM6lNuF0k=", + "lastModified": 1636267212, + "narHash": "sha256-KDS173KqmqrYUPY9N4vf750GxIo+S6E0djyq2BsQm8s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e544ee88fa4590df75e221e645a03fe157a99e5b", + "rev": "c935f5e0add2cf0ae650d072c8357533e21b0c35", "type": "github" }, "original": { @@ -384,6 +438,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1636333654, + "narHash": "sha256-3wh9PtCzcaJQuZrgZ+ygKfhltkDNNqT6zOzGsRbjZEo=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "e74894146a42ba552ebafa19ab2d1df7ccbc1738", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-21.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1632855891, "narHash": "sha256-crW76mt9/kbUBiKy/KiSnsQ9JEYgD3StDuYAMVkTbM0=", @@ -397,13 +467,13 @@ "type": "indirect" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { - "lastModified": 1625223284, - "narHash": "sha256-jjLcDSU1rRiJb+n3uez23XAa7kbnPcGZTa6jIKh1GMQ=", + "lastModified": 1636228094, + "narHash": "sha256-CpOcIwHAn3yS0PeVmUICFrJ+gde2PiZp3XsnDP3LE9w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "357d2c8f6087685fe35cb1889a005a4dd4cce7b8", + "rev": "2606cb0fc24e65f489b7d9fdcbf219756e45db35", "type": "github" }, "original": { @@ -511,8 +581,8 @@ }, "polygon-art": { "inputs": { - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_2" + "flake-utils": "flake-utils_4", + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1632864707, @@ -548,9 +618,10 @@ "inputs": { "cluster-module": "cluster-module", "doom-emacs-nix": "doom-emacs-nix", + "grocy-scanner": "grocy-scanner", "home-manager": "home-manager", "home-manager-utils": "home-manager-utils", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-fmt": "nixpkgs-fmt", "nixpkgs-unstable": "nixpkgs-unstable", "polygon-art": "polygon-art", @@ -592,14 +663,14 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1633273832, - "narHash": "sha256-oOjpMVYpkIUpiML61PeqTk+sg4juRvF7P6jroI/YvTw=", + "lastModified": 1636497917, + "narHash": "sha256-8U0Tvot7U5KJ8vpn6xR611v7b441QdAQC04xhxjMHOc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "2e86e1698d53e5bd71d9de5f8b7e8f2f5458633c", + "rev": "a8cbd0c796e4678f0fd2e59f274e49705ee523ed", "type": "github" }, "original": { diff --git a/nixos/flake.nix b/nixos/flake.nix index 8d14db2..63bed89 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -27,6 +27,10 @@ url = "github:nix-community/nixpkgs-fmt"; inputs.nixpkgs.follows = "nixpkgs"; }; + grocy-scanner = { + url = "github:mrVanDalo/grocy-scanner"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = @@ -40,7 +44,7 @@ , cluster-module , polygon-art , nixpkgs-fmt - , ... + , grocy-scanner }: let @@ -48,6 +52,7 @@ defaultModules = [ sops-nix.nixosModules.sops cluster-module.nixosModules.tinc + grocy-scanner.nixosModule ({ pkgs, ... }: { nix = { # no channesl needed this way @@ -97,7 +102,7 @@ { nixosConfigurations = { sterni = desktopConfiguration ./configs/sterni/configuration.nix; - sternchen = desktopConfiguration ./configs/sternchien/configuration.nix; + sternchen = desktopConfiguration ./configs/sternchen/configuration.nix; pepe = serverConfiguration ./configs/pepe/configuration.nix; workhorse = serverConfiguration ./configs/workhorse/configuration.nix; sputnik = serverConfiguration ./configs/sputnik/configuration.nix; diff --git a/nixos/system/desktop/home-manager.nix b/nixos/system/desktop/home-manager.nix index 13a97f1..22fad5d 100644 --- a/nixos/system/desktop/home-manager.nix +++ b/nixos/system/desktop/home-manager.nix @@ -92,6 +92,10 @@ in source = "git@github.com:terranix/terranix-website.git"; target = "~/dev/terranix/website"; } + { + source = "git@github.com:terranix/terranix-hcloud.git"; + target = "~/dev/terranix/module-hcloud"; + } { source = "git@github.com:terranix/terranix-module-github.git"; target = "~/dev/terranix/module-github"; diff --git a/nixos/system/desktop/packages.nix b/nixos/system/desktop/packages.nix index 75eba2a..51cc874 100644 --- a/nixos/system/desktop/packages.nix +++ b/nixos/system/desktop/packages.nix @@ -302,6 +302,7 @@ in shellcheck bind.dnsutils + usbutils hexyl testssl @@ -311,6 +312,8 @@ in nix-review units + hub # for github + (writeShellScriptBin "ingdiba-security" '' first=$1 second=$2