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 -------------- 2 files changed, 168 deletions(-) delete mode 100644 hosts/apzu/default.nix delete mode 100644 hosts/apzu/hardware.nix (limited to 'hosts/apzu') 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"]; - }; -} -- cgit 1.4.1