1 files changed, 29 insertions, 11 deletions

diff --git a/hosts/tiamat/default.nix b/hosts/by-name/tiamat/configuration.nix
index 470f88cb..efb77b96 100644
--- a/hosts/tiamat/default.nix
+++ b/hosts/by-name/tiamat/configuration.nix
@@ -1,9 +1,18 @@
+# nixos-config - My current NixOS configuration
+#
+# Copyright (C) 2025 Benedikt Peetz <benedikt.peetz@b-peetz.de>
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# This file is part of my nixos-config.
+#
+# You should have received a copy of the License along with this program.
+# If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>.
 {
   lib,
   pkgs,
-  baseLib,
-  qmk_firmware,
   system,
+  libraries,
+  externalBinaries,
   ...
 }: {
   imports = [
@@ -21,11 +30,14 @@
       enable = true;
       systemName = "x86_64-linux";
     };
+
+    # TODO: Hard-code all the uids/gids <2025-05-13>
+    impermanence.directories = [
+      "/var/lib/nixos"
+      "/var/log"
+    ];
+
     services = {
-      backup = {
-        backupDiskUuid = "c06ce163-2955-4388-b212-dfec4448fcf4";
-        enable = true;
-      };
       unison.foreign.address = "apzu.fritz.box";
     };
     programs = {
@@ -61,7 +73,7 @@
                 # Audio
                 # "M" = {command = ["spawn" "video-pause toggle"]; modes = ["normal" "locked"]; };
                 "N" = {
-                  command = ["spawn" "${lib.getExe pkgs.mpc} toggle"];
+                  command = ["spawn" "${lib.getExe pkgs.mpp} toggle"];
                   modes = ["normal" "locked"];
                 };
 
@@ -80,16 +92,22 @@
                 # "Y" = {command = ["spawn" "bemenu-run"];};
 
                 # Toggle all tags
-                "0" = {command = ["set-focused-tags" "${builtins.toString ((baseLib.pow 2 32) - 1)}"];};
+                "0" = {command = ["set-focused-tags" "${builtins.toString ((libraries.base.pow 2 32) - 1)}"];};
 
                 # Support Unicode input
-                "Z" = {command = ["spawn" "${lib.getExe qmk_firmware.packages.${system}.qmk_unicode_type} 106 65377"];};
+                "Z" = {command = ["spawn" "${lib.getExe externalBinaries.qmk_firmware.packages.${system}.qmk_unicode_type} 106 65377"];};
               })
               // ({
                   # TODO: add toggle-focus mapping
 
                   # Toggle all tags
-                  "<Alt+Ctrl+Shift-0>" = {command = ["set-view-tags" "${builtins.toString ((baseLib.pow 2 32) - 1)}"];};
+                  "<Alt+Ctrl+Shift-0>" = {
+                    command = [
+                      "set-view-tags"
+                      "${builtins.toString
+                        ((libraries.base.pow 2 32) - 1)}"
+                    ];
+                  };
 
                   # Mouse
                   "<Meta-<MOUSE_LEFT>>" = {
@@ -105,7 +123,7 @@
                   builtins.foldl' (acc: elem: acc // elem) {} (
                     builtins.map (index: let
                       num = builtins.toString index;
-                      index2tag = input: builtins.toString (baseLib.pow 2 (input - 1));
+                      index2tag = input: builtins.toString (libraries.base.pow 2 (input - 1));
                     in {
                       "${map num}" = {command = ["set-focused-tags" (index2tag index)];};
                       "<Alt+Ctrl+Shift-${num}>" = {command = ["set-view-tags" (index2tag index)];};