From 4976fd949d366bb02d7c5e92b8643d05d1482cf9 Mon Sep 17 00:00:00 2001
From: Fabian Hauser <fabian@fh2.ch>
Date: Mon, 2 May 2022 16:34:19 +0200
Subject: [PATCH] Remove etaxes

---
 flake.lock                            | 39 +++++++--------------------
 flake.nix                             |  9 ++-----
 home/fhauser/applications/default.nix |  6 ++---
 3 files changed, 13 insertions(+), 41 deletions(-)

diff --git a/flake.lock b/flake.lock
index d6561dc..da51b0e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,25 +1,5 @@
 {
   "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": [
@@ -27,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1650841545,
-        "narHash": "sha256-AF3fk+p/mHbdtyrI3kpms+MoMVOdGIBGJ+7LT7WWdaU=",
+        "lastModified": 1651007218,
+        "narHash": "sha256-NkQAMtqW0PSJTbLHalyZtaqj0ai2TZMOedug9yDIcFw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "236c6ec21420e44c38ec76de4fc3335bec1859b5",
+        "rev": "d14adb99f3fb562ec74ad18c032efc154b438034",
         "type": "github"
       },
       "original": {
@@ -58,11 +38,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1650728030,
-        "narHash": "sha256-VfCYsC/0mZQlQqsXf5o5Cib1ncJQ5l7WHN7hEIMmZNw=",
+        "lastModified": 1651310835,
+        "narHash": "sha256-MLk/zsLlbPhwFucxL64Fr+oIrvQC2/76Ap2F7ekbPNI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5fb3a179605141bfa4c9c423f9b1c33658b059c8",
+        "rev": "fd3e33d696b81e76b30160dfad2efb7ac1f19879",
         "type": "github"
       },
       "original": {
@@ -74,11 +54,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1650701402,
-        "narHash": "sha256-XKfstdtqDg+O+gNBx1yGVKWIhLgfEDg/e2lvJSsp9vU=",
+        "lastModified": 1651007983,
+        "narHash": "sha256-GNay7yDPtLcRcKCNHldug85AhAvBpTtPEJWSSDYBw8U=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "bc41b01dd7a9fdffd32d9b03806798797532a5fe",
+        "rev": "e10da1c7f542515b609f8dfbcf788f3d85b14936",
         "type": "github"
       },
       "original": {
@@ -113,7 +93,6 @@
     },
     "root": {
       "inputs": {
-        "fabianhauser-etaxes-sg": "fabianhauser-etaxes-sg",
         "home-manager": "home-manager",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs-stable": "nixpkgs-stable",
diff --git a/flake.nix b/flake.nix
index 22fc965..557f25b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,8 +8,6 @@
     # Packages
     home-manager.url = "github:nix-community/home-manager/release-21.11";
     home-manager.inputs.nixpkgs.follows = "nixpkgs-stable";
-    fabianhauser-etaxes-sg.url = "github:fabianhauser/etaxes-sg-nix";
-    fabianhauser-etaxes-sg.inputs.nixpkgs.follows = "nixpkgs-stable";
 
     # Private Deps
     qois-infrastructure = {
@@ -23,8 +21,7 @@
   };
 
   outputs = { self, nixpkgs-unstable, nixpkgs-stable, home-manager
-    , qois-infrastructure, fabianhauser-etaxes-sg, nixos-hardware, threema, ...
-    }@inputs:
+    , qois-infrastructure, nixos-hardware, threema, ... }@inputs:
     let
       system = "x86_64-linux";
       pkgsUnstable = import nixpkgs-unstable {
@@ -53,9 +50,7 @@
           home-manager = {
             useGlobalPkgs = true;
             useUserPackages = true;
-            extraSpecialArgs = sharedSpecialArgs // {
-              pkgsEtaxesSg = fabianhauser-etaxes-sg.packages.${system};
-            };
+            extraSpecialArgs = sharedSpecialArgs;
             users.fhauser = import ./home/fhauser/default.nix;
           };
         };
diff --git a/home/fhauser/applications/default.nix b/home/fhauser/applications/default.nix
index 3f1c1f7..51bc1ad 100644
--- a/home/fhauser/applications/default.nix
+++ b/home/fhauser/applications/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, pkgsEtaxesSg, ... }:
+{ config, pkgs, lib, ... }:
 
 {
 
@@ -34,8 +34,7 @@
   };
 
   home = {
-    packages = with pkgsEtaxesSg;
-      with pkgs;
+    packages = with pkgs;
       [ # Networking
         unison
         transmission # GUI Tools, maybe extract...
@@ -66,7 +65,6 @@
         simple-scan
         gnome.gnome-online-accounts
         gnome.gnome-control-center
-        etaxes-ch-sg-2021
       ] ++ [ # Communication
         signal-desktop
         tdesktop