summaryrefslogtreecommitdiffstats
path: root/hosts
diff options
context:
space:
mode:
Diffstat (limited to 'hosts')
-rw-r--r--hosts/apzu/default.nix126
-rw-r--r--hosts/apzu/hardware.nix28
-rw-r--r--hosts/by-name/apzu/configuration.nix72
-rw-r--r--hosts/by-name/apzu/hardware.nix44
-rw-r--r--hosts/by-name/apzu/host.toml2
-rw-r--r--hosts/by-name/apzu/secrets/local/repository_password.age20
-rw-r--r--hosts/by-name/apzu/secrets/storagebox/repository_password.age14
-rw-r--r--hosts/by-name/apzu/secrets/storagebox/ssh_key.age22
-rw-r--r--hosts/by-name/tiamat/configuration.nix88
-rw-r--r--hosts/by-name/tiamat/hardware.nix (renamed from hosts/tiamat/hardware.nix)13
-rw-r--r--hosts/by-name/tiamat/legacy-disk-module/fstrim.nix51
-rw-r--r--hosts/by-name/tiamat/legacy-disk-module/hibernate.nix55
-rw-r--r--hosts/by-name/tiamat/legacy-disk-module/module.nix159
-rw-r--r--hosts/default.nix50
-rw-r--r--hosts/hostinfo.toml5
-rw-r--r--hosts/tiamat/default.nix139
16 files changed, 589 insertions, 299 deletions
diff --git a/hosts/apzu/default.nix b/hosts/apzu/default.nix
deleted file mode 100644
index 133342c3..00000000
--- a/hosts/apzu/default.nix
+++ /dev/null
@@ -1,126 +0,0 @@
-{
- lib,
- pkgs,
- baseLib,
- ...
-}: {
- imports = [
- ./hardware.nix
- ];
-
- soispha = {
- services.backup = {
- # Apzu should be regularly synced with Tiamat, which performs updates.
- enable = false;
- };
- bluetooth.enable = true;
-
- laptop = {
- backlight = "intel_backlight";
- enable = true;
- };
- programs = {
- yambar = {
- laptop = true;
- backlight = "intel_backlight";
- };
- river.init = {
- mappings = {
- layout = "dvorak-modified";
- keymap =
- {
- # Focus change
- "<Meta-T>" = {command = ["focus-view" "next"];};
- "<Meta-N>" = {command = ["focus-view" "previous"];};
- "<Meta+Ctrl-T>" = {command = ["focus-output" "next"];};
- "<Meta+Ctrl-N>" = {command = ["focus-output" "previous"];};
-
- # Standard programs
- "<Meta-<ENTER>>" = {command = ["spawn" "${lib.getExe pkgs.alacritty}"];};
- "<Meta+Shift-q>" = {command = ["exit"];};
- "<Meta-L>" = {command = ["spawn" "${lib.getExe pkgs.lock}"];};
-
- # Screenshot
- "<PRINTSCREEN>" = {command = ["spawn" "${lib.getExe pkgs.screenshot_persistent}"];};
-
- # Audio
- "<MEDIA_RAISEVOLUME>" = {
- command = ["spawn" "${lib.getExe' pkgs.wireplumber "wpctl"} set-volume @DEFAULT_SINK@ 5%+"];
- modes = ["normal" "locked"];
- };
- "<MEDIA_LOWERVOLUME>" = {
- command = ["spawn" "${lib.getExe' pkgs.wireplumber "wpctl"} set-volume @DEFAULT_SINK@ 5%-"];
- modes = ["normal" "locked"];
- };
- "<MEDIA_MUTEVOLUME>" = {
- command = ["spawn" "${lib.getExe pkgs.mpc} toggle"];
- modes = ["normal" "locked"];
- };
-
- # Launcher
- "<Meta-R>" = {command = ["spawn" "${lib.getExe pkgs.rofi} -show combi -modes combi -combi-modes 'window, drun, run' -show-icons"];};
- "<Meta-<F1>>" = {command = ["spawn" "${lib.getExe pkgs.tskm} open select"];};
- "<Meta-<F2>>" = {command = ["spawn" "${lib.getExe pkgs.keepassxc}"];};
- "<Meta-<F3>>" = {command = ["spawn" "${lib.getExe pkgs.signal-desktop}"];};
- # "<Meta-<F4>>" = {command = ["spawn" "${lib.getExe pkgs.steam}"];};
-
- # Client
- "<Meta-f>" = {command = ["toggle-fullscreen"];};
- "<Meta+Shift-c>" = {command = ["close"];};
- "<Meta+Ctrl- >" = {command = ["toggle-float"];};
- "<Meta+Ctrl-<ENTER>>" = {command = ["zoom"];};
- "<Meta-o>" = {command = ["send-to-output" "next"];};
- "<Meta+Shift-T>" = {command = ["swap" "next"];};
- "<Meta+Shift-N>" = {command = ["swap" "previous"];};
-
- # Toggle all tags
- "<Meta-0>" = {command = ["set-focused-tags" (builtins.toString ((baseLib.pow 2 32) - 1))];};
- "<Meta+Shift-0>" = {command = ["set-view-tags" (builtins.toString ((baseLib.pow 2 32) - 1))];};
-
- # Mouse
- "<Meta-<MOUSE_LEFT>>" = {
- command = ["move-view"];
- map_mode = "MapMouse";
- };
- "<Meta-<MOUSE_RIGHT>>" = {
- command = ["resize-view"];
- map_mode = "MapMouse";
- };
- }
- // (
- builtins.foldl' (acc: elem: acc // elem) {} (
- builtins.map (index: let
- num = builtins.toString index;
- index2tag = input: builtins.toString (baseLib.pow 2 (input - 1));
- in {
- "<Meta-${num}>" = {command = ["set-focused-tags" (index2tag index)];};
- "<Meta+Shift-${num}>" = {command = ["set-view-tags" (index2tag index)];};
- "<Meta+Shift+Ctrl-${num}>" = {command = ["toggle-view-tags" (index2tag index)];};
- }) (builtins.genList (i: i + 1) 9)
- )
- );
- };
- screenSetupCode = {};
- };
- };
-
- locale.enable = true;
- networking = {
- enable = true;
- hostName = "apzu";
- mode = "NetworkManager";
- };
- services.unison.foreign.address = "tiamat.fritz.box";
- nixpkgs = {
- enable = true;
- systemName = "x86_64-linux";
- };
- users = {
- enable = true;
- enableDeprecatedPlugdev = true;
- hashedPassword = "$y$jFT$3qI9MYLDHPUdGKsVa8skV0$TOjX0SFHWuj52zd7/kmkNtG5EqQwYcqv0FKXWbLaro6";
- };
- };
-
- system.stateVersion = "23.05";
-}
diff --git a/hosts/apzu/hardware.nix b/hosts/apzu/hardware.nix
deleted file mode 100644
index ae204baa..00000000
--- a/hosts/apzu/hardware.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{modulesPath, ...}: {
- imports = [
- (modulesPath + "/installer/scan/not-detected.nix") # TODO: is this necessary?
- ];
-
- soispha = {
- disks = {
- enable = true;
- disk = "/dev/disk/by-id/nvme-INTEL_SSDPEKNU512GZH_PHKA1481032A512A_1";
- ssd = true;
- swap = {
- uuid = "c94cd20a-dd3c-436f-9841-6fe92e5c8719";
- resumeOffset = "533760";
- };
- };
-
- hardware = {
- enable = true;
- cpuType = "intel";
- };
- };
-
- boot = {
- kernelModules = ["kvm-intel" "rtw89"];
-
- initrd.availableKernelModules = ["xhci_pci" "vmd" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"];
- };
-}
diff --git a/hosts/by-name/apzu/configuration.nix b/hosts/by-name/apzu/configuration.nix
new file mode 100644
index 00000000..fe5be0af
--- /dev/null
+++ b/hosts/by-name/apzu/configuration.nix
@@ -0,0 +1,72 @@
+# 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>.
+{...}: {
+ imports = [
+ ./hardware.nix
+ ../../../modules/common/soispha
+ ];
+
+ vhack.users = {
+ enable = true;
+ users = [
+ {
+ name = "soispha";
+ groups = ["wheel" "audio"];
+ enableDeprecatedPlugdev = true;
+ uid = 1000;
+ sshKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIME4ZVa+IoZf6T3U08JG93i6QIAJ4amm7mkBzO14JSkz";
+ hashedPassword = "$y$jFT$3qI9MYLDHPUdGKsVa8skV0$TOjX0SFHWuj52zd7/kmkNtG5EqQwYcqv0FKXWbLaro6";
+ }
+ ];
+ };
+
+ soispha = {
+ bluetooth.enable = true;
+
+ laptop = {
+ backlight = "intel_backlight";
+ enable = true;
+ };
+
+ power.enable = true;
+
+ programs = {
+ starship.showBattery = true;
+
+ ly.batteryName = "BAT0";
+
+ river.init = {
+ mappings = {
+ layout = "dvorak-modified";
+ };
+ screenSetupCode = {};
+ };
+ };
+
+ locale.enable = true;
+ networking = {
+ enable = true;
+ hostName = "apzu";
+ mode = "NetworkManager";
+ };
+
+ services = {
+ unison.foreign.address = "tiamat.fritz.box";
+ upower.enable = true;
+ };
+
+ nixpkgs = {
+ enable = true;
+ systemName = "x86_64-linux";
+ };
+ };
+
+ system.stateVersion = "23.05";
+}
diff --git a/hosts/by-name/apzu/hardware.nix b/hosts/by-name/apzu/hardware.nix
new file mode 100644
index 00000000..a90476c5
--- /dev/null
+++ b/hosts/by-name/apzu/hardware.nix
@@ -0,0 +1,44 @@
+# 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>.
+{modulesPath, ...}: {
+ imports = [
+ (modulesPath + "/installer/scan/not-detected.nix") # TODO: is this necessary?
+ ];
+
+ soispha = {
+ boot.enableIsoEntry = false;
+
+ disks = {
+ enable = true;
+ disk = "/dev/disk/by-id/nvme-INTEL_SSDPEKNU512GZH_PHKA1481032A512A_1";
+ ssd = true;
+ swap = {
+ ram_size = "16G";
+ };
+ };
+
+ hardware = {
+ enable = true;
+ cpuType = "intel";
+ };
+ };
+
+ boot = {
+ kernelModules = ["kvm-intel"];
+
+ kernelParams = [
+ # Use the newer experimental xe driver
+ # "i915.force_probe=!9a49"
+ # "xe.force_probe=9a49"
+ ];
+
+ initrd.availableKernelModules = ["xhci_pci" "vmd" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"];
+ };
+}
diff --git a/hosts/by-name/apzu/host.toml b/hosts/by-name/apzu/host.toml
new file mode 100644
index 00000000..9e975618
--- /dev/null
+++ b/hosts/by-name/apzu/host.toml
@@ -0,0 +1,2 @@
+hostname = "apzu.fritzbox.com"
+nixpkgs = "unstable"
diff --git a/hosts/by-name/apzu/secrets/local/repository_password.age b/hosts/by-name/apzu/secrets/local/repository_password.age
new file mode 100644
index 00000000..b1508e49
--- /dev/null
+++ b/hosts/by-name/apzu/secrets/local/repository_password.age
@@ -0,0 +1,20 @@
+-----BEGIN AGE ENCRYPTED FILE-----
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBqVCtBZzNBWFlxQnhlb3c2
+NG0xMjV3V2hQUWhNb01ROGpFbzM0c3NjRWlvCjRqMTdxNlNsY1lDM2VCUGRjcldZ
+SUhScGRSejY3TFlwVjlweTRERkU4ZTQKLT4gc3NoLWVkMjU1MTkgelpFb25nIGtj
+cVN4RzFseTJCVXhOc0tEWi96ckpGQjhNdUZrb1FVWnJ6TU1vSHZCMUkKc1JwM2Ir
+TzNzZEV5VEE4QUp4cDdTNWZvTFlZR0tUbUFZTnNEZE1McnhISQotPiBzc2gtZWQy
+NTUxOSA3SGZGVXcgYVQzRHdaa1NYUUpLODUyL0orV3d4Z1o1V2hhekZXVWFzNW50
+enhSYnlWbwpzbnZwK1dSczJ5SGZsRjNyRWZraUcreWlBakZOZkVyZ01CWml5V0E4
+TzY4Ci0+ICpMUC1ncmVhc2UgV0IKUTZVMzR1QTVGdWRyNWprVVpjaWhCTTFSRzY3
+bHVtdHpJQXlWQVFHZ3FzbkZncHRsQnJIaHlEekl5ZE15Sko0YQpSVEUKLS0tIGFy
+N1Y2OUREY1NOL2xPODd4Y3Y4Wk83NFJ5ZVBpNnJYelo3RmZPL1V4Q28KcA+6qt2d
+LrL0FS279XL1uqSeXiDdBBBh5i951dRx9ML33g7IoQxaGqSWU0yP/y7fcSp3B/rT
+/alQGRL/uYnCS2z8zCngr2YCQBXAI8bOgf+th7fzc15FXNB14WMGvrCVRB8Rr6JZ
+itTxcAebY192xeINJG269iL6Ef0YrmZLUufKQ9lcVob/G32tG0vxSbSBBx3asf7y
+toiNdlXpxJPrIpFx5mc3dnkaXCTSRuXjiAqnncW/HNxovCI90sY3dyL+XRC8iEOD
+sql7C7jUUvLubptk1gGW5pHmGvqeCLr+fJ6XrVqXE5VxOSbzvSUsdS84WOBInLiO
+V36aUtthEzdRXd81P/n7U26O93GWpIwzctu0WwSHHHsPKhxqFY4RuWa3mO4Zk6fu
+O6fsYnpAqYiCUd/k2zKrDtLosTnwuwc7Vm1glm4DEEtvteVibw47SR1LLfUds5XL
+j1OR7Z6/ljIEKPjE1a81pQjYRfHDUtceXUvrlL6iCID30zU=
+-----END AGE ENCRYPTED FILE-----
diff --git a/hosts/by-name/apzu/secrets/storagebox/repository_password.age b/hosts/by-name/apzu/secrets/storagebox/repository_password.age
new file mode 100644
index 00000000..a2aa984a
--- /dev/null
+++ b/hosts/by-name/apzu/secrets/storagebox/repository_password.age
@@ -0,0 +1,14 @@
+-----BEGIN AGE ENCRYPTED FILE-----
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzbnJ5Z3NXRFRtdEdCNk1z
+NG9Cb2FUTEZ2U2hTdUptWGpneHd2RGxGQlY0ClhqcHlMSUZlLzBPZko4a2hKdnE1
+Q1hnc3ErWlJiSk1HVXFLcSswQlV0WTAKLT4gc3NoLWVkMjU1MTkgelpFb25nIG5I
+cFpMY21ZdU9TUHY5VksraG1xeFByQlM1WE1INEk0SWFJQzIvSXhZbXMKSWxiNlIr
+NjZ6bEgySUJGdnpoZTY2MmxxajJMaUVTM3RkTmhpdkxaRnNCQQotPiBzc2gtZWQy
+NTUxOSA3SGZGVXcgRGtLMHFORm9mUDUwZnBXM0djcFlxTExJbWVDeDJmbVVSRi9l
+QTFmekpROApZY3Z0Zlc1SUdCcllKQ01ZNmdFQkI3UnViVGxzNTJNUkhqc2hOejY3
+MndrCi0+IG1Hbi1ncmVhc2UgUDJJdgpGUmVHa1NPWGtzUmZmMXM3eWkxVnJkek1h
+MUxZeS9qMlArendXZ1ltdFgvMTBabTlPM2hzSjhuVXBQNktHKzc1ClF6bjZob09B
+Ci0tLSB3dEZpbnpVR0pPdGpFVmNyM0JzUGl6eGcreXpkTG9xQUc5S09ndUthaEpR
+CuHgXCIq/AUCuIQWepBRapAab6zczOwxEBpDv5R2kw2mw34UVRLuFs7hB1cHE79y
+7Fc=
+-----END AGE ENCRYPTED FILE-----
diff --git a/hosts/by-name/apzu/secrets/storagebox/ssh_key.age b/hosts/by-name/apzu/secrets/storagebox/ssh_key.age
new file mode 100644
index 00000000..a7f30c7c
--- /dev/null
+++ b/hosts/by-name/apzu/secrets/storagebox/ssh_key.age
@@ -0,0 +1,22 @@
+-----BEGIN AGE ENCRYPTED FILE-----
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJOTFaQVpnQ2VJN1pJbmdu
+STF2UTF1Y3lyU2p3OUJlcWRFWlg3Mm9vSEFFCjg4RklaZ0hqdWdZSlJ0dGx0ckJN
+eHE4R1QyTEJEVkZudnVQV2VpblBYTW8KLT4gc3NoLWVkMjU1MTkgelpFb25nIDR0
+Z2RwTXJGV1VYT2Y1OUcxbXpnOGNEbG9BWmFxeWUzZ1huNW1YQk5BM3cKK1hLNnYx
+VnNvRDZWM3Y4VUpCQTRtbHJOcDJLdTBOUXJ1ak52Mkp3TE9OcwotPiBzc2gtZWQy
+NTUxOSA3SGZGVXcgSHFSOXM1Vm1lY0ErRkZobndEU0xvQjVXbnhDbUlGNmE2dStY
+SEFqSk9TMAo2VU5UbW9rc29kendvcHNuU3hFQ2lBQWNjRUxUSE10RmtjbkdwWGlv
+cTRVCi0+IDwtZ3JlYXNlIHNPT3N1IHNkZzcoQzUgLUM3Ml1Tcgorb3FQcWlDSkJQ
+L1g4WisydkYxdnJMeDNISVVDTGlZdmUyRkV0TkFUdW4ycXZBSlF3UWM2R3FTYjRs
+ckEyaTg2ClVrbwotLS0gdHF5Q3BqV3h2TzEySCs4OFNIYmx1U0hsTWo1RDlTV3VC
+T1RmelZaWXh4YwoeRkYbirDGX9aZj6OVxZ8sVsm2Sz23ikcBhAdTIXKErM7eQcdp
+Y2nA5kUebPVznbSq/XSQNbqvCfSv9wVVTZWww7AqkrltjFS8yxQVMKB37IfnJsZI
+92OCjJKArxAbvS7ERKY51Cf9oY/VqGk5WqxExH5ZvdbL144UI8JzrxhDopVXBWNd
+fCrHirRAdlu3wgVILXV3vk1kmE69sspuV4cer5f/kOBKT1w09s2NFFHH4TO3cLTJ
+Obgi/HWYHBjqGSgwd4bDtNOW2UDE1LN3YeUhloutWhuX8yt+NFzZJtl+CBrRqLKA
+0CK+ZPKPWWKYPCNlzKT4vDF9BZeyCfoEj9dTXvxrNPEB6YYi16aQ8DhI8wxADl41
+ShrULlEmB8rfz7V+8TFmERKISBRSSH0p+XJi8e2DWh2dSco16rizmbFFNDdcYiGT
+WWbXYCFNzj+kNFI/vEtt9dEWmfXlgg01khnyoOuRLedtoCDSuF+8z7YYy6oYt/2h
+gmf4NHOUgyxK56c17JMQ3xT97d2odgqmwB+YZQ13IJCjt3M3pmSssD4sTgmA5alH
+vtUlci6dZdO801h5vOesbAJplXCEyw==
+-----END AGE ENCRYPTED FILE-----
diff --git a/hosts/by-name/tiamat/configuration.nix b/hosts/by-name/tiamat/configuration.nix
new file mode 100644
index 00000000..d2bf3473
--- /dev/null
+++ b/hosts/by-name/tiamat/configuration.nix
@@ -0,0 +1,88 @@
+# 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,
+ system,
+ sources,
+ ...
+}: {
+ imports = [
+ ./hardware.nix
+
+ ../../../modules/common/soispha
+ ];
+
+ vhack = {
+ # TODO: Hard-code all the uids/gids <2025-05-13>
+ persist.directories = [
+ "/var/lib/nixos"
+ ];
+ users = {
+ enable = true;
+ users = [
+ {
+ name = "soispha";
+ groups = ["wheel" "audio"];
+ enableDeprecatedPlugdev = true;
+ uid = 1000;
+ sshKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIME4ZVa+IoZf6T3U08JG93i6QIAJ4amm7mkBzO14JSkz";
+ hashedPassword = "$y$jFT$qi3wS9njrMl2y55b3NOBI0$j40Qt6AAkMSfZ82KPhqMaUaPztWtPps1wOqaXaF/L.6";
+ }
+ ];
+ };
+ };
+
+ soispha = {
+ bluetooth = {enable = true;};
+ networking = {
+ enable = true;
+ hostName = "tiamat";
+ mode = "systemd-networkd";
+ };
+ nixpkgs = {
+ enable = true;
+ systemName = "x86_64-linux";
+ };
+
+ services = {
+ unison.foreign.address = "apzu.fritz.box";
+ };
+ programs = {
+ river = {
+ unicodeInput.enable = true;
+ init = {
+ mappings = {
+ layout = "us";
+ keymap = {
+ # Support Unicode input
+ "<Alt+Ctrl+Meta+Shift-Z>" = [
+ "spawn"
+ "${lib.getExe sources.qmk_firmware.packages.${system}.qmk_unicode_type} 106 65377"
+ ];
+ };
+ };
+ screenSetupCode = {
+ "DP-2" = {pos = "2560,0";};
+ "DP-1" = {
+ scale = "1.5";
+ pos = "0,0";
+ };
+ };
+ };
+ };
+ };
+ locale = {
+ enable = true;
+ keyMap = "us";
+ };
+ };
+
+ system.stateVersion = "23.05";
+}
diff --git a/hosts/tiamat/hardware.nix b/hosts/by-name/tiamat/hardware.nix
index 97600848..f2a5cec6 100644
--- a/hosts/tiamat/hardware.nix
+++ b/hosts/by-name/tiamat/hardware.nix
@@ -1,6 +1,16 @@
+# 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>.
{modulesPath, ...}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix") # TODO: is this necessary?
+ ./legacy-disk-module/module.nix
];
soispha = {
@@ -11,7 +21,8 @@
enableFlashing = true;
};
};
-
+ };
+ legacy.soispha = {
disks = {
enable = true;
disk = "/dev/disk/by-id/nvme-CT1000P5SSD8_21032C857568";
diff --git a/hosts/by-name/tiamat/legacy-disk-module/fstrim.nix b/hosts/by-name/tiamat/legacy-disk-module/fstrim.nix
new file mode 100644
index 00000000..0fbb6c83
--- /dev/null
+++ b/hosts/by-name/tiamat/legacy-disk-module/fstrim.nix
@@ -0,0 +1,51 @@
+# 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>.
+{
+ pkgs,
+ lib,
+ cfg,
+}: {
+ timers.fstrim = lib.mkIf cfg.ssd {
+ wantedBy = ["timers.target"];
+ wants = ["fstrim.service"];
+ unitConfig = {
+ Description = "Discard unused blocks once a week";
+ Documentation = "man:fstrim";
+ ConditionVirtualization = "!container";
+ ConditionPathExists = "!/etc/initrd-release";
+ };
+ timerConfig = {
+ OnCalendar = "weekly";
+ AccuracySec = "1h";
+ Persistent = "true";
+ RandomizedDelaySec = "6000";
+ };
+ };
+ services.fstrim = lib.mkIf cfg.ssd {
+ wantedBy = lib.mkForce [];
+ unitConfig = {
+ Description = "Discard unused blocks on filesystems from /etc/fstab";
+ Documentation = "man:fstrim(8)";
+ ConditionVirtualization = "!container";
+ };
+ serviceConfig = {
+ Type = "oneshot";
+ ExecStart = "${pkgs.util-linux}/bin/fstrim --listed-in /etc/fstab:/proc/self/mountinfo --verbose --quiet-unsupported";
+ PrivateDevices = "no";
+ PrivateNetwork = "yes";
+ PrivateUsers = "no";
+ ProtectKernelTunables = "yes";
+ ProtectKernelModules = "yes";
+ ProtectControlGroups = "yes";
+ MemoryDenyWriteExecute = "yes";
+ SystemCallFilter = "@default @file-system @basic-io @system-service";
+ };
+ };
+}
diff --git a/hosts/by-name/tiamat/legacy-disk-module/hibernate.nix b/hosts/by-name/tiamat/legacy-disk-module/hibernate.nix
new file mode 100644
index 00000000..d3f8fe8b
--- /dev/null
+++ b/hosts/by-name/tiamat/legacy-disk-module/hibernate.nix
@@ -0,0 +1,55 @@
+# 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>.
+{pkgs}: {
+ services = {
+ hibernate-preparation = {
+ wantedBy = ["systemd-hibernate.service"];
+ unitConfig = {
+ Description = "Enable swap file and disable zram before hibernate";
+ Before = "systemd-hibernate.service";
+ };
+ serviceConfig = {
+ Type = "oneshot";
+ User = "root";
+ ExecStart = "${pkgs.bash}/bin/bash -c \"${pkgs.util-linux}/bin/swapon /swap/swapfile && ${pkgs.util-linux}/bin/swapoff /dev/zram0\"";
+ };
+ };
+
+ hibernate-resume = {
+ wantedBy = ["systemd-hibernate.service"];
+ unitConfig = {
+ Description = "Disable swap after resuming from hibernation";
+ After = "hibernate.target";
+ };
+ serviceConfig = {
+ Type = "oneshot";
+ User = "root";
+ ExecStart = "${pkgs.util-linux}/bin/swapoff /swap/swapfile";
+ };
+ };
+ # swapoff-start = {
+ # wantedBy = ["multi-user.target"];
+ # unitConfig = {
+ # Description = "Disable hardware swap after booting";
+ # };
+ # serviceConfig = {
+ # Type = "oneshot";
+ # User = "root";
+ # ExecStart = "${pkgs.util-linux}/bin/swapoff /swap/swapfile";
+ # };
+ # };
+ systemd-hibernate.serviceConfig.Environment = "SYSTEMD_BYPASS_HIBERNATION_MEMORY_CHECK=1";
+ systemd-logind.serviceConfig.Environment = "SYSTEMD_BYPASS_HIBERNATION_MEMORY_CHECK=1";
+ };
+
+ sleep.settings.Sleep = {
+ HibernateDelaySec = "10m";
+ };
+}
diff --git a/hosts/by-name/tiamat/legacy-disk-module/module.nix b/hosts/by-name/tiamat/legacy-disk-module/module.nix
new file mode 100644
index 00000000..8c49f6eb
--- /dev/null
+++ b/hosts/by-name/tiamat/legacy-disk-module/module.nix
@@ -0,0 +1,159 @@
+# 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>.
+{
+ config,
+ lib,
+ pkgs,
+ extra_modules,
+ ...
+}: let
+ # FIXME: The iso redeploy requires a bigger efi partition <2024-05-12>
+ cfg = config.legacy.soispha.disks;
+ defaultMountOptions = [
+ "compress=zstd:3" # This saves disk space, at a performance cost
+ "noatime" # should have some performance upsides, and I don't use it anyways
+ "lazytime" # make time changes in memory
+ ];
+in {
+ options.legacy.soispha.disks = {
+ enable = lib.mkEnableOption "disk setup with disko";
+
+ disk = lib.mkOption {
+ type = lib.types.path;
+ example = lib.literalExpression "/dev/disk/by-uuid/0442cb6d-f13a-4635-b487-fa76189774c5";
+ description = "The disk used for installing the OS.";
+ };
+
+ ssd = lib.mkEnableOption "ssd specific improvements, like trim";
+
+ swap = {
+ uuid = lib.mkOption {
+ type = lib.types.str;
+ example = lib.literalExpression "d1d20ae7-3d8a-44da-86da-677dbbb10c89";
+ description = "The uuid of the swapfile";
+ };
+ resumeOffset = lib.mkOption {
+ type = lib.types.str;
+ example = lib.literalExpression "134324224";
+ description = "The resume offset of the swapfile";
+ };
+ };
+ };
+
+ imports = [
+ extra_modules.nixos.disko
+ ];
+
+ config = lib.mkIf cfg.enable {
+ systemd = lib.recursiveUpdate (import ./hibernate.nix {inherit pkgs;}) (import ./fstrim.nix {inherit pkgs lib cfg;});
+
+ disko.devices = {
+ disk = {
+ main = {
+ device = cfg.disk;
+ content = {
+ type = "gpt";
+ partitions = {
+ root = {
+ size = "100%";
+ name = "root";
+ content = {
+ type = "luks";
+ name = "nixos";
+ extraOpenArgs = ["--allow-discards"];
+ content = {
+ type = "btrfs";
+ extraArgs = ["-f" "--label nixos"]; # Override existing partitions
+ subvolumes = {
+ "nix" = {
+ mountpoint = "/nix";
+ mountOptions = defaultMountOptions;
+ };
+ "persistent-storage" = {
+ mountpoint = "/srv";
+ mountOptions = defaultMountOptions;
+ };
+ "persistent-storage@snapshots" = {
+ mountpoint = "/srv/.snapshots";
+ mountOptions = defaultMountOptions;
+ };
+ "swap" = {
+ mountpoint = "/swap";
+ mountOptions = [
+ "noatime" # should have some performance upsides, and I don't use it anyways
+ "lazytime" # make time changes in memory
+ ];
+ };
+ };
+ };
+ };
+ };
+ boot = {
+ type = "EF00";
+ size = "512M";
+ name = "boot";
+ content = {
+ type = "filesystem";
+ format = "vfat";
+ mountpoint = "/boot";
+ };
+ };
+ };
+ };
+ };
+ };
+ nodev = {
+ "/" = {
+ fsType = "tmpfs";
+ mountOptions = ["defaults" "size=25%" "mode=0755"];
+ };
+ "/tmp" = {
+ fsType = "tmpfs";
+ mountOptions = ["defaults" "size=50%" "mode=0755"];
+ };
+ "/nix/var/nix/b" = {
+ fsType = "tmpfs";
+ mountOptions = [
+ "defaults"
+ "noswap" # Otherwise, we might run into io-based slowdowns
+ "size=80%"
+ "mode=0755"
+ ];
+ };
+ };
+ };
+ fileSystems = {
+ "/srv" = {
+ neededForBoot = true;
+ };
+ "/swap" = {
+ neededForBoot = true;
+ };
+ };
+ swapDevices = [
+ #{
+ # device = "/swap/swapfile";
+ # priority = 1; # lower than zramSwap, just in case
+ # # size = 2048; # TODO: can nixos create a btrfs swapfile correctly?
+ #}
+ ];
+ zramSwap = {
+ enable = true;
+ priority = 10; # needs to be higher than hardware-swap
+ };
+ boot = {
+ kernelParams = [
+ "resume_offset=${cfg.swap.resumeOffset}"
+ "zswap.enabled=0" # zswap and zram are not really compatible
+ ];
+ resumeDevice = "/dev/disk/by-uuid/${cfg.swap.uuid}";
+ };
+ };
+}
diff --git a/hosts/default.nix b/hosts/default.nix
new file mode 100644
index 00000000..4f5d2982
--- /dev/null
+++ b/hosts/default.nix
@@ -0,0 +1,50 @@
+{
+ self,
+ extra_lib,
+ module_args,
+ special_args,
+ nixpkgs-stable,
+ nixpkgs-unstable,
+ deploy-rs,
+ system,
+}: let
+ hosts = extra_lib.mkByName {
+ useShards = false;
+ baseDirectory = ./by-name;
+ fileName = "configuration.nix";
+ };
+
+ mkNixosConfiguration = name: path: let
+ host_file = builtins.fromTOML (builtins.readFile (path + "/../host.toml"));
+ nixpkgs =
+ if host_file.nixpkgs == "stable"
+ then nixpkgs-stable
+ else nixpkgs-unstable;
+ in
+ nixpkgs.lib.nixosSystem {
+ specialArgs = special_args;
+ modules = [
+ {
+ _module.args = module_args;
+ }
+ path
+
+ ../modules
+ # ../modules/common
+ ];
+ };
+ mkDeployHost = name: path: let
+ host_file = builtins.fromTOML (builtins.readFile path + "/host.toml");
+ in {
+ inherit (host_file) hostname;
+ profiles.system = {
+ user = "root";
+ path = deploy-rs.lib."${system}".activate.nixos self.nixosConfigurations."${name}";
+ };
+ };
+
+ nixosConfigurations = builtins.mapAttrs mkNixosConfiguration hosts;
+ nodes = builtins.mapAttrs mkDeployHost hosts;
+in {
+ inherit nixosConfigurations nodes;
+}
diff --git a/hosts/hostinfo.toml b/hosts/hostinfo.toml
deleted file mode 100644
index b51c0501..00000000
--- a/hosts/hostinfo.toml
+++ /dev/null
@@ -1,5 +0,0 @@
-[Tiamat]
-description = "This is my main desktop"
-
-[Apzu]
-description = "This is my light laptop, with modern hardware"
diff --git a/hosts/tiamat/default.nix b/hosts/tiamat/default.nix
deleted file mode 100644
index 470f88cb..00000000
--- a/hosts/tiamat/default.nix
+++ /dev/null
@@ -1,139 +0,0 @@
-{
- lib,
- pkgs,
- baseLib,
- qmk_firmware,
- system,
- ...
-}: {
- imports = [
- ./hardware.nix
- ];
-
- soispha = {
- bluetooth = {enable = true;};
- networking = {
- enable = true;
- hostName = "tiamat";
- mode = "systemd-networkd";
- };
- nixpkgs = {
- enable = true;
- systemName = "x86_64-linux";
- };
- services = {
- backup = {
- backupDiskUuid = "c06ce163-2955-4388-b212-dfec4448fcf4";
- enable = true;
- };
- unison.foreign.address = "apzu.fritz.box";
- };
- programs = {
- river = {
- unicodeInput.enable = true;
- init = {
- mappings = {
- layout = "us";
- keymap = let
- map = key: "<Alt+Ctrl+Meta+Shift-${key}>";
- in
- (lib.mapAttrs' (name: value: lib.nameValuePair (map name) value) {
- # Movement
- "A" = {command = ["exit"];};
- "B" = {command = ["close"];};
-
- "C" = {command = ["focus-view" "previous"];};
- "D" = {command = ["focus-view" "next"];};
-
- "E" = {command = ["swap" "previous"];};
- "F" = {command = ["swap" "next"];};
-
- "G" = {command = ["zoom"];};
-
- "H" = {command = ["toggle-fullscreen"];};
- "I" = {command = ["toggle-float"];};
-
- "J" = {command = ["send-to-output" "next"];};
-
- "K" = {command = ["spawn" "${lib.getExe pkgs.alacritty}"];};
- "L" = {command = ["spawn" "${lib.getExe pkgs.screenshot_persistent}"];};
-
- # Audio
- # "M" = {command = ["spawn" "video-pause toggle"]; modes = ["normal" "locked"]; };
- "N" = {
- command = ["spawn" "${lib.getExe pkgs.mpc} toggle"];
- modes = ["normal" "locked"];
- };
-
- # Launcher
- "O" = {command = ["spawn" "${lib.getExe pkgs.rofi} -show combi -modes combi -combi-modes 'window,drun,run' -show-icons"];};
- "P" = {command = ["spawn" "${lib.getExe pkgs.tskm} open select"];};
- "Q" = {command = ["spawn" "${lib.getExe pkgs.keepassxc}"];};
- # "R" = {command = ["spawn" "nheko"];};
- "S" = {command = ["spawn" "${lib.getExe pkgs.signal-desktop}"];};
- "T" = {command = ["spawn" "${lib.getExe pkgs.lock}"];};
-
- "U" = {command = ["focus-output" "next"];};
- "V" = {command = ["focus-previous-tags"];};
- "W" = {command = ["send-to-previous-tags"];};
- # "X" = {command = ["spawn" "bemenu-run"];};
- # "Y" = {command = ["spawn" "bemenu-run"];};
-
- # Toggle all tags
- "0" = {command = ["set-focused-tags" "${builtins.toString ((baseLib.pow 2 32) - 1)}"];};
-
- # Support Unicode input
- "Z" = {command = ["spawn" "${lib.getExe 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)}"];};
-
- # Mouse
- "<Meta-<MOUSE_LEFT>>" = {
- command = ["move-view"];
- map_mode = "MapMouse";
- };
- "<Meta-<MOUSE_RIGHT>>" = {
- command = ["resize-view"];
- map_mode = "MapMouse";
- };
- }
- // (
- builtins.foldl' (acc: elem: acc // elem) {} (
- builtins.map (index: let
- num = builtins.toString index;
- index2tag = input: builtins.toString (baseLib.pow 2 (input - 1));
- in {
- "${map num}" = {command = ["set-focused-tags" (index2tag index)];};
- "<Alt+Ctrl+Shift-${num}>" = {command = ["set-view-tags" (index2tag index)];};
- # "<Super+Shift+Ctrl-${num}>" = {command = ["toggle-view-tags" (index2tag index)];};
- }) (builtins.genList (i: i + 1) 9)
- )
- ));
- };
- screenSetupCode = {
- "DP-2" = {pos = "2560,0";};
- "DP-1" = {
- scale = "1.5";
- pos = "0,0";
- };
- };
- };
- };
- };
- locale = {
- enable = true;
- keyMap = "us";
- };
- users = {
- enable = true;
- enableDeprecatedPlugdev = true;
- hashedPassword = "$y$jFT$qi3wS9njrMl2y55b3NOBI0$j40Qt6AAkMSfZ82KPhqMaUaPztWtPps1wOqaXaF/L.6";
- };
- };
-
- system.stateVersion = "23.05";
-}