From 1452c2a43d43f9f53d5b9f58c3253d95cacbcde7 Mon Sep 17 00:00:00 2001
From: Fabian Hauser <fabian@fh2.ch>
Date: Sun, 10 Apr 2022 23:50:57 +0200
Subject: [PATCH] Add e-taxes st.gallen

---
 flake.lock                            | 29 +++++++++++++++++++++++----
 flake.nix                             |  7 ++++---
 home/fhauser/applications/default.nix |  5 +++--
 3 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/flake.lock b/flake.lock
index c634820..296b83c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,25 @@
 {
   "nodes": {
+    "fabianhauser-etaxes-sg": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs-stable"
+        ]
+      },
+      "locked": {
+        "lastModified": 1649625626,
+        "narHash": "sha256-vrp6ZhS/jmOWghAqwX5CscYrDMb5JRQTBKZmkZNBr5o=",
+        "owner": "fabianhauser",
+        "repo": "etaxes-sg-nix",
+        "rev": "18a078121622c6c2e093fa786c1776083e2090dc",
+        "type": "github"
+      },
+      "original": {
+        "owner": "fabianhauser",
+        "repo": "etaxes-sg-nix",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -55,11 +75,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1649490789,
-        "narHash": "sha256-YrhVxwoofZSx/wLZ4GYET//8vS+uqWX572zvdmP/Etg=",
+        "lastModified": 1649537291,
+        "narHash": "sha256-V6VYIwTeI5BCfYK9f5EsMbjsjsis1rUDHMsaDbTvt+A=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c86185d20d708013caf97a6adaa8dc6d72313c75",
+        "rev": "715dc137b08213aabbbe0965b78ab938e5d8d3b7",
         "type": "github"
       },
       "original": {
@@ -91,7 +111,7 @@
         "nixpkgs-nixos-unstable": "nixpkgs-nixos-unstable"
       },
       "locked": {
-        "narHash": "sha256-td+qvLGjYw0oRFYsMR4LKciDWyOoPGJJJ2phMFwN1ME=",
+        "narHash": "sha256-MlaNIPEmdzbmd94VgUiWMAtha9RPx8MCo3ph/4/DONA=",
         "path": "/etc/nixos/qois-infrastructure",
         "type": "path"
       },
@@ -102,6 +122,7 @@
     },
     "root": {
       "inputs": {
+        "fabianhauser-etaxes-sg": "fabianhauser-etaxes-sg",
         "home-manager": "home-manager",
         "nixpkgs-stable": "nixpkgs-stable",
         "nixpkgs-unstable": "nixpkgs-unstable",
diff --git a/flake.nix b/flake.nix
index 5540417..aeafd6c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,10 +5,11 @@
     home-manager.url = "github:nix-community/home-manager/release-21.11";
     home-manager.inputs.nixpkgs.follows = "nixpkgs-stable";
     qois-infrastructure.url = "path:/etc/nixos/qois-infrastructure";
-    #fabianhauser-etaxes.url = "github:fabianhauser/etaxes-sg-nix";
+    fabianhauser-etaxes-sg.url = "github:fabianhauser/etaxes-sg-nix";
+    fabianhauser-etaxes-sg.inputs.nixpkgs.follows = "nixpkgs-stable";
   };
 
-  outputs = { self, nixpkgs-unstable, nixpkgs-stable, home-manager, qois-infrastructure, ... }@inputs:
+  outputs = { self, nixpkgs-unstable, nixpkgs-stable, home-manager, qois-infrastructure, fabianhauser-etaxes-sg, ... }@inputs:
     let system = "x86_64-linux";
       pkgsUnstable = import nixpkgs-unstable {
         inherit system;
@@ -30,7 +31,7 @@
           home-manager = {
             useGlobalPkgs = true;
             useUserPackages = true;
-            extraSpecialArgs = { inherit pkgsUnstable; };
+            extraSpecialArgs = { inherit pkgsUnstable; pkgsEtaxesSg = fabianhauser-etaxes-sg.packages.${system}; };
             users.fhauser = import ./home/fhauser/default.nix;
           };
         };
diff --git a/home/fhauser/applications/default.nix b/home/fhauser/applications/default.nix
index ba3753a..5735fe1 100644
--- a/home/fhauser/applications/default.nix
+++ b/home/fhauser/applications/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, pkgs, lib, pkgsEtaxesSg, ... }:
 
 {
 
@@ -34,7 +34,7 @@
   };
 
   home = {
-    packages = with pkgs;
+    packages = with pkgsEtaxesSg; with pkgs;
       [ # Networking
         unison
         transmission # GUI Tools, maybe extract...
@@ -65,6 +65,7 @@
         simple-scan
         gnome.gnome-online-accounts
         gnome.gnome-control-center
+        etaxes-ch-sg-2021
       ] ++ [ # Communication
         signal-desktop
         tdesktop