From 176d9bb96e8923b84bb0bdc731ef707514c0d53e Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Fri, 16 May 2025 16:45:40 +0200 Subject: hosts: Move to a `by-name` schema --- hosts/apzu/default.nix | 131 --------------------------- hosts/apzu/hardware.nix | 37 -------- hosts/by-name/apzu/configuration.nix | 138 +++++++++++++++++++++++++++++ hosts/by-name/apzu/hardware.nix | 37 ++++++++ hosts/by-name/tiamat/configuration.nix | 157 +++++++++++++++++++++++++++++++++ hosts/by-name/tiamat/hardware.nix | 45 ++++++++++ hosts/default.nix | 61 +++++++++++++ hosts/tiamat/default.nix | 144 ------------------------------ hosts/tiamat/hardware.nix | 45 ---------- 9 files changed, 438 insertions(+), 357 deletions(-) delete mode 100644 hosts/apzu/default.nix delete mode 100644 hosts/apzu/hardware.nix create mode 100644 hosts/by-name/apzu/configuration.nix create mode 100644 hosts/by-name/apzu/hardware.nix create mode 100644 hosts/by-name/tiamat/configuration.nix create mode 100644 hosts/by-name/tiamat/hardware.nix create mode 100644 hosts/default.nix delete mode 100644 hosts/tiamat/default.nix delete mode 100644 hosts/tiamat/hardware.nix (limited to 'hosts') diff --git a/hosts/apzu/default.nix b/hosts/apzu/default.nix deleted file mode 100644 index 96dd99e1..00000000 --- a/hosts/apzu/default.nix +++ /dev/null @@ -1,131 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz -# 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 . -{ - lib, - pkgs, - baseLib, - ... -}: { - imports = [ - ./hardware.nix - ]; - - soispha = { - 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 - "" = {command = ["focus-view" "next"];}; - "" = {command = ["focus-view" "previous"];}; - "" = {command = ["focus-output" "next"];}; - "" = {command = ["focus-output" "previous"];}; - - # Standard programs - ">" = {command = ["spawn" "${lib.getExe pkgs.alacritty}"];}; - "" = {command = ["exit"];}; - "" = {command = ["spawn" "${lib.getExe pkgs.lock}"];}; - - # Screenshot - "" = {command = ["spawn" "${lib.getExe pkgs.screenshot_persistent}"];}; - - # Audio - "" = { - command = ["spawn" "${lib.getExe' pkgs.wireplumber "wpctl"} set-volume @DEFAULT_SINK@ 5%+"]; - modes = ["normal" "locked"]; - }; - "" = { - command = ["spawn" "${lib.getExe' pkgs.wireplumber "wpctl"} set-volume @DEFAULT_SINK@ 5%-"]; - modes = ["normal" "locked"]; - }; - "" = { - command = ["spawn" "${lib.getExe pkgs.mpc} toggle"]; - modes = ["normal" "locked"]; - }; - - # Launcher - "" = {command = ["spawn" "${lib.getExe pkgs.rofi} -show combi -modes combi -combi-modes 'window, drun, run' -show-icons"];}; - ">" = {command = ["spawn" "${lib.getExe pkgs.tskm} open select"];}; - ">" = {command = ["spawn" "${lib.getExe pkgs.keepassxc}"];}; - ">" = {command = ["spawn" "${lib.getExe pkgs.signal-desktop}"];}; - # ">" = {command = ["spawn" "${lib.getExe pkgs.steam}"];}; - - # Client - "" = {command = ["toggle-fullscreen"];}; - "" = {command = ["close"];}; - "" = {command = ["toggle-float"];}; - ">" = {command = ["zoom"];}; - "" = {command = ["send-to-output" "next"];}; - "" = {command = ["swap" "next"];}; - "" = {command = ["swap" "previous"];}; - - # Toggle all tags - "" = {command = ["set-focused-tags" (builtins.toString ((baseLib.pow 2 32) - 1))];}; - "" = {command = ["set-view-tags" (builtins.toString ((baseLib.pow 2 32) - 1))];}; - - # Mouse - ">" = { - command = ["move-view"]; - map_mode = "MapMouse"; - }; - ">" = { - 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 { - "" = {command = ["set-focused-tags" (index2tag index)];}; - "" = {command = ["set-view-tags" (index2tag index)];}; - "" = {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 8d481fa6..00000000 --- a/hosts/apzu/hardware.nix +++ /dev/null @@ -1,37 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz -# 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 . -{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..69af3f2d --- /dev/null +++ b/hosts/by-name/apzu/configuration.nix @@ -0,0 +1,138 @@ +# nixos-config - My current NixOS configuration +# +# Copyright (C) 2025 Benedikt Peetz +# 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 . +{ + lib, + pkgs, + baseLib, + ... +}: { + imports = [ + ./hardware.nix + ]; + + soispha = { + bluetooth.enable = true; + + laptop = { + backlight = "intel_backlight"; + enable = true; + }; + + # TODO: Hard-code all the uids/gids <2025-05-13> + impermanence.directories = [ + "/var/lib/nixos" + "/var/log" + ]; + + programs = { + yambar = { + laptop = true; + backlight = "intel_backlight"; + }; + river.init = { + mappings = { + layout = "dvorak-modified"; + keymap = + { + # Focus change + "" = {command = ["focus-view" "next"];}; + "" = {command = ["focus-view" "previous"];}; + "" = {command = ["focus-output" "next"];}; + "" = {command = ["focus-output" "previous"];}; + + # Standard programs + ">" = {command = ["spawn" "${lib.getExe pkgs.alacritty}"];}; + "" = {command = ["exit"];}; + "" = {command = ["spawn" "${lib.getExe pkgs.lock}"];}; + + # Screenshot + "" = {command = ["spawn" "${lib.getExe pkgs.screenshot_persistent}"];}; + + # Audio + "" = { + command = ["spawn" "${lib.getExe' pkgs.wireplumber "wpctl"} set-volume @DEFAULT_SINK@ 5%+"]; + modes = ["normal" "locked"]; + }; + "" = { + command = ["spawn" "${lib.getExe' pkgs.wireplumber "wpctl"} set-volume @DEFAULT_SINK@ 5%-"]; + modes = ["normal" "locked"]; + }; + "" = { + command = ["spawn" "${lib.getExe pkgs.mpc} toggle"]; + modes = ["normal" "locked"]; + }; + + # Launcher + "" = {command = ["spawn" "${lib.getExe pkgs.rofi} -show combi -modes combi -combi-modes 'window, drun, run' -show-icons"];}; + ">" = {command = ["spawn" "${lib.getExe pkgs.tskm} open select"];}; + ">" = {command = ["spawn" "${lib.getExe pkgs.keepassxc}"];}; + ">" = {command = ["spawn" "${lib.getExe pkgs.signal-desktop}"];}; + # ">" = {command = ["spawn" "${lib.getExe pkgs.steam}"];}; + + # Client + "" = {command = ["toggle-fullscreen"];}; + "" = {command = ["close"];}; + "" = {command = ["toggle-float"];}; + ">" = {command = ["zoom"];}; + "" = {command = ["send-to-output" "next"];}; + "" = {command = ["swap" "next"];}; + "" = {command = ["swap" "previous"];}; + + # Toggle all tags + "" = {command = ["set-focused-tags" (builtins.toString ((baseLib.pow 2 32) - 1))];}; + "" = {command = ["set-view-tags" (builtins.toString ((baseLib.pow 2 32) - 1))];}; + + # Mouse + ">" = { + command = ["move-view"]; + map_mode = "MapMouse"; + }; + ">" = { + 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 { + "" = {command = ["set-focused-tags" (index2tag index)];}; + "" = {command = ["set-view-tags" (index2tag index)];}; + "" = {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/by-name/apzu/hardware.nix b/hosts/by-name/apzu/hardware.nix new file mode 100644 index 00000000..8d481fa6 --- /dev/null +++ b/hosts/by-name/apzu/hardware.nix @@ -0,0 +1,37 @@ +# nixos-config - My current NixOS configuration +# +# Copyright (C) 2025 Benedikt Peetz +# 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 . +{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/tiamat/configuration.nix b/hosts/by-name/tiamat/configuration.nix new file mode 100644 index 00000000..3e7349ce --- /dev/null +++ b/hosts/by-name/tiamat/configuration.nix @@ -0,0 +1,157 @@ +# nixos-config - My current NixOS configuration +# +# Copyright (C) 2025 Benedikt Peetz +# 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 . +{ + lib, + pkgs, + system, + libraries, + externalBinaries, + ... +}: { + imports = [ + ./hardware.nix + ]; + + soispha = { + bluetooth = {enable = true;}; + networking = { + enable = true; + hostName = "tiamat"; + mode = "systemd-networkd"; + }; + nixpkgs = { + enable = true; + systemName = "x86_64-linux"; + }; + + # TODO: Hard-code all the uids/gids <2025-05-13> + impermanence.directories = [ + "/var/lib/nixos" + "/var/log" + ]; + + services = { + unison.foreign.address = "apzu.fritz.box"; + }; + programs = { + river = { + unicodeInput.enable = true; + init = { + mappings = { + layout = "us"; + keymap = let + map = 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 ((libraries.base.pow 2 32) - 1)}"];}; + + # Support Unicode input + "Z" = {command = ["spawn" "${lib.getExe externalBinaries.qmk_firmware.packages.${system}.qmk_unicode_type} 106 65377"];}; + }) + // ({ + # TODO: add toggle-focus mapping + + # Toggle all tags + "" = { + command = [ + "set-view-tags" + "${builtins.toString + ((libraries.base.pow 2 32) - 1)}" + ]; + }; + + # Mouse + ">" = { + command = ["move-view"]; + map_mode = "MapMouse"; + }; + ">" = { + command = ["resize-view"]; + map_mode = "MapMouse"; + }; + } + // ( + builtins.foldl' (acc: elem: acc // elem) {} ( + builtins.map (index: let + num = builtins.toString index; + index2tag = input: builtins.toString (libraries.base.pow 2 (input - 1)); + in { + "${map num}" = {command = ["set-focused-tags" (index2tag index)];}; + "" = {command = ["set-view-tags" (index2tag index)];}; + # "" = {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"; +} diff --git a/hosts/by-name/tiamat/hardware.nix b/hosts/by-name/tiamat/hardware.nix new file mode 100644 index 00000000..2b18a662 --- /dev/null +++ b/hosts/by-name/tiamat/hardware.nix @@ -0,0 +1,45 @@ +# nixos-config - My current NixOS configuration +# +# Copyright (C) 2025 Benedikt Peetz +# 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 . +{modulesPath, ...}: { + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") # TODO: is this necessary? + ]; + + soispha = { + hardware = { + enable = true; + cpuType = "amd"; + moonlander = { + enableFlashing = true; + }; + }; + + disks = { + enable = true; + disk = "/dev/disk/by-id/nvme-CT1000P5SSD8_21032C857568"; + ssd = true; + swap = { + uuid = "057b5041-6fee-4739-84a9-ade8f0f51519"; + resumeOffset = "533760"; + }; + }; + }; + + boot = { + kernelModules = ["kvm-amd"]; + + kernelParams = [ + # Avoid loosing the Bluetooth controller to a sleep, from which it never wakes again + "btusb.enable_autosuspend=n" + ]; + + initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"]; + }; +} diff --git a/hosts/default.nix b/hosts/default.nix new file mode 100644 index 00000000..35b2d08b --- /dev/null +++ b/hosts/default.nix @@ -0,0 +1,61 @@ +# nixos-config - My current NixOS configuration +# +# Copyright (C) 2025 Benedikt Peetz +# 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 . +{ + self, + system, + openPRsNixpkgs, + packageSets, + libraries, + modules, + externalDependencies, + externalBinaries, +}: let + hosts = libraries.extra.mkByName { + useShards = false; + baseDirectory = ./by-name; + fileName = "configuration.nix"; + }; + + generateHost = _: path: + self.inputs.nixpkgs.lib.nixosSystem { + specialArgs = { + inherit + libraries + modules + ; + }; + modules = [ + { + _module.args = { + inherit + # extra package sources + openPRsNixpkgs + packageSets + # extra information + system + # nix registry + self + externalDependencies + # bins + # TODO: Integrate these into `pkgs/by-name` <2024-05-22> + externalBinaries + ; + }; + } + path + + ../modules + ../modules/common + ]; + }; + + generatedHosts = builtins.mapAttrs generateHost hosts; +in + generatedHosts diff --git a/hosts/tiamat/default.nix b/hosts/tiamat/default.nix deleted file mode 100644 index 794b8390..00000000 --- a/hosts/tiamat/default.nix +++ /dev/null @@ -1,144 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz -# 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 . -{ - 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 = { - unison.foreign.address = "apzu.fritz.box"; - }; - programs = { - river = { - unicodeInput.enable = true; - init = { - mappings = { - layout = "us"; - keymap = let - map = 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 - "" = {command = ["set-view-tags" "${builtins.toString ((baseLib.pow 2 32) - 1)}"];}; - - # Mouse - ">" = { - command = ["move-view"]; - map_mode = "MapMouse"; - }; - ">" = { - 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)];}; - "" = {command = ["set-view-tags" (index2tag index)];}; - # "" = {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"; -} diff --git a/hosts/tiamat/hardware.nix b/hosts/tiamat/hardware.nix deleted file mode 100644 index 2b18a662..00000000 --- a/hosts/tiamat/hardware.nix +++ /dev/null @@ -1,45 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz -# 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 . -{modulesPath, ...}: { - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") # TODO: is this necessary? - ]; - - soispha = { - hardware = { - enable = true; - cpuType = "amd"; - moonlander = { - enableFlashing = true; - }; - }; - - disks = { - enable = true; - disk = "/dev/disk/by-id/nvme-CT1000P5SSD8_21032C857568"; - ssd = true; - swap = { - uuid = "057b5041-6fee-4739-84a9-ade8f0f51519"; - resumeOffset = "533760"; - }; - }; - }; - - boot = { - kernelModules = ["kvm-amd"]; - - kernelParams = [ - # Avoid loosing the Bluetooth controller to a sleep, from which it never wakes again - "btusb.enable_autosuspend=n" - ]; - - initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"]; - }; -} -- cgit 1.4.1