From e76489b6d873a00f03d8d6f941e053aff153eadb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kmein@posteo.de>
Date: Thu, 31 Aug 2023 10:09:49 +0200
Subject: [PATCH] feat: remove traadfri

---
 configs/default.nix   |  2 --
 configs/traadfri.nix  | 43 ---------------------------------------
 flake.lock            | 24 ----------------------
 flake.nix             |  4 ----
 lib/local-network.nix |  1 -
 modules/traadfri.nix  | 47 -------------------------------------------
 secrets               |  2 +-
 secrets.txt           |  1 -
 8 files changed, 1 insertion(+), 123 deletions(-)
 delete mode 100644 configs/traadfri.nix
 delete mode 100644 modules/traadfri.nix

diff --git a/configs/default.nix b/configs/default.nix
index 5e87a38..7ac9443 100644
--- a/configs/default.nix
+++ b/configs/default.nix
@@ -12,7 +12,6 @@
 in {
   imports = [
     inputs.self.nixosModules.system-dependent
-    inputs.self.nixosModules.traadfri
     inputs.self.nixosModules.power-action
     {
       boot.supportedFilesystems = ["ntfs"];
@@ -286,7 +285,6 @@ in {
     ./sound.nix
     ./sudo.nix
     ./tmux.nix
-    ./traadfri.nix
     ./unclutter.nix
     ./vscode.nix
     ./watson.nix
diff --git a/configs/traadfri.nix b/configs/traadfri.nix
deleted file mode 100644
index 6d283f6..0000000
--- a/configs/traadfri.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}: let
-  inherit (import ../lib) localAddresses;
-  living-room-id = 131090;
-in {
-  environment.systemPackages = [
-    (pkgs.writers.writeDashBin "traadfri-party" ''
-      while true; do
-        for color in $(traadfri colours | shuf); do
-          echo "$color"
-          traadfri group "''${2:-${toString living-room-id}}" --on --colour="$color"
-          sleep "''${1:-2}"
-        done
-      done
-    '')
-  ];
-
-  age.secrets.traadfri-key = {
-    file = ../secrets/traadfri-key.age;
-    owner = config.users.users.me.name;
-    group = config.users.users.me.group;
-    mode = "400";
-  };
-
-  niveum.traadfri = {
-    enable = true;
-    user = "kmein";
-    host = localAddresses.tradfri;
-    keyFile = config.age.secrets.traadfri-key.path;
-    rooms = {
-      corridor = 131080;
-      kitchen = 131081;
-      bedroom = 131082;
-      living-room = living-room-id;
-      bedside = 131087;
-      chain = 131089;
-    };
-  };
-}
diff --git a/flake.lock b/flake.lock
index 8d700d4..0191302 100644
--- a/flake.lock
+++ b/flake.lock
@@ -541,7 +541,6 @@
         "stylix": "stylix",
         "telebots": "telebots",
         "tinc-graph": "tinc-graph",
-        "traadfri": "traadfri",
         "voidrice": "voidrice",
         "wallpaper-generator": "wallpaper-generator",
         "wallpapers": "wallpapers"
@@ -682,29 +681,6 @@
         "type": "github"
       }
     },
-    "traadfri": {
-      "inputs": {
-        "flake-utils": [
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "nixpkgs-old"
-        ]
-      },
-      "locked": {
-        "lastModified": 1677165914,
-        "narHash": "sha256-3N08NabgDwTUy1n5wxpT27iddFrgXW35E1x2UgAKkDQ=",
-        "owner": "kmein",
-        "repo": "traadfri",
-        "rev": "11571116ed5d2c6478c615d663d1f96f57a97ba9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "kmein",
-        "repo": "traadfri",
-        "type": "github"
-      }
-    },
     "voidrice": {
       "flake": false,
       "locked": {
diff --git a/flake.nix b/flake.nix
index 0cbe296..364f205 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,7 +21,6 @@
     stylix.url = "github:danth/stylix/release-23.05";
     telebots.url = "github:kmein/telebots";
     tinc-graph.url = "github:kmein/tinc-graph";
-    traadfri.url = "github:kmein/traadfri";
     voidrice.url = "github:Lukesmithxyz/voidrice";
     wallpaper-generator.url = "github:pinpox/wallpaper-generator/v1.1";
     wallpapers.url = "github:kmein/wallpapers";
@@ -51,8 +50,6 @@
     tinc-graph.inputs.flake-utils.follows = "flake-utils";
     tinc-graph.inputs.nixpkgs.follows = "nixpkgs";
     tinc-graph.inputs.rust-overlay.follows = "rust-overlay";
-    traadfri.inputs.flake-utils.follows = "flake-utils";
-    traadfri.inputs.nixpkgs.follows = "nixpkgs-old";
     voidrice.flake = false;
     wallpaper-generator.inputs.flake-utils.follows = "flake-utils";
     wallpapers.flake = false;
@@ -109,7 +106,6 @@
         power-action = import modules/power-action.nix;
         system-dependent = import modules/system-dependent.nix;
         telegram-bot = import modules/telegram-bot.nix;
-        traadfri = import modules/traadfri.nix;
       };
 
       lib = {
diff --git a/lib/local-network.nix b/lib/local-network.nix
index f1ee07a..2f7ad87 100644
--- a/lib/local-network.nix
+++ b/lib/local-network.nix
@@ -5,7 +5,6 @@
   android = "192.168.178.35";
   manakish = "192.168.178.29";
 
-  tradfri = "192.168.178.28";
   officejet = "192.168.178.27";
   fritzbox = "192.168.178.1";
 }
diff --git a/modules/traadfri.nix b/modules/traadfri.nix
deleted file mode 100644
index 3f4697f..0000000
--- a/modules/traadfri.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  pkgs,
-  lib,
-  config,
-  inputs,
-  ...
-}:
-with lib; let
-  cfg = config.niveum.traadfri;
-in {
-  options.niveum.traadfri = {
-    enable = mkEnableOption "Trådfri CLI";
-    user = mkOption {type = types.str;};
-    host = mkOption {type = types.str;};
-    keyFile = mkOption {type = types.path;};
-    rooms = mkOption {
-      type = types.attrsOf types.int;
-      default = {};
-    };
-    bulbs = mkOption {
-      type = types.attrsOf types.int;
-      default = {};
-    };
-  };
-
-  config = mkIf cfg.enable {
-    environment.systemPackages =
-      [
-        (pkgs.writers.writeDashBin "traadfri" ''
-          export TRAADFRI_USER="${cfg.user}"
-          export TRAADFRI_KEY="$(cat ${lib.escapeShellArg cfg.keyFile})"
-          export TRAADFRI_HUB="${cfg.host}"
-          ${inputs.traadfri.defaultPackage.x86_64-linux}/bin/traadfri $@
-        '')
-      ]
-      ++ lib.mapAttrsToList (name: value:
-        pkgs.writers.writeDashBin "traadfri-${name}" ''
-          exec traadfri --target Room ${toString value} "$@"
-        '')
-      cfg.rooms
-      ++ lib.mapAttrsToList (name: value:
-        pkgs.writers.writeDashBin "traadfri-${name}" ''
-          exec traadfri --target Bulb ${toString value} "$@"
-        '')
-      cfg.bulbs;
-  };
-}
diff --git a/secrets b/secrets
index aac75be..0e94e9e 160000
--- a/secrets
+++ b/secrets
@@ -1 +1 @@
-Subproject commit aac75be4fd9ab921480a5b26e7d55585ac816586
+Subproject commit 0e94e9e2ef8c6a4b208a1442b84453328ff9f9a7
diff --git a/secrets.txt b/secrets.txt
index 44546d5..8af8734 100644
--- a/secrets.txt
+++ b/secrets.txt
@@ -55,7 +55,6 @@ secrets/telegram-token-menstruation.age
 secrets/telegram-token-nachtischsatan.age
 secrets/telegram-token-proverb.age
 secrets/telegram-token-reverse.age
-secrets/traadfri-key.age
 secrets/weechat-sec.conf.age
 secrets/zaatar-moodle-dl-basicAuth.age
 secrets/zaatar-moodle-dl-tokens.json.age