From 9873148fcd65f5b7f570b1787f5d0bfcc499ac0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Sat, 19 Apr 2025 10:29:26 +0200 Subject: [PATCH 01/17] feat: add moritz-laptop --- flake.nix | 1 + machines/moritz-laptop/configuration.nix | 245 + machines/moritz-laptop/disko.nix | 104 + machines/moritz-laptop/facter.json | 4201 +++++++++++++++++ modules/moritz/profiles/personal_contacts.nix | 2 +- modules/moritz/profiles/personal_mail.nix | 2 +- 6 files changed, 4553 insertions(+), 2 deletions(-) create mode 100644 machines/moritz-laptop/configuration.nix create mode 100644 machines/moritz-laptop/disko.nix create mode 100644 machines/moritz-laptop/facter.json diff --git a/flake.nix b/flake.nix index 0f09a08..098bc21 100644 --- a/flake.nix +++ b/flake.nix @@ -100,6 +100,7 @@ inventory = { machines = { moritz-desktop.tags = ["peer"]; + moritz-laptop.tags = ["peer"]; moritz-server.tags = []; }; services.zerotier.default = { diff --git a/machines/moritz-laptop/configuration.nix b/machines/moritz-laptop/configuration.nix new file mode 100644 index 0000000..635238f --- /dev/null +++ b/machines/moritz-laptop/configuration.nix @@ -0,0 +1,245 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page +# and in the NixOS manual (accessible by running ‘nixos-help’). +{ + pkgs, + inputs, + ... +}: { + imports = [ + ./disko.nix + ../../modules/moritz/default.nix + ../../modules/shared.nix + ]; + + time.timeZone = "Europe/Berlin"; + + users.users.root.openssh.authorizedKeys.keys = [ + '' + ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDHlemuKagHwz2T5rEwgJNlVUdUdOXyPtCEzD73CrwY2zmpR4AMj7y9u3Rm7HwHUDjLap1ZFwg+53bAsVP6HFZccCXoIfO/8BL0WDGQJrfgb+A+UiRhSqSvyZ77bGJkadbBkadguz3qR3PHcb41DOlhuqVcHxsY8ceHMxAuyb0pLJVJLeytMD+CHS/r7hoj2hckTNAZ+VhCXBtdZfZ7uPUBxLfluYRNNMmdwCglsg3RUS242nJUzy3A84+CXIGeWmNG9Fu45IDkwMthxSW9klyU9R38R9DBDcugkyb6vz+JKSuRVAa47qh/kmtsYekfL3ul9D2JN32P8S+6ZoXx+gXupGJ0ltwJWAFkhLJ+yeXj9kCOv/mIUmCB14jMGsvKiSwV25O/twyjqe2LEkMVgimgrjEYoHu+ZTyp0iFtUvSrFo4tsAhfWPV9yj4F/hUksW7xKIwq5Niyx7he5M/XddudtnAximyiBDGCdJm1Ejl0UaGa6ZQv7y6VZdx0PyZuraT7l9ub8so6JlE4cVgSSU9vE0IS2QqBuHhsIjh8RVksoTR2NQbeDdGaGpGnq2C8y0rDXwE/EJA4LK45khX/GPn73n8F0kBG8dBrWgRDAEODpmebScO7d5mCeM0z3lPcRmh+3e3DPnVVOl+uR7udlc7NauLzl7q913UtxZaF1PlD7Q== cardno:15_584_308 + '' + ]; + + # Set this for clan commands use ssh i.e. `clan machines update` + # If you change the hostname, you need to update this line to root@ + # This only works however if you have avahi running on your admin machine else use IP + clan.core.networking.targetHost = "root@moritz-laptop"; + + my = { + ai.enable = true; + profiles = { + desktop.enable = true; + personal.enable = true; + personal.mail = true; + personal.contacts = true; + personal.calendar = true; + impermanence.enable = true; + }; + programs.aider.enable = true; + }; + + users.users.moritz.packages = with pkgs; [ + poetry + wl-clipboard + ]; + + home-manager.users.moritz.services.kanshi.settings = [ + { + profile.name = "undocked"; + profile.outputs = [ + { + criteria = "eDP-1"; + scale = 1.0; + } + ]; + } + { + profile.name = "docked-scads"; + profile.outputs = [ + { + criteria = "eDP-1"; + position = "640,1800"; # NOTE: 2160 / 1.2 = 1800 + } + { + criteria = "Dell Inc. DELL P4317Q"; + scale = 1.2; + position = "0,0"; + } + ]; + } + ]; + + services.kanata = { + enable = true; + keyboards = { + laptop = { + devices = [ + "/dev/input/by-path/platform-i8042-serio-0-event-kbd" + ]; + config = " + (defsrc + grv 1 2 3 4 5 6 7 8 9 0 - = bspc + tab q w e r t y u i o p [ ] \ + caps a s d f g h j k l ; ' ret + lsft z x c v b n m , . / rsft + lctl lmet lalt spc ralt rctl + ) + + (deflayermap (default) + ;; tarmak 1a + j n + n k + k e + + ;; tarmak 1b + h m + m h + + ;; tarmak 2a + b z + z x + x c + + ;; tarmak 2b + e f + f t + t b + + ;; tarmak 3 + c d + d s + s r + + ;; tarmak 4 + r p + p ; + ; o + o y + y j + + ;; tarmak 5 + u l + l i + i u + + ;; caps-word tap-dance + lsft (tap-dance 200 (_ (caps-word 2000) _ _)) + + ;; change ctrl alt and meta + lctl lalt + lmet lctl + lalt (tap-dance 200 (lmet (multi lmet alt) lmet lmet)) + + ;; hjkl layer + ralt (tap-hold 200 200 (layer-switch hjkl) (layer-while-held hjkl)) ;; tap: switch hold: switch while held + + ;; switch to normal keyboard layout + rctl (layer-switch normal) + ) + + (deflayermap (normal) + rctl (layer-switch default)) + + (deflayermap (hjkl) + h left + j down + k up + l right + + ralt (layer-switch default)) + "; + }; + }; + }; + + # BOOT + boot = { + supportedFilesystems = ["zfs"]; + loader.systemd-boot.enable = true; + loader.efi.canTouchEfiVariables = true; + initrd.availableKernelModules = ["rtsx_pci_sdmmc"]; + }; + + # SERVICES + services = { + libinput.enable = true; + libinput.touchpad.disableWhileTyping = true; + printing.enable = true; + logind.lidSwitch = "hybrid-sleep"; + }; + + # NETWORKING + networking = { + networkmanager.enable = true; + + useDHCP = false; + interfaces.wlp1s0.useDHCP = true; + # interfaces.enp4s0f4u2.useDHCP = true; + }; + + console.keyMap = "en"; + + # needed for enabling hibernation + security.protectKernelImage = false; + + # Powersaving + services.tlp.enable = true; + powerManagement.enable = true; + powerManagement.powertop.enable = true; + + systemd = { + # Hibernare on low battery + timers.hibernate-on-low-battery = { + wantedBy = ["multi-user.target"]; + timerConfig = { + OnUnitActiveSec = "120"; + OnBootSec = "120"; + }; + }; + services.hibernate-on-low-battery = let + batteryLevelSufficient = let + batteryPath = "/sys/class/power_supply/BATT"; + in + pkgs.writeShellScriptBin "battery-level-sufficient" '' + test "$(cat ${batteryPath}/status)" != Discharging \ + || test "$(cat ${batteryPath}/capacity)" -ge 5 + ''; + in { + serviceConfig.Type = "oneshot"; + onFailure = ["hibernate.target"]; + script = "${batteryLevelSufficient}/bin/battery-level-sufficient"; + }; + services.asus-touchpad-numpad = { + description = "Activate Numpad inside the touchpad with top right corner switch"; + documentation = ["https://github.com/mohamed-badaoui/asus-touchpad-numpad-driver"]; + path = [pkgs.i2c-tools]; + script = '' + cd ${inputs.asus-touchpad-numpad-driver} + # In the last argument here you choose your layout. + ${ + pkgs.python3.withPackages (ps: [ps.libevdev]) + }/bin/python asus_touchpad.py m433ia + ''; + # Probably needed because it fails on boot seemingly because the driver + # is not ready yet. Alternatively, you can use `sleep 3` or similar in the + # `script`. + serviceConfig = { + RestartSec = "1s"; + Restart = "on-failure"; + }; + wantedBy = ["multi-user.target"]; + }; + }; + + # Trackpad + # i2c for https://github.com/mohamed-badaoui/asus-touchpad-numpad-driver + hardware.i2c.enable = true; + + # This value determines the NixOS release from which the default + # settings for stateful data, like file locations and database versions + # on your system were taken. It‘s perfectly fine and recommended to leave + # this value at the release version of the first install of this system. + # Before changing this value read the documentation for this option + # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). + system.stateVersion = "22.05"; # Did you read the comment? +} diff --git a/machines/moritz-laptop/disko.nix b/machines/moritz-laptop/disko.nix new file mode 100644 index 0000000..a344fd9 --- /dev/null +++ b/machines/moritz-laptop/disko.nix @@ -0,0 +1,104 @@ +{pkgs, ...}: { + # needed for zfs pool + networking.hostId = "9c85d185"; + disko.devices = { + disk = { + main = { + type = "disk"; + device = "/dev/nvme0n1"; + content = { + type = "gpt"; + partitions = { + ESP = { + size = "512M"; + type = "EF00"; + content = { + type = "filesystem"; + format = "vfat"; + mountpoint = "/boot"; + }; + }; + zfs = { + size = "100%"; + content = { + type = "zfs"; + pool = "zroot"; + }; + }; + }; + }; + }; + }; + zpool = { + zroot = { + type = "zpool"; + rootFsOptions = { + compression = "zstd"; + "com.sun:auto-snapshot" = "false"; + "acltype" = "posixacl"; # NOTE: needed for systemd https://github.com/NixOS/nixpkgs/issues/16954 + }; + mountpoint = null; + + datasets = { + encrypted = { + type = "zfs_fs"; + options = { + mountpoint = "none"; + encryption = "aes-256-gcm"; + keyformat = "passphrase"; + }; + # use this to read the key during boot + postCreateHook = '' + zfs set keylocation="prompt" "zroot/$name"; + ''; + }; + "encrypted/root" = { + type = "zfs_fs"; + options.mountpoint = "legacy"; + mountpoint = "/"; + postCreateHook = "zfs snapshot zroot/encrypted/root@blank"; + }; + "encrypted/nix" = { + type = "zfs_fs"; + options.mountpoint = "legacy"; + mountpoint = "/nix"; + }; + "encrypted/persist" = { + type = "zfs_fs"; + options.mountpoint = "legacy"; + mountpoint = "/persist"; + options."com.sun:auto-snapshot" = "true"; + }; + }; + }; + }; + }; + # rollback to blank + boot.initrd.systemd.services.rollback = { + description = "Rollback ZFS datasets to a pristine state"; + wantedBy = [ + "initrd.target" + ]; + after = [ + "zfs-import-zroot.service" + ]; + before = [ + "sysroot.mount" + ]; + path = with pkgs; [ + zfs + ]; + unitConfig.DefaultDependencies = "no"; + serviceConfig.Type = "oneshot"; + script = '' + zfs rollback -r zroot/encrypted/root@blank && echo "rollback complete" + ''; + }; + boot.initrd.systemd.enable = true; + fileSystems."/persist".neededForBoot = true; + services.zfs = { + autoScrub.enable = true; + trim.enable = true; + autoSnapshot.enable = true; + }; +} diff --git a/machines/moritz-laptop/facter.json b/machines/moritz-laptop/facter.json new file mode 100644 index 0000000..54f871d --- /dev/null +++ b/machines/moritz-laptop/facter.json @@ -0,0 +1,4201 @@ +{ + "version": 1, + "system": "x86_64-linux", + "virtualisation": "none", + "hardware": { + "bios": { + "apm_info": { + "supported": false, + "enabled": false, + "version": 0, + "sub_version": 0, + "bios_flags": 0 + }, + "vbe_info": { + "version": 0, + "video_memory": 0 + }, + "pnp": false, + "pnp_id": 0, + "lba_support": false, + "low_memory_size": 0, + "smbios_version": 770 + }, + "bluetooth": [ + { + "index": 44, + "attached_to": 51, + "bus_type": { + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "name": "Bluetooth Device", + "value": 277 + }, + "vendor": { + "value": 32903 + }, + "device": { + "value": 41 + }, + "revision": { + "name": "0.01", + "value": 0 + }, + "model": "Bluetooth Device", + "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:04:00.3/usb1/1-4/1-4:1.1", + "sysfs_bus_id": "1-4:1.1", + "resources": [ + { + "type": "baud", + "speed": 12000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "name": "wireless", + "value": 224 + }, + "device_subclass": { + "name": "audio", + "value": 1 + }, + "device_protocol": 1, + "interface_class": { + "name": "wireless", + "value": 224 + }, + "interface_subclass": { + "name": "audio", + "value": 1 + }, + "interface_protocol": 1, + "interface_number": 1, + "interface_alternate_setting": 0 + }, + "hotplug": "usb", + "driver": "btusb", + "driver_module": "btusb", + "drivers": [ + "btusb" + ], + "driver_modules": [ + "btusb" + ], + "module_alias": "usb:v8087p0029d0001dcE0dsc01dp01icE0isc01ip01in01" + }, + { + "index": 52, + "attached_to": 51, + "bus_type": { + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "name": "Bluetooth Device", + "value": 277 + }, + "vendor": { + "value": 32903 + }, + "device": { + "value": 41 + }, + "revision": { + "name": "0.01", + "value": 0 + }, + "model": "Bluetooth Device", + "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:04:00.3/usb1/1-4/1-4:1.0", + "sysfs_bus_id": "1-4:1.0", + "resources": [ + { + "type": "baud", + "speed": 12000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "name": "wireless", + "value": 224 + }, + "device_subclass": { + "name": "audio", + "value": 1 + }, + "device_protocol": 1, + "interface_class": { + "name": "wireless", + "value": 224 + }, + "interface_subclass": { + "name": "audio", + "value": 1 + }, + "interface_protocol": 1, + "interface_number": 0, + "interface_alternate_setting": 0 + }, + "hotplug": "usb", + "driver": "btusb", + "driver_module": "btusb", + "drivers": [ + "btusb" + ], + "driver_modules": [ + "btusb" + ], + "module_alias": "usb:v8087p0029d0001dcE0dsc01dp01icE0isc01ip01in00" + } + ], + "bridge": [ + { + "index": 11, + "attached_to": 0, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 8 + }, + "base_class": { + "name": "Bridge", + "value": 6 + }, + "sub_class": { + "name": "Host bridge", + "value": 0 + }, + "vendor": { + "name": "AMD", + "value": 4130 + }, + "device": { + "value": 5682 + }, + "model": "AMD Host bridge", + "sysfs_id": "/devices/pci0000:00/0000:00:08.0", + "sysfs_bus_id": "0000:00:08.0", + "sysfs_iommu_group_id": 5, + "detail": { + "function": 0, + "command": 0, + "header_type": 0, + "secondary_bus": 0, + "irq": 0, + "prog_if": 0 + }, + "module_alias": "pci:v00001022d00001632sv00000000sd00000000bc06sc00i00" + }, + { + "index": 12, + "attached_to": 0, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 24 + }, + "base_class": { + "name": "Bridge", + "value": 6 + }, + "sub_class": { + "name": "Host bridge", + "value": 0 + }, + "vendor": { + "name": "AMD", + "value": 4130 + }, + "device": { + "value": 5195 + }, + "model": "AMD Host bridge", + "sysfs_id": "/devices/pci0000:00/0000:00:18.3", + "sysfs_bus_id": "0000:00:18.3", + "sysfs_iommu_group_id": 7, + "detail": { + "function": 3, + "command": 0, + "header_type": 0, + "secondary_bus": 0, + "irq": 0, + "prog_if": 0 + }, + "driver": "k10temp", + "driver_module": "k10temp", + "drivers": [ + "k10temp" + ], + "driver_modules": [ + "k10temp" + ], + "module_alias": "pci:v00001022d0000144Bsv00000000sd00000000bc06sc00i00" + }, + { + "index": 13, + "attached_to": 0, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 1 + }, + "base_class": { + "name": "Bridge", + "value": 6 + }, + "sub_class": { + "name": "PCI bridge", + "value": 4 + }, + "pci_interface": { + "name": "Normal decode", + "value": 0 + }, + "vendor": { + "name": "AMD", + "value": 4130 + }, + "sub_vendor": { + "name": "AMD", + "value": 4130 + }, + "device": { + "value": 5684 + }, + "sub_device": { + "value": 4660 + }, + "model": "AMD PCI bridge", + "sysfs_id": "/devices/pci0000:00/0000:00:01.2", + "sysfs_bus_id": "0000:00:01.2", + "sysfs_iommu_group_id": 2, + "resources": [ + { + "type": "irq", + "base": 39, + "triggered": 0, + "enabled": true + } + ], + "detail": { + "function": 2, + "command": 1031, + "header_type": 1, + "secondary_bus": 2, + "irq": 39, + "prog_if": 0 + }, + "driver": "pcieport", + "drivers": [ + "pcieport" + ], + "module_alias": "pci:v00001022d00001634sv00001022sd00001234bc06sc04i00" + }, + { + "index": 16, + "attached_to": 0, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 24 + }, + "base_class": { + "name": "Bridge", + "value": 6 + }, + "sub_class": { + "name": "Host bridge", + "value": 0 + }, + "vendor": { + "name": "AMD", + "value": 4130 + }, + "device": { + "value": 5193 + }, + "model": "AMD Host bridge", + "sysfs_id": "/devices/pci0000:00/0000:00:18.1", + "sysfs_bus_id": "0000:00:18.1", + "sysfs_iommu_group_id": 7, + "detail": { + "function": 1, + "command": 0, + "header_type": 0, + "secondary_bus": 0, + "irq": 0, + "prog_if": 0 + }, + "module_alias": "pci:v00001022d00001449sv00000000sd00000000bc06sc00i00" + }, + { + "index": 18, + "attached_to": 0, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 1 + }, + "base_class": { + "name": "Bridge", + "value": 6 + }, + "sub_class": { + "name": "Host bridge", + "value": 0 + }, + "vendor": { + "name": "AMD", + "value": 4130 + }, + "device": { + "value": 5682 + }, + "model": "AMD Host bridge", + "sysfs_id": "/devices/pci0000:00/0000:00:01.0", + "sysfs_bus_id": "0000:00:01.0", + "sysfs_iommu_group_id": 0, + "detail": { + "function": 0, + "command": 0, + "header_type": 0, + "secondary_bus": 0, + "irq": 0, + "prog_if": 0 + }, + "module_alias": "pci:v00001022d00001632sv00000000sd00000000bc06sc00i00" + }, + { + "index": 20, + "attached_to": 0, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 20 + }, + "base_class": { + "name": "Bridge", + "value": 6 + }, + "sub_class": { + "name": "ISA bridge", + "value": 1 + }, + "vendor": { + "name": "AMD", + "value": 4130 + }, + "sub_vendor": { + "value": 4163 + }, + "device": { + "value": 30990 + }, + "sub_device": { + "value": 4722 + }, + "revision": { + "value": 81 + }, + "model": "AMD ISA bridge", + "sysfs_id": "/devices/pci0000:00/0000:00:14.3", + "sysfs_bus_id": "0000:00:14.3", + "sysfs_iommu_group_id": 6, + "detail": { + "function": 3, + "command": 15, + "header_type": 0, + "secondary_bus": 0, + "irq": 0, + "prog_if": 0 + }, + "module_alias": "pci:v00001022d0000790Esv00001043sd00001272bc06sc01i00" + }, + { + "index": 24, + "attached_to": 0, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 24 + }, + "base_class": { + "name": "Bridge", + "value": 6 + }, + "sub_class": { + "name": "Host bridge", + "value": 0 + }, + "vendor": { + "name": "AMD", + "value": 4130 + }, + "device": { + "value": 5198 + }, + "model": "AMD Host bridge", + "sysfs_id": "/devices/pci0000:00/0000:00:18.6", + "sysfs_bus_id": "0000:00:18.6", + "sysfs_iommu_group_id": 7, + "detail": { + "function": 6, + "command": 0, + "header_type": 0, + "secondary_bus": 0, + "irq": 0, + "prog_if": 0 + }, + "module_alias": "pci:v00001022d0000144Esv00000000sd00000000bc06sc00i00" + }, + { + "index": 25, + "attached_to": 0, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "name": "Bridge", + "value": 6 + }, + "sub_class": { + "name": "Host bridge", + "value": 0 + }, + "vendor": { + "name": "AMD", + "value": 4130 + }, + "sub_vendor": { + "name": "AMD", + "value": 4130 + }, + "device": { + "value": 5680 + }, + "sub_device": { + "value": 5680 + }, + "model": "AMD Host bridge", + "sysfs_id": "/devices/pci0000:00/0000:00:00.0", + "sysfs_bus_id": "0000:00:00.0", + "detail": { + "function": 0, + "command": 0, + "header_type": 0, + "secondary_bus": 0, + "irq": 0, + "prog_if": 0 + }, + "module_alias": "pci:v00001022d00001630sv00001022sd00001630bc06sc00i00" + }, + { + "index": 26, + "attached_to": 0, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 8 + }, + "base_class": { + "name": "Bridge", + "value": 6 + }, + "sub_class": { + "name": "PCI bridge", + "value": 4 + }, + "pci_interface": { + "name": "Normal decode", + "value": 0 + }, + "vendor": { + "name": "AMD", + "value": 4130 + }, + "sub_vendor": { + "name": "AMD", + "value": 4130 + }, + "device": { + "value": 5685 + }, + "sub_device": { + "value": 5685 + }, + "model": "AMD PCI bridge", + "sysfs_id": "/devices/pci0000:00/0000:00:08.1", + "sysfs_bus_id": "0000:00:08.1", + "sysfs_iommu_group_id": 5, + "resources": [ + { + "type": "irq", + "base": 41, + "triggered": 0, + "enabled": true + } + ], + "detail": { + "function": 1, + "command": 1031, + "header_type": 1, + "secondary_bus": 4, + "irq": 41, + "prog_if": 0 + }, + "driver": "pcieport", + "drivers": [ + "pcieport" + ], + "module_alias": "pci:v00001022d00001635sv00001022sd00001635bc06sc04i00" + }, + { + "index": 27, + "attached_to": 0, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 24 + }, + "base_class": { + "name": "Bridge", + "value": 6 + }, + "sub_class": { + "name": "Host bridge", + "value": 0 + }, + "vendor": { + "name": "AMD", + "value": 4130 + }, + "device": { + "value": 5196 + }, + "model": "AMD Host bridge", + "sysfs_id": "/devices/pci0000:00/0000:00:18.4", + "sysfs_bus_id": "0000:00:18.4", + "sysfs_iommu_group_id": 7, + "detail": { + "function": 4, + "command": 0, + "header_type": 0, + "secondary_bus": 0, + "irq": 0, + "prog_if": 0 + }, + "module_alias": "pci:v00001022d0000144Csv00000000sd00000000bc06sc00i00" + }, + { + "index": 28, + "attached_to": 0, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 1 + }, + "base_class": { + "name": "Bridge", + "value": 6 + }, + "sub_class": { + "name": "PCI bridge", + "value": 4 + }, + "pci_interface": { + "name": "Normal decode", + "value": 0 + }, + "vendor": { + "name": "AMD", + "value": 4130 + }, + "sub_vendor": { + "name": "AMD", + "value": 4130 + }, + "device": { + "value": 5684 + }, + "sub_device": { + "value": 4660 + }, + "model": "AMD PCI bridge", + "sysfs_id": "/devices/pci0000:00/0000:00:01.3", + "sysfs_bus_id": "0000:00:01.3", + "sysfs_iommu_group_id": 3, + "resources": [ + { + "type": "irq", + "base": 40, + "triggered": 0, + "enabled": true + } + ], + "detail": { + "function": 3, + "command": 1031, + "header_type": 1, + "secondary_bus": 3, + "irq": 40, + "prog_if": 0 + }, + "driver": "pcieport", + "drivers": [ + "pcieport" + ], + "module_alias": "pci:v00001022d00001634sv00001022sd00001234bc06sc04i00" + }, + { + "index": 30, + "attached_to": 0, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 24 + }, + "base_class": { + "name": "Bridge", + "value": 6 + }, + "sub_class": { + "name": "Host bridge", + "value": 0 + }, + "vendor": { + "name": "AMD", + "value": 4130 + }, + "device": { + "value": 5194 + }, + "model": "AMD Host bridge", + "sysfs_id": "/devices/pci0000:00/0000:00:18.2", + "sysfs_bus_id": "0000:00:18.2", + "sysfs_iommu_group_id": 7, + "detail": { + "function": 2, + "command": 0, + "header_type": 0, + "secondary_bus": 0, + "irq": 0, + "prog_if": 0 + }, + "module_alias": "pci:v00001022d0000144Asv00000000sd00000000bc06sc00i00" + }, + { + "index": 31, + "attached_to": 0, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 1 + }, + "base_class": { + "name": "Bridge", + "value": 6 + }, + "sub_class": { + "name": "PCI bridge", + "value": 4 + }, + "pci_interface": { + "name": "Normal decode", + "value": 0 + }, + "vendor": { + "name": "AMD", + "value": 4130 + }, + "sub_vendor": { + "name": "AMD", + "value": 4130 + }, + "device": { + "value": 5684 + }, + "sub_device": { + "value": 4660 + }, + "model": "AMD PCI bridge", + "sysfs_id": "/devices/pci0000:00/0000:00:01.1", + "sysfs_bus_id": "0000:00:01.1", + "sysfs_iommu_group_id": 1, + "resources": [ + { + "type": "irq", + "base": 38, + "triggered": 0, + "enabled": true + } + ], + "detail": { + "function": 1, + "command": 1031, + "header_type": 1, + "secondary_bus": 1, + "irq": 38, + "prog_if": 0 + }, + "driver": "pcieport", + "drivers": [ + "pcieport" + ], + "module_alias": "pci:v00001022d00001634sv00001022sd00001234bc06sc04i00" + }, + { + "index": 34, + "attached_to": 0, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 24 + }, + "base_class": { + "name": "Bridge", + "value": 6 + }, + "sub_class": { + "name": "Host bridge", + "value": 0 + }, + "vendor": { + "name": "AMD", + "value": 4130 + }, + "device": { + "value": 5192 + }, + "model": "AMD Host bridge", + "sysfs_id": "/devices/pci0000:00/0000:00:18.0", + "sysfs_bus_id": "0000:00:18.0", + "sysfs_iommu_group_id": 7, + "detail": { + "function": 0, + "command": 0, + "header_type": 0, + "secondary_bus": 0, + "irq": 0, + "prog_if": 0 + }, + "module_alias": "pci:v00001022d00001448sv00000000sd00000000bc06sc00i00" + }, + { + "index": 37, + "attached_to": 0, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 2 + }, + "base_class": { + "name": "Bridge", + "value": 6 + }, + "sub_class": { + "name": "Host bridge", + "value": 0 + }, + "vendor": { + "name": "AMD", + "value": 4130 + }, + "device": { + "value": 5682 + }, + "model": "AMD Host bridge", + "sysfs_id": "/devices/pci0000:00/0000:00:02.0", + "sysfs_bus_id": "0000:00:02.0", + "sysfs_iommu_group_id": 4, + "detail": { + "function": 0, + "command": 0, + "header_type": 0, + "secondary_bus": 0, + "irq": 0, + "prog_if": 0 + }, + "module_alias": "pci:v00001022d00001632sv00000000sd00000000bc06sc00i00" + }, + { + "index": 38, + "attached_to": 0, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 24 + }, + "base_class": { + "name": "Bridge", + "value": 6 + }, + "sub_class": { + "name": "Host bridge", + "value": 0 + }, + "vendor": { + "name": "AMD", + "value": 4130 + }, + "device": { + "value": 5199 + }, + "model": "AMD Host bridge", + "sysfs_id": "/devices/pci0000:00/0000:00:18.7", + "sysfs_bus_id": "0000:00:18.7", + "sysfs_iommu_group_id": 7, + "detail": { + "function": 7, + "command": 0, + "header_type": 0, + "secondary_bus": 0, + "irq": 0, + "prog_if": 0 + }, + "module_alias": "pci:v00001022d0000144Fsv00000000sd00000000bc06sc00i00" + }, + { + "index": 40, + "attached_to": 0, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 8 + }, + "base_class": { + "name": "Bridge", + "value": 6 + }, + "sub_class": { + "name": "PCI bridge", + "value": 4 + }, + "pci_interface": { + "name": "Normal decode", + "value": 0 + }, + "vendor": { + "name": "AMD", + "value": 4130 + }, + "sub_vendor": { + "name": "AMD", + "value": 4130 + }, + "device": { + "value": 5685 + }, + "sub_device": { + "value": 5685 + }, + "model": "AMD PCI bridge", + "sysfs_id": "/devices/pci0000:00/0000:00:08.2", + "sysfs_bus_id": "0000:00:08.2", + "sysfs_iommu_group_id": 5, + "resources": [ + { + "type": "irq", + "base": 42, + "triggered": 0, + "enabled": true + } + ], + "detail": { + "function": 2, + "command": 1031, + "header_type": 1, + "secondary_bus": 5, + "irq": 42, + "prog_if": 0 + }, + "driver": "pcieport", + "drivers": [ + "pcieport" + ], + "module_alias": "pci:v00001022d00001635sv00001022sd00001635bc06sc04i00" + }, + { + "index": 41, + "attached_to": 0, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 24 + }, + "base_class": { + "name": "Bridge", + "value": 6 + }, + "sub_class": { + "name": "Host bridge", + "value": 0 + }, + "vendor": { + "name": "AMD", + "value": 4130 + }, + "device": { + "value": 5197 + }, + "model": "AMD Host bridge", + "sysfs_id": "/devices/pci0000:00/0000:00:18.5", + "sysfs_bus_id": "0000:00:18.5", + "sysfs_iommu_group_id": 7, + "detail": { + "function": 5, + "command": 0, + "header_type": 0, + "secondary_bus": 0, + "irq": 0, + "prog_if": 0 + }, + "module_alias": "pci:v00001022d0000144Dsv00000000sd00000000bc06sc00i00" + } + ], + "camera": [ + { + "index": 47, + "attached_to": 51, + "bus_type": { + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "name": "Camera", + "value": 271 + }, + "vendor": { + "name": "Azurewave", + "value": 5075 + }, + "device": { + "name": "USB2.0 HD UVC WebCam", + "value": 22251 + }, + "revision": { + "name": "19.64", + "value": 0 + }, + "serial": "0x0001", + "model": "Azurewave USB2.0 HD UVC WebCam", + "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:04:00.3/usb1/1-3/1-3:1.2", + "sysfs_bus_id": "1-3:1.2", + "resources": [ + { + "type": "baud", + "speed": 480000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "name": "miscellaneous", + "value": 239 + }, + "device_subclass": { + "name": "comm", + "value": 2 + }, + "device_protocol": 1, + "interface_class": { + "name": "video", + "value": 14 + }, + "interface_subclass": { + "name": "audio", + "value": 1 + }, + "interface_protocol": 1, + "interface_number": 2, + "interface_alternate_setting": 0, + "interface_association": { + "function_class": { + "name": "video", + "value": 14 + }, + "function_subclass": { + "name": "hid", + "value": 3 + }, + "function_protocol": 0, + "interface_count": 2, + "first_interface": 2 + } + }, + "hotplug": "usb", + "driver": "uvcvideo", + "driver_module": "uvcvideo", + "drivers": [ + "uvcvideo" + ], + "driver_modules": [ + "uvcvideo" + ], + "module_alias": "usb:v13D3p56EBd1964dcEFdsc02dp01ic0Eisc01ip01in02" + }, + { + "index": 49, + "attached_to": 51, + "bus_type": { + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "name": "Camera", + "value": 271 + }, + "vendor": { + "name": "Azurewave", + "value": 5075 + }, + "device": { + "name": "USB2.0 HD UVC WebCam", + "value": 22251 + }, + "revision": { + "name": "19.64", + "value": 0 + }, + "serial": "0x0001", + "model": "Azurewave USB2.0 HD UVC WebCam", + "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:04:00.3/usb1/1-3/1-3:1.0", + "sysfs_bus_id": "1-3:1.0", + "resources": [ + { + "type": "baud", + "speed": 480000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "name": "miscellaneous", + "value": 239 + }, + "device_subclass": { + "name": "comm", + "value": 2 + }, + "device_protocol": 1, + "interface_class": { + "name": "video", + "value": 14 + }, + "interface_subclass": { + "name": "audio", + "value": 1 + }, + "interface_protocol": 0, + "interface_number": 0, + "interface_alternate_setting": 0, + "interface_association": { + "function_class": { + "name": "video", + "value": 14 + }, + "function_subclass": { + "name": "hid", + "value": 3 + }, + "function_protocol": 0, + "interface_count": 2, + "first_interface": 0 + } + }, + "hotplug": "usb", + "driver": "uvcvideo", + "driver_module": "uvcvideo", + "drivers": [ + "uvcvideo" + ], + "driver_modules": [ + "uvcvideo" + ], + "module_alias": "usb:v13D3p56EBd1964dcEFdsc02dp01ic0Eisc01ip00in00" + }, + { + "index": 53, + "attached_to": 51, + "bus_type": { + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "name": "Camera", + "value": 271 + }, + "vendor": { + "name": "Azurewave", + "value": 5075 + }, + "device": { + "name": "USB2.0 HD UVC WebCam", + "value": 22251 + }, + "revision": { + "name": "19.64", + "value": 0 + }, + "serial": "0x0001", + "model": "Azurewave USB2.0 HD UVC WebCam", + "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:04:00.3/usb1/1-3/1-3:1.3", + "sysfs_bus_id": "1-3:1.3", + "resources": [ + { + "type": "baud", + "speed": 480000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "name": "miscellaneous", + "value": 239 + }, + "device_subclass": { + "name": "comm", + "value": 2 + }, + "device_protocol": 1, + "interface_class": { + "name": "video", + "value": 14 + }, + "interface_subclass": { + "name": "comm", + "value": 2 + }, + "interface_protocol": 1, + "interface_number": 3, + "interface_alternate_setting": 0, + "interface_association": { + "function_class": { + "name": "video", + "value": 14 + }, + "function_subclass": { + "name": "hid", + "value": 3 + }, + "function_protocol": 0, + "interface_count": 2, + "first_interface": 2 + } + }, + "hotplug": "usb", + "driver": "uvcvideo", + "driver_module": "uvcvideo", + "drivers": [ + "uvcvideo" + ], + "driver_modules": [ + "uvcvideo" + ], + "module_alias": "usb:v13D3p56EBd1964dcEFdsc02dp01ic0Eisc02ip01in03" + }, + { + "index": 55, + "attached_to": 51, + "bus_type": { + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "name": "Camera", + "value": 271 + }, + "vendor": { + "name": "Azurewave", + "value": 5075 + }, + "device": { + "name": "USB2.0 HD UVC WebCam", + "value": 22251 + }, + "revision": { + "name": "19.64", + "value": 0 + }, + "serial": "0x0001", + "model": "Azurewave USB2.0 HD UVC WebCam", + "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:04:00.3/usb1/1-3/1-3:1.1", + "sysfs_bus_id": "1-3:1.1", + "resources": [ + { + "type": "baud", + "speed": 480000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "name": "miscellaneous", + "value": 239 + }, + "device_subclass": { + "name": "comm", + "value": 2 + }, + "device_protocol": 1, + "interface_class": { + "name": "video", + "value": 14 + }, + "interface_subclass": { + "name": "comm", + "value": 2 + }, + "interface_protocol": 0, + "interface_number": 1, + "interface_alternate_setting": 0, + "interface_association": { + "function_class": { + "name": "video", + "value": 14 + }, + "function_subclass": { + "name": "hid", + "value": 3 + }, + "function_protocol": 0, + "interface_count": 2, + "first_interface": 0 + } + }, + "hotplug": "usb", + "driver": "uvcvideo", + "driver_module": "uvcvideo", + "drivers": [ + "uvcvideo" + ], + "driver_modules": [ + "uvcvideo" + ], + "module_alias": "usb:v13D3p56EBd1964dcEFdsc02dp01ic0Eisc02ip00in01" + } + ], + "chip_card": [ + { + "index": 54, + "attached_to": 51, + "bus_type": { + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "name": "Chipcard Reader", + "value": 270 + }, + "vendor": { + "name": "Yubico", + "value": 4176 + }, + "device": { + "name": "YubiKey OTP+FIDO+CCID", + "value": 1031 + }, + "revision": { + "name": "5.43", + "value": 0 + }, + "model": "Yubico YubiKey OTP+FIDO+CCID", + "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:04:00.3/usb1/1-1/1-1:1.2", + "sysfs_bus_id": "1-1:1.2", + "resources": [ + { + "type": "baud", + "speed": 12000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "name": "per_interface", + "value": 0 + }, + "device_subclass": { + "name": "per_interface", + "value": 0 + }, + "device_protocol": 0, + "interface_class": { + "name": "smart_card", + "value": 11 + }, + "interface_subclass": { + "name": "per_interface", + "value": 0 + }, + "interface_protocol": 0, + "interface_number": 2, + "interface_alternate_setting": 0 + }, + "hotplug": "usb", + "driver": "usbfs", + "drivers": [ + "usbfs" + ], + "module_alias": "usb:v1050p0407d0543dc00dsc00dp00ic0Bisc00ip00in02" + } + ], + "cpu": [ + { + "architecture": "x86_64", + "vendor_name": "AuthenticAMD", + "family": 23, + "model": 96, + "stepping": 1, + "features": [ + "fpu", + "vme", + "de", + "pse", + "tsc", + "msr", + "pae", + "mce", + "cx8", + "apic", + "sep", + "mtrr", + "pge", + "mca", + "cmov", + "pat", + "pse36", + "clflush", + "mmx", + "fxsr", + "sse", + "sse2", + "ht", + "syscall", + "nx", + "mmxext", + "fxsr_opt", + "pdpe1gb", + "rdtscp", + "lm", + "constant_tsc", + "rep_good", + "nopl", + "nonstop_tsc", + "cpuid", + "extd_apicid", + "aperfmperf", + "rapl", + "pni", + "pclmulqdq", + "monitor", + "ssse3", + "fma", + "cx16", + "sse4_1", + "sse4_2", + "movbe", + "popcnt", + "aes", + "xsave", + "avx", + "f16c", + "rdrand", + "lahf_lm", + "cmp_legacy", + "svm", + "extapic", + "cr8_legacy", + "abm", + "sse4a", + "misalignsse", + "3dnowprefetch", + "osvw", + "ibs", + "skinit", + "wdt", + "tce", + "topoext", + "perfctr_core", + "perfctr_nb", + "bpext", + "perfctr_llc", + "mwaitx", + "cpb", + "cat_l3", + "cdp_l3", + "hw_pstate", + "ssbd", + "mba", + "ibrs", + "ibpb", + "stibp", + "vmmcall", + "fsgsbase", + "bmi1", + "avx2", + "smep", + "bmi2", + "cqm", + "rdt_a", + "rdseed", + "adx", + "smap", + "clflushopt", + "clwb", + "sha_ni", + "xsaveopt", + "xsavec", + "xgetbv1", + "cqm_llc", + "cqm_occup_llc", + "cqm_mbm_total", + "cqm_mbm_local", + "clzero", + "irperf", + "xsaveerptr", + "rdpru", + "wbnoinvd", + "cppc", + "arat", + "npt", + "lbrv", + "svm_lock", + "nrip_save", + "tsc_scale", + "vmcb_clean", + "flushbyasid", + "decodeassists", + "pausefilter", + "pfthreshold", + "avic", + "v_vmsave_vmload", + "vgif", + "v_spec_ctrl", + "umip", + "rdpid", + "overflow_recov", + "succor", + "smca" + ], + "bugs": [ + "sysret_ss_attrs", + "spectre_v1", + "spectre_v2", + "spec_store_bypass", + "retbleed", + "smt_rsb", + "srso", + "ibpb_no_ret" + ], + "power_management": [ + "ts", + "ttp", + "tm", + "hwpstate", + "cpb", + "eff_freq_ro", + "[13]", + "[14]" + ], + "bogo": 4741.6, + "cache": 512, + "units": 6, + "physical_id": 0, + "siblings": 6, + "cores": 6, + "fpu": true, + "fpu_exception": true, + "cpuid_level": 16, + "write_protect": false, + "tlb_size": 3072, + "clflush_size": 64, + "cache_alignment": 64, + "address_sizes": { + "physical": 48, + "virtual": 48 + } + } + ], + "disk": [ + { + "index": 43, + "attached_to": 10, + "bus_type": { + "name": "NVME", + "value": 150 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "name": "Disk", + "value": 0 + }, + "vendor": { + "value": 9798 + }, + "sub_vendor": { + "value": 9798 + }, + "device": { + "name": "KINGSTON OM8PCP3512F-AB", + "value": 20492 + }, + "sub_device": { + "value": 20492 + }, + "serial": "50026B76838FA975", + "model": "KINGSTON OM8PCP3512F-AB", + "sysfs_id": "/class/block/nvme0n1", + "sysfs_bus_id": "nvme0", + "sysfs_device_link": "/devices/pci0000:00/0000:00:01.3/0000:03:00.0/nvme/nvme0", + "unix_device_name": "/dev/nvme0n1", + "unix_device_number": { + "type": 98, + "major": 259, + "minor": 0, + "range": 0 + }, + "unix_device_names": [ + "/dev/disk/by-diskseq/1", + "/dev/disk/by-id/nvme-KINGSTON_OM8PCP3512F-AB_50026B76838FA975", + "/dev/disk/by-id/nvme-KINGSTON_OM8PCP3512F-AB_50026B76838FA975_1", + "/dev/disk/by-id/nvme-eui.0026b76838fa9755", + "/dev/disk/by-path/pci-0000:03:00.0-nvme-1", + "/dev/nvme0n1" + ], + "rom_id": "0x80", + "resources": [ + { + "type": "disk_geo", + "cylinders": 488386, + "heads": 64, + "sectors": 32, + "size": 0, + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 1000215216, + "value_2": 512 + } + ], + "driver": "nvme", + "driver_module": "nvme", + "drivers": [ + "nvme" + ], + "driver_modules": [ + "nvme" + ] + } + ], + "graphics_card": [ + { + "index": 36, + "attached_to": 26, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 4, + "number": 0 + }, + "base_class": { + "name": "Display controller", + "value": 3 + }, + "sub_class": { + "name": "VGA compatible controller", + "value": 0 + }, + "pci_interface": { + "name": "VGA", + "value": 0 + }, + "vendor": { + "name": "ATI Technologies Inc", + "value": 4098 + }, + "sub_vendor": { + "value": 4163 + }, + "device": { + "value": 5686 + }, + "sub_device": { + "value": 4722 + }, + "revision": { + "value": 195 + }, + "model": "ATI VGA compatible controller", + "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:04:00.0", + "sysfs_bus_id": "0000:04:00.0", + "sysfs_iommu_group_id": 5, + "resources": [ + { + "type": "io", + "base": 61440, + "range": 256, + "enabled": true, + "access": "read_write" + }, + { + "type": "irq", + "base": 53, + "triggered": 0, + "enabled": true + }, + { + "type": "mem", + "base": 3489660928, + "range": 268435456, + "enabled": true, + "access": "read_only", + "prefetch": "no" + }, + { + "type": "mem", + "base": 3758096384, + "range": 2097152, + "enabled": true, + "access": "read_only", + "prefetch": "no" + }, + { + "type": "mem", + "base": 4267704320, + "range": 524288, + "enabled": true, + "access": "read_write", + "prefetch": "no" + } + ], + "detail": { + "function": 0, + "command": 1031, + "header_type": 0, + "secondary_bus": 0, + "irq": 53, + "prog_if": 0 + }, + "driver": "amdgpu", + "driver_module": "amdgpu", + "drivers": [ + "amdgpu" + ], + "driver_modules": [ + "amdgpu" + ], + "module_alias": "pci:v00001002d00001636sv00001043sd00001272bc03sc00i00" + } + ], + "hub": [ + { + "index": 45, + "attached_to": 32, + "bus_type": { + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "name": "Hub", + "value": 266 + }, + "vendor": { + "name": "Linux 6.6.58 xhci-hcd", + "value": 7531 + }, + "device": { + "name": "xHCI Host Controller", + "value": 2 + }, + "revision": { + "name": "6.06", + "value": 0 + }, + "serial": "0000:04:00.4", + "model": "Linux 6.6.58 xhci-hcd xHCI Host Controller", + "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:04:00.4/usb3/3-0:1.0", + "sysfs_bus_id": "3-0:1.0", + "resources": [ + { + "type": "baud", + "speed": 480000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "name": "hub", + "value": 9 + }, + "device_subclass": { + "name": "per_interface", + "value": 0 + }, + "device_protocol": 1, + "interface_class": { + "name": "hub", + "value": 9 + }, + "interface_subclass": { + "name": "per_interface", + "value": 0 + }, + "interface_protocol": 0, + "interface_number": 0, + "interface_alternate_setting": 0 + }, + "hotplug": "usb", + "driver": "hub", + "drivers": [ + "hub" + ], + "module_alias": "usb:v1D6Bp0002d0606dc09dsc00dp01ic09isc00ip00in00" + }, + { + "index": 50, + "attached_to": 32, + "bus_type": { + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "name": "Hub", + "value": 266 + }, + "vendor": { + "name": "Linux 6.6.58 xhci-hcd", + "value": 7531 + }, + "device": { + "name": "xHCI Host Controller", + "value": 3 + }, + "revision": { + "name": "6.06", + "value": 0 + }, + "serial": "0000:04:00.4", + "model": "Linux 6.6.58 xhci-hcd xHCI Host Controller", + "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:04:00.4/usb4/4-0:1.0", + "sysfs_bus_id": "4-0:1.0", + "detail": { + "device_class": { + "name": "hub", + "value": 9 + }, + "device_subclass": { + "name": "per_interface", + "value": 0 + }, + "device_protocol": 3, + "interface_class": { + "name": "hub", + "value": 9 + }, + "interface_subclass": { + "name": "per_interface", + "value": 0 + }, + "interface_protocol": 0, + "interface_number": 0, + "interface_alternate_setting": 0 + }, + "hotplug": "usb", + "driver": "hub", + "drivers": [ + "hub" + ], + "module_alias": "usb:v1D6Bp0003d0606dc09dsc00dp03ic09isc00ip00in00" + }, + { + "index": 51, + "attached_to": 19, + "bus_type": { + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "name": "Hub", + "value": 266 + }, + "vendor": { + "name": "Linux 6.6.58 xhci-hcd", + "value": 7531 + }, + "device": { + "name": "xHCI Host Controller", + "value": 2 + }, + "revision": { + "name": "6.06", + "value": 0 + }, + "serial": "0000:04:00.3", + "model": "Linux 6.6.58 xhci-hcd xHCI Host Controller", + "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:04:00.3/usb1/1-0:1.0", + "sysfs_bus_id": "1-0:1.0", + "resources": [ + { + "type": "baud", + "speed": 480000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "name": "hub", + "value": 9 + }, + "device_subclass": { + "name": "per_interface", + "value": 0 + }, + "device_protocol": 1, + "interface_class": { + "name": "hub", + "value": 9 + }, + "interface_subclass": { + "name": "per_interface", + "value": 0 + }, + "interface_protocol": 0, + "interface_number": 0, + "interface_alternate_setting": 0 + }, + "hotplug": "usb", + "driver": "hub", + "drivers": [ + "hub" + ], + "module_alias": "usb:v1D6Bp0002d0606dc09dsc00dp01ic09isc00ip00in00" + }, + { + "index": 57, + "attached_to": 19, + "bus_type": { + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "name": "Hub", + "value": 266 + }, + "vendor": { + "name": "Linux 6.6.58 xhci-hcd", + "value": 7531 + }, + "device": { + "name": "xHCI Host Controller", + "value": 3 + }, + "revision": { + "name": "6.06", + "value": 0 + }, + "serial": "0000:04:00.3", + "model": "Linux 6.6.58 xhci-hcd xHCI Host Controller", + "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:04:00.3/usb2/2-0:1.0", + "sysfs_bus_id": "2-0:1.0", + "detail": { + "device_class": { + "name": "hub", + "value": 9 + }, + "device_subclass": { + "name": "per_interface", + "value": 0 + }, + "device_protocol": 3, + "interface_class": { + "name": "hub", + "value": 9 + }, + "interface_subclass": { + "name": "per_interface", + "value": 0 + }, + "interface_protocol": 0, + "interface_number": 0, + "interface_alternate_setting": 0 + }, + "hotplug": "usb", + "driver": "hub", + "drivers": [ + "hub" + ], + "module_alias": "usb:v1D6Bp0003d0606dc09dsc00dp03ic09isc00ip00in00" + } + ], + "keyboard": [ + { + "index": 56, + "attached_to": 51, + "bus_type": { + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "name": "Keyboard", + "value": 264 + }, + "sub_class": { + "name": "Keyboard", + "value": 0 + }, + "vendor": { + "name": "Yubico", + "value": 4176 + }, + "device": { + "name": "YubiKey OTP+FIDO+CCID", + "value": 1031 + }, + "revision": { + "name": "5.43", + "value": 0 + }, + "model": "Yubico YubiKey OTP+FIDO+CCID", + "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:04:00.3/usb1/1-1/1-1:1.0", + "sysfs_bus_id": "1-1:1.0", + "unix_device_name": "/dev/input/event1", + "unix_device_number": { + "type": 99, + "major": 13, + "minor": 65, + "range": 1 + }, + "unix_device_names": [ + "/dev/input/by-id/usb-Yubico_YubiKey_OTP+FIDO+CCID-event-kbd", + "/dev/input/by-path/pci-0000:04:00.3-usb-0:1:1.0-event-kbd", + "/dev/input/by-path/pci-0000:04:00.3-usbv2-0:1:1.0-event-kbd", + "/dev/input/event1" + ], + "resources": [ + { + "type": "baud", + "speed": 12000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "name": "per_interface", + "value": 0 + }, + "device_subclass": { + "name": "per_interface", + "value": 0 + }, + "device_protocol": 0, + "interface_class": { + "name": "hid", + "value": 3 + }, + "interface_subclass": { + "name": "audio", + "value": 1 + }, + "interface_protocol": 1, + "interface_number": 0, + "interface_alternate_setting": 0 + }, + "hotplug": "usb", + "driver": "usbhid", + "driver_module": "usbhid", + "drivers": [ + "usbhid" + ], + "driver_modules": [ + "usbhid" + ], + "driver_info": { + "type": "keyboard", + "xkb_rules": "xfree86", + "xkb_model": "pc104" + }, + "module_alias": "usb:v1050p0407d0543dc00dsc00dp00ic03isc01ip01in00" + } + ], + "memory": [ + { + "index": 9, + "attached_to": 0, + "base_class": { + "name": "Internally Used Class", + "value": 257 + }, + "sub_class": { + "name": "Main Memory", + "value": 2 + }, + "model": "Main Memory", + "resources": [ + { + "type": "mem", + "base": 0, + "range": 16159137792, + "enabled": true, + "access": "read_write", + "prefetch": "unknown" + }, + { + "type": "phys_mem", + "range": 16106127360 + } + ] + } + ], + "monitor": [ + { + "index": 42, + "attached_to": 36, + "base_class": { + "name": "Monitor", + "value": 256 + }, + "sub_class": { + "name": "LCD Monitor", + "value": 2 + }, + "vendor": { + "name": "AUO", + "value": 1711 + }, + "device": { + "value": 42127 + }, + "serial": "0", + "model": "AUO LCD Monitor", + "resources": [ + { + "type": "monitor", + "width": 1920, + "height": 1080, + "vertical_frequency": 60, + "interlaced": false + }, + { + "type": "size", + "unit": "mm", + "value_1": 309, + "value_2": 174 + } + ], + "detail": { + "manufacture_year": 2020, + "manufacture_week": 1, + "vertical_sync": { + "min": 0, + "max": 0 + }, + "horizontal_sync": { + "min": 0, + "max": 0 + }, + "horizontal_sync_timings": { + "disp": 1920, + "sync_start": 1936, + "sync_end": 1952, + "total": 2104 + }, + "vertical_sync_timings": { + "disp": 1080, + "sync_start": 1083, + "sync_end": 1097, + "total": 1116 + }, + "clock": 112800, + "width": 1920, + "height": 1080, + "width_millimetres": 309, + "height_millimetres": 174, + "horizontal_flag": 45, + "vertical_flag": 45, + "vendor": "AUO", + "name": "" + } + } + ], + "network_controller": [ + { + "index": 22, + "attached_to": 31, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 1, + "number": 0 + }, + "base_class": { + "name": "Network controller", + "value": 2 + }, + "sub_class": { + "name": "WLAN controller", + "value": 130 + }, + "vendor": { + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "name": "Intel Corporation", + "value": 32902 + }, + "device": { + "value": 10019 + }, + "sub_device": { + "value": 140 + }, + "revision": { + "value": 26 + }, + "model": "Intel WLAN controller", + "sysfs_id": "/devices/pci0000:00/0000:00:01.1/0000:01:00.0", + "sysfs_bus_id": "0000:01:00.0", + "sysfs_iommu_group_id": 8, + "unix_device_name": "wlp1s0", + "unix_device_names": [ + "wlp1s0" + ], + "resources": [ + { + "type": "hwaddr", + "address": 97 + }, + { + "type": "irq", + "base": 82, + "triggered": 0, + "enabled": true + }, + { + "type": "mem", + "base": 4271898624, + "range": 16384, + "enabled": true, + "access": "read_write", + "prefetch": "no" + }, + { + "type": "phwaddr", + "address": 97 + }, + { + "type": "wlan", + "channels": [ + "1", + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10", + "11", + "12", + "13", + "36", + "40", + "44", + "48", + "52", + "56", + "60", + "64", + "100", + "104", + "108", + "112", + "116", + "120", + "124", + "128", + "132", + "136", + "140" + ], + "frequencies": [ + "2.412", + "2.417", + "2.422", + "2.427", + "2.432", + "2.437", + "2.442", + "2.447", + "2.452", + "2.457", + "2.462", + "2.467", + "2.472", + "5.18", + "5.2", + "5.22", + "5.24", + "5.26", + "5.28", + "5.3", + "5.32", + "5.5", + "5.52", + "5.54", + "5.56", + "5.58", + "5.6", + "5.62", + "5.64", + "5.66", + "5.68", + "5.7" + ], + "auth_modes": [ + "open", + "sharedkey", + "wpa-psk", + "wpa-eap" + ], + "enc_modes": [ + "WEP40", + "WEP104", + "TKIP", + "CCMP" + ] + } + ], + "detail": { + "function": 0, + "command": 1030, + "header_type": 0, + "secondary_bus": 0, + "irq": 82, + "prog_if": 0 + }, + "driver": "iwlwifi", + "driver_module": "iwlwifi", + "drivers": [ + "iwlwifi" + ], + "driver_modules": [ + "iwlwifi" + ], + "module_alias": "pci:v00008086d00002723sv00008086sd0000008Cbc02sc80i00" + } + ], + "network_interface": [ + { + "index": 58, + "attached_to": 0, + "base_class": { + "name": "Network Interface", + "value": 263 + }, + "sub_class": { + "name": "Loopback", + "value": 0 + }, + "model": "Loopback network interface", + "sysfs_id": "/class/net/lo", + "unix_device_name": "lo", + "unix_device_names": [ + "lo" + ] + }, + { + "index": 59, + "attached_to": 22, + "base_class": { + "name": "Network Interface", + "value": 263 + }, + "sub_class": { + "name": "Ethernet", + "value": 1 + }, + "model": "Ethernet network interface", + "sysfs_id": "/class/net/wlp1s0", + "sysfs_device_link": "/devices/pci0000:00/0000:00:01.1/0000:01:00.0", + "unix_device_name": "wlp1s0", + "unix_device_names": [ + "wlp1s0" + ], + "resources": [ + { + "type": "hwaddr", + "address": 97 + }, + { + "type": "phwaddr", + "address": 97 + } + ], + "driver": "iwlwifi", + "driver_module": "iwlwifi", + "drivers": [ + "iwlwifi" + ], + "driver_modules": [ + "iwlwifi" + ] + } + ], + "sound": [ + { + "index": 21, + "attached_to": 26, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 4, + "number": 0 + }, + "base_class": { + "name": "Multimedia controller", + "value": 4 + }, + "sub_class": { + "value": 3 + }, + "vendor": { + "name": "ATI Technologies Inc", + "value": 4098 + }, + "sub_vendor": { + "value": 4163 + }, + "device": { + "value": 5687 + }, + "sub_device": { + "value": 7198 + }, + "model": "ATI Multimedia controller", + "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:04:00.1", + "sysfs_bus_id": "0000:04:00.1", + "sysfs_iommu_group_id": 5, + "resources": [ + { + "type": "irq", + "base": 80, + "triggered": 0, + "enabled": true + }, + { + "type": "mem", + "base": 4268523520, + "range": 16384, + "enabled": true, + "access": "read_write", + "prefetch": "no" + } + ], + "detail": { + "function": 1, + "command": 1030, + "header_type": 0, + "secondary_bus": 0, + "irq": 80, + "prog_if": 0 + }, + "driver": "snd_hda_intel", + "driver_module": "snd_hda_intel", + "drivers": [ + "snd_hda_intel" + ], + "driver_modules": [ + "snd_hda_intel" + ], + "module_alias": "pci:v00001002d00001637sv00001043sd00001C1Ebc04sc03i00" + }, + { + "index": 29, + "attached_to": 26, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 4, + "number": 0 + }, + "base_class": { + "name": "Multimedia controller", + "value": 4 + }, + "sub_class": { + "value": 3 + }, + "vendor": { + "name": "AMD", + "value": 4130 + }, + "sub_vendor": { + "value": 4163 + }, + "device": { + "value": 5603 + }, + "sub_device": { + "value": 7198 + }, + "model": "AMD Multimedia controller", + "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:04:00.6", + "sysfs_bus_id": "0000:04:00.6", + "sysfs_iommu_group_id": 5, + "resources": [ + { + "type": "irq", + "base": 81, + "triggered": 0, + "enabled": true + }, + { + "type": "mem", + "base": 4268490752, + "range": 32768, + "enabled": true, + "access": "read_write", + "prefetch": "no" + } + ], + "detail": { + "function": 6, + "command": 1030, + "header_type": 0, + "secondary_bus": 0, + "irq": 81, + "prog_if": 0 + }, + "driver": "snd_hda_intel", + "driver_module": "snd_hda_intel", + "drivers": [ + "snd_hda_intel" + ], + "driver_modules": [ + "snd_hda_intel" + ], + "module_alias": "pci:v00001022d000015E3sv00001043sd00001C1Ebc04sc03i00", + "label": "HD Audio Controller" + } + ], + "storage_controller": [ + { + "index": 10, + "attached_to": 28, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 3, + "number": 0 + }, + "base_class": { + "name": "Mass storage controller", + "value": 1 + }, + "sub_class": { + "value": 8 + }, + "pci_interface": { + "value": 2 + }, + "vendor": { + "value": 9798 + }, + "sub_vendor": { + "value": 9798 + }, + "device": { + "value": 20492 + }, + "sub_device": { + "value": 20492 + }, + "revision": { + "value": 1 + }, + "model": "Mass storage controller", + "sysfs_id": "/devices/pci0000:00/0000:00:01.3/0000:03:00.0", + "sysfs_bus_id": "0000:03:00.0", + "sysfs_iommu_group_id": 10, + "resources": [ + { + "type": "irq", + "base": 24, + "triggered": 0, + "enabled": true + }, + { + "type": "mem", + "base": 4269801472, + "range": 16384, + "enabled": true, + "access": "read_write", + "prefetch": "no" + } + ], + "detail": { + "function": 0, + "command": 1030, + "header_type": 0, + "secondary_bus": 0, + "irq": 24, + "prog_if": 2 + }, + "driver": "nvme", + "driver_module": "nvme", + "drivers": [ + "nvme" + ], + "driver_modules": [ + "nvme" + ], + "module_alias": "pci:v00002646d0000500Csv00002646sd0000500Cbc01sc08i02", + "label": "Onboard LAN Brodcom" + }, + { + "index": 15, + "attached_to": 40, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 5, + "number": 0 + }, + "base_class": { + "name": "Mass storage controller", + "value": 1 + }, + "sub_class": { + "value": 6 + }, + "pci_interface": { + "value": 1 + }, + "vendor": { + "name": "AMD", + "value": 4130 + }, + "sub_vendor": { + "value": 4163 + }, + "device": { + "value": 30977 + }, + "sub_device": { + "value": 4722 + }, + "revision": { + "value": 129 + }, + "model": "AMD Mass storage controller", + "sysfs_id": "/devices/pci0000:00/0000:00:08.2/0000:05:00.1", + "sysfs_bus_id": "0000:05:00.1", + "sysfs_iommu_group_id": 5, + "resources": [ + { + "type": "irq", + "base": 73, + "triggered": 0, + "enabled": true + }, + { + "type": "mem", + "base": 4268752896, + "range": 2048, + "enabled": true, + "access": "read_write", + "prefetch": "no" + } + ], + "detail": { + "function": 1, + "command": 1031, + "header_type": 0, + "secondary_bus": 0, + "irq": 73, + "prog_if": 1 + }, + "driver": "ahci", + "driver_module": "ahci", + "drivers": [ + "ahci" + ], + "driver_modules": [ + "ahci" + ], + "module_alias": "pci:v00001022d00007901sv00001043sd00001272bc01sc06i01" + }, + { + "index": 33, + "attached_to": 40, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 5, + "number": 0 + }, + "base_class": { + "name": "Mass storage controller", + "value": 1 + }, + "sub_class": { + "value": 6 + }, + "pci_interface": { + "value": 1 + }, + "vendor": { + "name": "AMD", + "value": 4130 + }, + "sub_vendor": { + "value": 4163 + }, + "device": { + "value": 30977 + }, + "sub_device": { + "value": 4722 + }, + "revision": { + "value": 129 + }, + "model": "AMD Mass storage controller", + "sysfs_id": "/devices/pci0000:00/0000:00:08.2/0000:05:00.0", + "sysfs_bus_id": "0000:05:00.0", + "sysfs_iommu_group_id": 5, + "resources": [ + { + "type": "irq", + "base": 71, + "triggered": 0, + "enabled": true + }, + { + "type": "mem", + "base": 4268756992, + "range": 2048, + "enabled": true, + "access": "read_write", + "prefetch": "no" + } + ], + "detail": { + "function": 0, + "command": 1031, + "header_type": 0, + "secondary_bus": 0, + "irq": 71, + "prog_if": 1 + }, + "driver": "ahci", + "driver_module": "ahci", + "drivers": [ + "ahci" + ], + "driver_modules": [ + "ahci" + ], + "module_alias": "pci:v00001022d00007901sv00001043sd00001272bc01sc06i01" + } + ], + "system": { + "form_factor": "laptop" + }, + "unknown": [ + { + "index": 14, + "attached_to": 26, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 4, + "number": 0 + }, + "base_class": { + "name": "Multimedia controller", + "value": 4 + }, + "sub_class": { + "name": "Multimedia controller", + "value": 128 + }, + "vendor": { + "name": "AMD", + "value": 4130 + }, + "sub_vendor": { + "value": 4163 + }, + "device": { + "value": 5602 + }, + "sub_device": { + "value": 7198 + }, + "revision": { + "value": 1 + }, + "model": "AMD Multimedia controller", + "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:04:00.5", + "sysfs_bus_id": "0000:04:00.5", + "sysfs_iommu_group_id": 5, + "resources": [ + { + "type": "irq", + "base": 79, + "triggered": 0, + "enabled": true + }, + { + "type": "mem", + "base": 4268228608, + "range": 262144, + "enabled": true, + "access": "read_write", + "prefetch": "no" + } + ], + "detail": { + "function": 5, + "command": 1030, + "header_type": 0, + "secondary_bus": 0, + "irq": 79, + "prog_if": 0 + }, + "driver": "snd_rn_pci_acp3x", + "driver_module": "snd_rn_pci_acp3x", + "drivers": [ + "snd_rn_pci_acp3x" + ], + "driver_modules": [ + "snd_rn_pci_acp3x" + ], + "module_alias": "pci:v00001022d000015E2sv00001043sd00001C1Ebc04sc80i00" + }, + { + "index": 17, + "attached_to": 13, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 2, + "number": 0 + }, + "base_class": { + "name": "Unclassified device", + "value": 255 + }, + "vendor": { + "value": 4332 + }, + "sub_vendor": { + "value": 4163 + }, + "device": { + "value": 21034 + }, + "sub_device": { + "value": 8239 + }, + "revision": { + "value": 1 + }, + "model": "Unclassified device", + "sysfs_id": "/devices/pci0000:00/0000:00:01.2/0000:02:00.0", + "sysfs_bus_id": "0000:02:00.0", + "sysfs_iommu_group_id": 9, + "resources": [ + { + "type": "irq", + "base": 44, + "triggered": 0, + "enabled": true + }, + { + "type": "mem", + "base": 4270850048, + "range": 4096, + "enabled": true, + "access": "read_write", + "prefetch": "no" + } + ], + "detail": { + "function": 0, + "command": 1030, + "header_type": 0, + "secondary_bus": 0, + "irq": 44, + "prog_if": 0 + }, + "driver": "rtsx_pci", + "driver_module": "rtsx_pci", + "drivers": [ + "rtsx_pci" + ], + "driver_modules": [ + "rtsx_pci" + ], + "module_alias": "pci:v000010ECd0000522Asv00001043sd0000202FbcFFsc00i00" + }, + { + "index": 23, + "attached_to": 0, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "name": "Generic system peripheral", + "value": 8 + }, + "sub_class": { + "value": 6 + }, + "vendor": { + "name": "AMD", + "value": 4130 + }, + "sub_vendor": { + "name": "AMD", + "value": 4130 + }, + "device": { + "value": 5681 + }, + "sub_device": { + "value": 5681 + }, + "model": "AMD Generic system peripheral", + "sysfs_id": "/devices/pci0000:00/0000:00:00.2", + "sysfs_bus_id": "0000:00:00.2", + "resources": [ + { + "type": "irq", + "base": 255, + "triggered": 0, + "enabled": true + } + ], + "detail": { + "function": 2, + "command": 4, + "header_type": 0, + "secondary_bus": 0, + "irq": 255, + "prog_if": 0 + }, + "module_alias": "pci:v00001022d00001631sv00001022sd00001631bc08sc06i00" + }, + { + "index": 35, + "attached_to": 26, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 4, + "number": 0 + }, + "base_class": { + "name": "Encryption controller", + "value": 16 + }, + "sub_class": { + "name": "Encryption controller", + "value": 128 + }, + "vendor": { + "name": "AMD", + "value": 4130 + }, + "sub_vendor": { + "name": "AMD", + "value": 4130 + }, + "device": { + "value": 5599 + }, + "sub_device": { + "value": 5599 + }, + "model": "AMD Encryption controller", + "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:04:00.2", + "sysfs_bus_id": "0000:04:00.2", + "sysfs_iommu_group_id": 5, + "resources": [ + { + "type": "irq", + "base": 74, + "triggered": 0, + "enabled": true + }, + { + "type": "mem", + "base": 4266655744, + "range": 1048576, + "enabled": true, + "access": "read_write", + "prefetch": "no" + }, + { + "type": "mem", + "base": 4268539904, + "range": 8192, + "enabled": true, + "access": "read_write", + "prefetch": "no" + } + ], + "detail": { + "function": 2, + "command": 1030, + "header_type": 0, + "secondary_bus": 0, + "irq": 74, + "prog_if": 0 + }, + "driver": "ccp", + "driver_module": "ccp", + "drivers": [ + "ccp" + ], + "driver_modules": [ + "ccp" + ], + "module_alias": "pci:v00001022d000015DFsv00001022sd000015DFbc10sc80i00" + }, + { + "index": 39, + "attached_to": 0, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 20 + }, + "base_class": { + "name": "Serial bus controller", + "value": 12 + }, + "sub_class": { + "name": "SMBus", + "value": 5 + }, + "vendor": { + "name": "AMD", + "value": 4130 + }, + "sub_vendor": { + "value": 4163 + }, + "device": { + "value": 30987 + }, + "sub_device": { + "value": 4722 + }, + "revision": { + "value": 81 + }, + "model": "AMD SMBus", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0", + "sysfs_bus_id": "0000:00:14.0", + "sysfs_iommu_group_id": 6, + "detail": { + "function": 0, + "command": 1027, + "header_type": 0, + "secondary_bus": 0, + "irq": 0, + "prog_if": 0 + }, + "driver": "piix4_smbus", + "driver_module": "i2c_piix4", + "drivers": [ + "piix4_smbus" + ], + "driver_modules": [ + "i2c_piix4" + ], + "module_alias": "pci:v00001022d0000790Bsv00001043sd00001272bc0Csc05i00" + }, + { + "index": 46, + "attached_to": 51, + "bus_type": { + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "name": "Unclassified device", + "value": 0 + }, + "sub_class": { + "name": "Unclassified device", + "value": 0 + }, + "vendor": { + "name": "Azurewave", + "value": 5075 + }, + "device": { + "name": "USB2.0 HD UVC WebCam", + "value": 22251 + }, + "revision": { + "name": "19.64", + "value": 0 + }, + "serial": "0x0001", + "model": "Azurewave USB2.0 HD UVC WebCam", + "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:04:00.3/usb1/1-3/1-3:1.4", + "sysfs_bus_id": "1-3:1.4", + "resources": [ + { + "type": "baud", + "speed": 480000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "name": "miscellaneous", + "value": 239 + }, + "device_subclass": { + "name": "comm", + "value": 2 + }, + "device_protocol": 1, + "interface_class": { + "name": "application", + "value": 254 + }, + "interface_subclass": { + "name": "audio", + "value": 1 + }, + "interface_protocol": 1, + "interface_number": 4, + "interface_alternate_setting": 0, + "interface_association": { + "function_class": { + "name": "application", + "value": 254 + }, + "function_subclass": { + "name": "audio", + "value": 1 + }, + "function_protocol": 0, + "interface_count": 1, + "first_interface": 4 + } + }, + "hotplug": "usb", + "module_alias": "usb:v13D3p56EBd1964dcEFdsc02dp01icFEisc01ip01in04" + }, + { + "index": 48, + "attached_to": 51, + "bus_type": { + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "name": "Unclassified device", + "value": 0 + }, + "sub_class": { + "name": "Unclassified device", + "value": 0 + }, + "vendor": { + "name": "Yubico", + "value": 4176 + }, + "device": { + "name": "YubiKey OTP+FIDO+CCID", + "value": 1031 + }, + "revision": { + "name": "5.43", + "value": 0 + }, + "model": "Yubico YubiKey OTP+FIDO+CCID", + "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:04:00.3/usb1/1-1/1-1:1.1", + "sysfs_bus_id": "1-1:1.1", + "resources": [ + { + "type": "baud", + "speed": 12000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "name": "per_interface", + "value": 0 + }, + "device_subclass": { + "name": "per_interface", + "value": 0 + }, + "device_protocol": 0, + "interface_class": { + "name": "hid", + "value": 3 + }, + "interface_subclass": { + "name": "per_interface", + "value": 0 + }, + "interface_protocol": 0, + "interface_number": 1, + "interface_alternate_setting": 0 + }, + "hotplug": "usb", + "driver": "usbhid", + "driver_module": "usbhid", + "drivers": [ + "usbhid" + ], + "driver_modules": [ + "usbhid" + ], + "module_alias": "usb:v1050p0407d0543dc00dsc00dp00ic03isc00ip00in01" + } + ], + "usb_controller": [ + { + "index": 19, + "attached_to": 26, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 4, + "number": 0 + }, + "base_class": { + "name": "Serial bus controller", + "value": 12 + }, + "sub_class": { + "name": "USB Controller", + "value": 3 + }, + "pci_interface": { + "value": 48 + }, + "vendor": { + "name": "AMD", + "value": 4130 + }, + "sub_vendor": { + "value": 4163 + }, + "device": { + "value": 5689 + }, + "sub_device": { + "value": 4722 + }, + "model": "AMD USB Controller", + "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:04:00.3", + "sysfs_bus_id": "0000:04:00.3", + "sysfs_iommu_group_id": 5, + "resources": [ + { + "type": "irq", + "base": 45, + "triggered": 0, + "enabled": true + }, + { + "type": "mem", + "base": 4265607168, + "range": 1048576, + "enabled": true, + "access": "read_write", + "prefetch": "no" + } + ], + "detail": { + "function": 3, + "command": 1031, + "header_type": 0, + "secondary_bus": 0, + "irq": 45, + "prog_if": 48 + }, + "driver": "xhci_hcd", + "driver_module": "xhci_pci", + "drivers": [ + "xhci_hcd" + ], + "driver_modules": [ + "xhci_pci" + ], + "module_alias": "pci:v00001022d00001639sv00001043sd00001272bc0Csc03i30" + }, + { + "index": 32, + "attached_to": 26, + "bus_type": { + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 4, + "number": 0 + }, + "base_class": { + "name": "Serial bus controller", + "value": 12 + }, + "sub_class": { + "name": "USB Controller", + "value": 3 + }, + "pci_interface": { + "value": 48 + }, + "vendor": { + "name": "AMD", + "value": 4130 + }, + "sub_vendor": { + "value": 4163 + }, + "device": { + "value": 5689 + }, + "sub_device": { + "value": 4722 + }, + "model": "AMD USB Controller", + "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:04:00.4", + "sysfs_bus_id": "0000:04:00.4", + "sysfs_iommu_group_id": 5, + "resources": [ + { + "type": "irq", + "base": 53, + "triggered": 0, + "enabled": true + }, + { + "type": "mem", + "base": 4264558592, + "range": 1048576, + "enabled": true, + "access": "read_write", + "prefetch": "no" + } + ], + "detail": { + "function": 4, + "command": 1031, + "header_type": 0, + "secondary_bus": 0, + "irq": 53, + "prog_if": 48 + }, + "driver": "xhci_hcd", + "driver_module": "xhci_pci", + "drivers": [ + "xhci_hcd" + ], + "driver_modules": [ + "xhci_pci" + ], + "module_alias": "pci:v00001022d00001639sv00001043sd00001272bc0Csc03i30" + } + ] + }, + "smbios": { + "bios": { + "handle": 0, + "vendor": "American Megatrends Inc.", + "version": "UX425IA.307", + "date": "09/16/2020", + "features": [ + "PCI supported", + "BIOS flashable", + "BIOS shadowing allowed", + "CD boot supported", + "Selectable boot supported", + "BIOS ROM socketed", + "EDD spec supported", + "1.2MB Floppy supported", + "720kB Floppy supported", + "2.88MB Floppy supported", + "Print Screen supported", + "8042 Keyboard Services supported", + "Serial Services supported", + "Printer Services supported", + "ACPI supported", + "USB Legacy supported", + "BIOS Boot Spec supported" + ], + "start_address": "0xf0000", + "rom_size": 16777216 + }, + "board": { + "handle": 2, + "manufacturer": "ASUSTeK COMPUTER INC.", + "product": "UX425IA", + "version": "1.0", + "board_type": { + "name": "Motherboard", + "value": 10 + }, + "features": [ + "Hosting Board", + "Replaceable" + ], + "location": "Default string", + "chassis": 3 + }, + "cache": [ + { + "handle": 12, + "socket": "L1 - Cache", + "size_max": 384, + "size_current": 384, + "speed": 1, + "mode": { + "name": "Write Back", + "value": 1 + }, + "enabled": true, + "location": { + "name": "Internal", + "value": 0 + }, + "socketed": false, + "level": 0, + "ecc": { + "name": "Multi-bit", + "value": 6 + }, + "cache_type": { + "name": "Unified", + "value": 5 + }, + "associativity": { + "name": "8-way Set-Associative", + "value": 7 + }, + "sram_type_current": [ + "Pipeline Burst" + ], + "sram_type_supported": [ + "Pipeline Burst" + ] + }, + { + "handle": 13, + "socket": "L2 - Cache", + "size_max": 3072, + "size_current": 3072, + "speed": 1, + "mode": { + "name": "Write Back", + "value": 1 + }, + "enabled": true, + "location": { + "name": "Internal", + "value": 0 + }, + "socketed": false, + "level": 1, + "ecc": { + "name": "Multi-bit", + "value": 6 + }, + "cache_type": { + "name": "Unified", + "value": 5 + }, + "associativity": { + "name": "8-way Set-Associative", + "value": 7 + }, + "sram_type_current": [ + "Pipeline Burst" + ], + "sram_type_supported": [ + "Pipeline Burst" + ] + }, + { + "handle": 14, + "socket": "L3 - Cache", + "size_max": 8192, + "size_current": 8192, + "speed": 1, + "mode": { + "name": "Write Back", + "value": 1 + }, + "enabled": true, + "location": { + "name": "Internal", + "value": 0 + }, + "socketed": false, + "level": 2, + "ecc": { + "name": "Multi-bit", + "value": 6 + }, + "cache_type": { + "name": "Unified", + "value": 5 + }, + "associativity": { + "name": "16-way Set-Associative", + "value": 8 + }, + "sram_type_current": [ + "Pipeline Burst" + ], + "sram_type_supported": [ + "Pipeline Burst" + ] + } + ], + "chassis": { + "handle": 3, + "manufacturer": "ASUSTeK COMPUTER INC.", + "version": "1.0", + "chassis_type": { + "name": "Notebook", + "value": 10 + }, + "lock_present": false, + "bootup_state": { + "name": "Safe", + "value": 3 + }, + "power_state": { + "name": "Safe", + "value": 3 + }, + "thermal_state": { + "name": "Safe", + "value": 3 + }, + "security_state": { + "name": "None", + "value": 3 + }, + "oem": "0x0" + }, + "config": { + "handle": 6, + "options": [ + "Default string" + ] + }, + "language": { + "handle": 51, + "languages": [ + "en|US|iso8859-1" + ] + }, + "memory_array": [ + { + "handle": 10, + "location": { + "name": "Motherboard", + "value": 3 + }, + "usage": { + "name": "System memory", + "value": 3 + }, + "ecc": { + "name": "None", + "value": 3 + }, + "max_size": 33554432, + "error_handle": 9, + "slots": 2 + } + ], + "memory_array_mapped_address": [ + { + "handle": 11, + "array_handle": 10, + "start_address": 0, + "end_address": 17179869184, + "part_width": 2 + } + ], + "memory_device": [ + { + "handle": 17, + "location": "DIMM 0", + "bank_location": "P0 CHANNEL A", + "manufacturer": "Unknown", + "part_number": "K4UBE3D4AA-MGCL", + "array_handle": 10, + "error_handle": 16, + "width": 32, + "ecc_bits": 0, + "size": 8388608, + "form_factor": { + "name": "Other", + "value": 1 + }, + "set": 0, + "memory_type": { + "name": "Other", + "value": 30 + }, + "memory_type_details": [ + "Synchronous" + ], + "speed": 4266 + }, + { + "handle": 20, + "location": "DIMM 0", + "bank_location": "P0 CHANNEL B", + "manufacturer": "Unknown", + "part_number": "K4UBE3D4AA-MGCL", + "array_handle": 10, + "error_handle": 19, + "width": 32, + "ecc_bits": 0, + "size": 8388608, + "form_factor": { + "name": "Other", + "value": 1 + }, + "set": 0, + "memory_type": { + "name": "Other", + "value": 30 + }, + "memory_type_details": [ + "Synchronous" + ], + "speed": 4266 + } + ], + "memory_device_mapped_address": [ + { + "handle": 18, + "memory_device_handle": 17, + "array_map_handle": 11, + "start_address": 0, + "end_address": 17179869184, + "row_position": 255, + "interleave_position": 255, + "interleave_depth": 255 + }, + { + "handle": 21, + "memory_device_handle": 20, + "array_map_handle": 11, + "start_address": 0, + "end_address": 17179869184, + "row_position": 255, + "interleave_position": 255, + "interleave_depth": 255 + } + ], + "memory_error": [ + { + "handle": 9, + "error_type": { + "name": "OK", + "value": 3 + }, + "granularity": { + "name": "Unknown", + "value": 2 + }, + "operation": { + "name": "Unknown", + "value": 2 + }, + "syndrome": 0, + "array_address": 2147483648, + "device_address": 2147483648, + "range": 2147483648 + }, + { + "handle": 16, + "error_type": { + "name": "OK", + "value": 3 + }, + "granularity": { + "name": "Unknown", + "value": 2 + }, + "operation": { + "name": "Unknown", + "value": 2 + }, + "syndrome": 0, + "array_address": 2147483648, + "device_address": 2147483648, + "range": 2147483648 + }, + { + "handle": 19, + "error_type": { + "name": "OK", + "value": 3 + }, + "granularity": { + "name": "Unknown", + "value": 2 + }, + "operation": { + "name": "Unknown", + "value": 2 + }, + "syndrome": 0, + "array_address": 2147483648, + "device_address": 2147483648, + "range": 2147483648 + } + ], + "onboard": [ + { + "handle": 4, + "devices": [ + { + "name": "To Be Filled By O.E.M.", + "type": { + "name": "Video", + "value": 3 + }, + "enabled": true + } + ] + } + ], + "port_connector": [ + { + "handle": 31, + "port_type": { + "name": "Keyboard Port", + "value": 13 + }, + "internal_reference_designator": "J2304/J2300", + "external_connector_type": { + "name": "PS/2", + "value": 15 + }, + "external_reference_designator": "Keyboard" + }, + { + "handle": 32, + "port_type": { + "name": "Mouse Port", + "value": 14 + }, + "internal_reference_designator": "J3811", + "external_connector_type": { + "name": "PS/2", + "value": 15 + }, + "external_reference_designator": "Touch pad" + }, + { + "handle": 33, + "port_type": { + "name": "USB", + "value": 16 + }, + "internal_reference_designator": "J1504", + "external_connector_type": { + "name": "Access Bus [USB]", + "value": 18 + }, + "external_reference_designator": "USB 3.0" + }, + { + "handle": 34, + "port_type": { + "name": "USB", + "value": 16 + }, + "internal_reference_designator": "J1500", + "external_connector_type": { + "name": "Access Bus [USB]", + "value": 18 + }, + "external_reference_designator": "USB 3.1" + }, + { + "handle": 35, + "port_type": { + "name": "USB", + "value": 16 + }, + "internal_reference_designator": "J1502", + "external_connector_type": { + "name": "Access Bus [USB]", + "value": 18 + }, + "external_reference_designator": "USB 3.1" + }, + { + "handle": 36, + "port_type": { + "name": "USB", + "value": 16 + }, + "internal_reference_designator": "J1501", + "external_connector_type": { + "name": "Access Bus [USB]", + "value": 18 + }, + "external_reference_designator": "USB 3.1 Type-C" + }, + { + "handle": 37, + "port_type": { + "name": "USB", + "value": 16 + }, + "internal_reference_designator": "J1503", + "external_connector_type": { + "name": "Access Bus [USB]", + "value": 18 + }, + "external_reference_designator": "USB 3.1 Type-C" + }, + { + "handle": 38, + "port_type": { + "name": "Network Port", + "value": 31 + }, + "internal_reference_designator": "J1300", + "external_connector_type": { + "name": "RJ-45", + "value": 11 + }, + "external_reference_designator": "Network" + }, + { + "handle": 39, + "port_type": { + "name": "Other", + "value": 32 + }, + "internal_connector_type": { + "name": "Other", + "value": 34 + }, + "internal_reference_designator": "J1701", + "external_reference_designator": "Sata HDD" + }, + { + "handle": 40, + "port_type": { + "name": "Other", + "value": 32 + }, + "internal_connector_type": { + "name": "Other", + "value": 34 + }, + "internal_reference_designator": "J1703", + "external_reference_designator": "Sata ODD" + }, + { + "handle": 41, + "port_type": { + "name": "Video Port", + "value": 28 + }, + "internal_reference_designator": "J1101", + "external_reference_designator": "DP0" + }, + { + "handle": 42, + "port_type": { + "name": "Video Port", + "value": 28 + }, + "internal_reference_designator": "J1100", + "external_reference_designator": "DP1" + }, + { + "handle": 43, + "port_type": { + "name": "Audio Port", + "value": 29 + }, + "internal_reference_designator": "J2103", + "external_connector_type": { + "name": "Mini-jack [headphones]", + "value": 31 + }, + "external_reference_designator": "Microphone" + }, + { + "handle": 44, + "port_type": { + "name": "Audio Port", + "value": 29 + }, + "internal_reference_designator": "J2105", + "external_connector_type": { + "name": "Mini-jack [headphones]", + "value": 31 + }, + "external_reference_designator": "Headphone" + } + ], + "processor": [ + { + "handle": 15, + "socket": "FP6", + "socket_type": { + "name": "None", + "value": 6 + }, + "socket_populated": true, + "manufacturer": "Advanced Micro Devices, Inc.", + "version": "AMD Ryzen 5 4500U with Radeon Graphics", + "part": "Unknown", + "processor_type": { + "name": "CPU", + "value": 3 + }, + "processor_family": { + "name": "Other", + "value": 107 + }, + "processor_status": { + "name": "Enabled", + "value": 1 + }, + "clock_ext": 100, + "clock_max": 4000, + "cache_handle_l1": 12, + "cache_handle_l2": 13, + "cache_handle_l3": 14 + } + ], + "slot": [ + { + "handle": 45, + "designation": "J3604", + "slot_type": { + "name": "Other", + "value": 169 + }, + "bus_width": { + "name": "Other", + "value": 11 + }, + "usage": { + "name": "In Use", + "value": 4 + }, + "length": { + "name": "Short", + "value": 3 + }, + "id": 1, + "features": [ + "3.3 V", + "PME#", + "Hot-Plug" + ] + }, + { + "handle": 46, + "designation": "J3711", + "slot_type": { + "name": "Other", + "value": 21 + }, + "bus_width": { + "name": "Other", + "value": 8 + }, + "usage": { + "name": "In Use", + "value": 4 + }, + "length": { + "name": "Short", + "value": 3 + }, + "id": 3, + "features": [ + "3.3 V", + "PME#", + "Hot-Plug" + ] + }, + { + "handle": 47, + "designation": "J3704", + "slot_type": { + "name": "Other", + "value": 23 + }, + "bus_width": { + "name": "Other", + "value": 9 + }, + "usage": { + "name": "Available", + "value": 3 + }, + "length": { + "name": "Short", + "value": 3 + }, + "id": 5, + "features": [ + "3.3 V", + "PME#", + "Hot-Plug" + ] + }, + { + "handle": 48, + "designation": "J3709", + "slot_type": { + "name": "Other", + "value": 21 + }, + "bus_width": { + "name": "Other", + "value": 8 + }, + "usage": { + "name": "Available", + "value": 3 + }, + "length": { + "name": "Short", + "value": 3 + }, + "id": 6, + "features": [ + "3.3 V", + "PME#", + "Hot-Plug" + ] + } + ], + "system": { + "handle": 1, + "manufacturer": "ASUSTeK COMPUTER INC.", + "product": "ZenBook UX425IA_UM425IA", + "version": "1.0", + "wake_up": { + "name": "Power Switch", + "value": 6 + } + } + } +} \ No newline at end of file diff --git a/modules/moritz/profiles/personal_contacts.nix b/modules/moritz/profiles/personal_contacts.nix index e06cfce..92226be 100644 --- a/modules/moritz/profiles/personal_contacts.nix +++ b/modules/moritz/profiles/personal_contacts.nix @@ -47,7 +47,7 @@ in { prompts.password.type = "hidden"; prompts.password.persist = true; share = true; - files.password.owner = "moritz"; + files.password.owner = lib.mkForce "moritz"; }; }; } diff --git a/modules/moritz/profiles/personal_mail.nix b/modules/moritz/profiles/personal_mail.nix index e4afa20..37cc07d 100644 --- a/modules/moritz/profiles/personal_mail.nix +++ b/modules/moritz/profiles/personal_mail.nix @@ -69,7 +69,7 @@ in { prompts.password.type = "hidden"; prompts.password.persist = true; share = true; - files.password.owner = "moritz"; + files.password.owner = lib.mkForce "moritz"; }; }; } From 3470a985377cb3a9be59e9b01dd1d4a539940eab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Sat, 19 Apr 2025 11:55:16 +0200 Subject: [PATCH 02/17] Update secret moritz-laptop-age.key --- sops/secrets/moritz-laptop-age.key/secret | 15 +++++++++++++++ sops/secrets/moritz-laptop-age.key/users/moritz | 1 + 2 files changed, 16 insertions(+) create mode 100644 sops/secrets/moritz-laptop-age.key/secret create mode 120000 sops/secrets/moritz-laptop-age.key/users/moritz diff --git a/sops/secrets/moritz-laptop-age.key/secret b/sops/secrets/moritz-laptop-age.key/secret new file mode 100644 index 0000000..95e375c --- /dev/null +++ b/sops/secrets/moritz-laptop-age.key/secret @@ -0,0 +1,15 @@ +{ + "data": "ENC[AES256_GCM,data:553wV6tWJSDfqRBHRyrj3ZUyJ9h0ocRMEWlubpzHk+QYdKBAdIajVgd5x4tTAoMg19wbmskWeufoUxoKjOZh3XW7Xv857alwX2k=,iv:/VGkG0bEHKIY4xgVitnpAXx2l92Ili3DZvx92sc1WYI=,tag:XSVWHfN8xCvdjbGyK4KdDA==,type:str]", + "sops": { + "age": [ + { + "recipient": "age12jlzcjwwhtgws4ku4nemwknsps3a6um74kdpxfv9pzvgdlhufp8q08c0j7", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBUEtFa214Ylk0OURvZlE5\nays1WENWSFlGRXpINHg0OERTWnE2VkQvTkdBCnl6ZnJCMlB5bDVXODREKzZFNkl6\nQ1M2eFJqMTNYa3MyYTBDRnFSdHQ5ZjgKLS0tIFgwenB5UEZMVGszK3MyODVETGRO\neTg1S001UTJnQk1EUGFzVnFzUWEyVHMKKt/luuV1NSJ2V1FPpdHmyC87Ig8kTAMJ\n4zWyvHEpXYAo2x4eFI14MFIY/6UooDoeJGLg8PrS3bCsgDYbHL/n0Q==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2025-04-19T09:55:16Z", + "mac": "ENC[AES256_GCM,data:2KSB/GAGFqI8qlKC9ZaSxWcEbJPkHIP5kLUbE0TODQ5Qcoat6MKiqhODqSzPpF8YeLN4luX4Y04qRvsGSXzpFHfFjVP5egUcWVnYY379RgtaRH9KuMmB6kGgRoYesoQle/stee95EZzW4Of1oy6mp7zmv325rubFJLyP48nwUy4=,iv:VOYVpLPMVCvU3oMV9Zo/RKs0uk9qeYH1RlG6D65ntxA=,tag:XAq/lsSiinheC4LLK6Wd4A==,type:str]", + "unencrypted_suffix": "_unencrypted", + "version": "3.10.1" + } +} diff --git a/sops/secrets/moritz-laptop-age.key/users/moritz b/sops/secrets/moritz-laptop-age.key/users/moritz new file mode 120000 index 0000000..4c7c349 --- /dev/null +++ b/sops/secrets/moritz-laptop-age.key/users/moritz @@ -0,0 +1 @@ +../../../users/moritz \ No newline at end of file From 51ab6ae76a7f4abc4566d40327fbb3e22a30a4ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Sat, 19 Apr 2025 11:55:17 +0200 Subject: [PATCH 03/17] Add machine moritz-laptop to secrets --- sops/machines/moritz-laptop/key.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100755 sops/machines/moritz-laptop/key.json diff --git a/sops/machines/moritz-laptop/key.json b/sops/machines/moritz-laptop/key.json new file mode 100755 index 0000000..941a9ca --- /dev/null +++ b/sops/machines/moritz-laptop/key.json @@ -0,0 +1,6 @@ +[ + { + "publickey": "age1smgaynkzdfmhg8yymr49l75cax7fzspgppg2dtjadv269j78vsuqdedhmh", + "type": "age" + } +] \ No newline at end of file From f56b321cd31fd10a3c838da7aef529d7f59f57a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Sat, 19 Apr 2025 11:55:21 +0200 Subject: [PATCH 04/17] Add moritz-laptop to secret --- .../api-key/machines/moritz-laptop | 1 + vars/shared/moritz-anthropic/api-key/secret | 15 +++++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) create mode 120000 vars/shared/moritz-anthropic/api-key/machines/moritz-laptop diff --git a/vars/shared/moritz-anthropic/api-key/machines/moritz-laptop b/vars/shared/moritz-anthropic/api-key/machines/moritz-laptop new file mode 120000 index 0000000..8c17ba4 --- /dev/null +++ b/vars/shared/moritz-anthropic/api-key/machines/moritz-laptop @@ -0,0 +1 @@ +../../../../../sops/machines/moritz-laptop \ No newline at end of file diff --git a/vars/shared/moritz-anthropic/api-key/secret b/vars/shared/moritz-anthropic/api-key/secret index 2ef2a66..d6c51e1 100644 --- a/vars/shared/moritz-anthropic/api-key/secret +++ b/vars/shared/moritz-anthropic/api-key/secret @@ -1,24 +1,23 @@ { "data": "ENC[AES256_GCM,data:wpsshBNZjV7/se0EvTjRe2TmqlkIhktPc+kGTMIaqu/jQuDfcX38JL040wOYCM4eTfatcS7T4xvyQkv1XykTVQ8dh56oTJwUjXnO+0yN4UoSPMtYTQVyVNhfPvsxTEpcd8/tCp3jWzKdusc0,iv:NCqF8NUuNnhBLj+hY7zbsLs59ZnLmGop5b3notscTrc=,tag:7IZmP6cWhrfwVpxsfV/dNQ==,type:str]", "sops": { - "kms": null, - "gcp_kms": null, - "azure_kv": null, - "hc_vault": null, "age": [ { "recipient": "age12jlzcjwwhtgws4ku4nemwknsps3a6um74kdpxfv9pzvgdlhufp8q08c0j7", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA4dXRxV0VIK05neGpYTnhN\nMUR4OVZlcXRkYWI2TkY0K1U0eEZKMkpHaFhrCnUrRFFZMEx6bm1oaU5UVXhVc0lO\nWE9UTjZ4UmR5c1c2OWdNVGNMaU83SkEKLS0tIGI1c0pnQkMrbWExdVYzbGdIVThs\nZW9Rb0JwMGsxVE4relRLMU9mbmNtV2sKFCr6ToYy9eDrF6jAQPnxcwQQSb5unEsa\ng5s5Z1aphVvjai3/xxObWpntR8oezagJ0t8Z2j3NJ1KvBK0Xcdbx5g==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBlMTEwY2tpSkxreEY3a3dK\nR2FEZVdUdWEvMW52NUVUQ3cvRHhzVDFsdEdrCnRvMUdqeitMeWxjYXJxaW9DUyto\nNE50dXVZQ1diTDBraXp4dGpaa3U4RkkKLS0tIHA2aElEeFdnblorWWJWRnc1a0Nz\nMmtXYzkvZ2NBbU1wMWYybWg4d2tFc0kK+p5k9hHhOfn8GzOGYzUzc0NDZrZyGahQ\nmNYYhwqjovWGKb3t1whsMi+8ahJ5Fc00B6nyFCPmAdqjOMAYkZfwoQ==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1smgaynkzdfmhg8yymr49l75cax7fzspgppg2dtjadv269j78vsuqdedhmh", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBSZlFnMndsaUhiRExCT0lL\nU3g5RmR3MURKWjBkZW9SSlEwdzdJZTkvb1Y0ClZ4REY4L3p3TzJQVWZLNU5HY3pq\ndTJ6VTJvUHZxeGpJblB1M2lzS3RmMFkKLS0tIDk4Y3AwMGVya3lSQzNjdWZ5MlRR\nUDhBT2ZMWlRjSG9rVUswRm1kbUpleFkKvD4Hq+jE4Njc/ebNpI470UXIh0xgo5Zx\n/OgUuAf+xwOuhvHthRWlHJuyFHsgtFrz7od0tsOYUOWW+0SEzr7LXQ==\n-----END AGE ENCRYPTED FILE-----\n" }, { "recipient": "age13u2jaly7xxpehmh0r9573gzrh5ffcstfx7u7py57lrugm09nxqeqx5w265", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBxeW1Od1ZXQzFuT1MxeHcx\nZVJrV2xFR21qK1NBRDZuZDN3cng1RXhsYlNVCnNkSk52QVR5WGhBR2kwWVlESEp4\ndWo4eUhib3N4MjVKSlFuQmduMDV1V28KLS0tIHBOVDR4eTNydDBkZU5GSCtzdytU\nNEJyMGlwWDUydTlKRjAzMGlxZE8wL1kKSb7QTBSK8MsI2QDBZ9U4a5M6J3NLs5/d\nA64LWJXJUNWWApravqBaTWbv3hCS5RbHRb9kXWVYgULxNtudclzH0A==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBDcG55cXRIMnlWenFya0xU\nZFJQWlcwczl0aHhzbjFNcnAycXc2bFlCdWpJCk5uU08yU0l5cWFiSm50WWlTWFFS\nSWpMWUpLTkZFMnBFbE9YektVcVZISG8KLS0tIE4zUWlsa1Y4Y1BYMXRJT0VmV1RU\nWkR2SmZsOUd2M3lkRmtacm4waFc3NU0K2AIK49WmpGZJYlRpPVlh+niCRScOZqhv\n6Hn2qqedS32UAZn2V023tFaYknYOwNYKh3KvlH5ACsN8w4hQY+J6eg==\n-----END AGE ENCRYPTED FILE-----\n" } ], "lastmodified": "2025-03-30T13:55:55Z", "mac": "ENC[AES256_GCM,data:8p7KLs5rMkKOAKmQ6zjaoarK68XNAQiHY+VJFEMQa6ojTllxdSEr44SH4YC/seUOfCZjvuo8JBV8vtxa28D4ugCkv2LNq8kyCiLjjADwUC5YLRBuW72vAqSdSkDT8V3Ks23Jy80xXVhnYjfylIM0lxvIGKlNIT7xkXDXAEgMTlc=,iv:Jkdz4DQggrolhsrhxD/9edrZERzHzgrp/CZajX9+Kt0=,tag:+nBz0Uj5z1zJg6gTNKFZ6w==,type:str]", - "pgp": null, "unencrypted_suffix": "_unencrypted", "version": "3.9.4" } -} \ No newline at end of file +} From a930b121e0e00c9d85432d91015ad0e24fadfdfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Sat, 19 Apr 2025 11:55:25 +0200 Subject: [PATCH 05/17] Add moritz-laptop to secret --- .../password/machines/moritz-laptop | 1 + vars/shared/moritz-email/password/secret | 19 +++++++++---------- 2 files changed, 10 insertions(+), 10 deletions(-) create mode 120000 vars/shared/moritz-email/password/machines/moritz-laptop diff --git a/vars/shared/moritz-email/password/machines/moritz-laptop b/vars/shared/moritz-email/password/machines/moritz-laptop new file mode 120000 index 0000000..8c17ba4 --- /dev/null +++ b/vars/shared/moritz-email/password/machines/moritz-laptop @@ -0,0 +1 @@ +../../../../../sops/machines/moritz-laptop \ No newline at end of file diff --git a/vars/shared/moritz-email/password/secret b/vars/shared/moritz-email/password/secret index 0fbfc4f..c533452 100644 --- a/vars/shared/moritz-email/password/secret +++ b/vars/shared/moritz-email/password/secret @@ -1,24 +1,23 @@ { "data": "ENC[AES256_GCM,data:ekeDeTfnR+5hWzJ+VwJ32d2wjiTkasgpvy8EMJkrOpk=,iv:wmMprCQDGxGXLx1YeUe8hj72FlfrZQ1aPIfe4NVK2AY=,tag:mJyNudJzD3jFoKl/QQhOWw==,type:str]", "sops": { - "kms": null, - "gcp_kms": null, - "azure_kv": null, - "hc_vault": null, "age": [ { - "recipient": "age12jlzcjwwhtgws4ku4nemwknsps3a6um74kdpxfv9pzvgdlhufp8q08c0j7", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBrek14RER2bngxa0tHT09p\nSnhoa0gwRE9ENXJHVzlNYU9pYVJXZjlzajBZCkd1NkdJVytxTlNCZnhZRUxWWmEv\nbDN0QXd0RkZQWmRQaVZmRG1JWkFhNDgKLS0tIHVBeWJNR016cXR0emdqTmtnTW45\naDBzdjVEdEFlVTNTamJVcXRlVnJPK1UKKq2sq8hrcOw/CDzd7WY/UW7xEdSRX8ZL\nBDhbQxXh7TyCmpKv6UV6/kcPBNAaVUyOX4On7Sxu2x+5EIw3IGMPGg==\n-----END AGE ENCRYPTED FILE-----\n" + "recipient": "age13u2jaly7xxpehmh0r9573gzrh5ffcstfx7u7py57lrugm09nxqeqx5w265", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBVT1dVTk1vZmYwaVcrNHpt\nTlZraEdOYU1HN1lJVnBUZDk1QWtBUjJ6a25zCkdmdWd6RldDejZqRnQwSjIyU2Qw\nQU9QSWJQNnhXbSt5WXBYaTY0bytVK2cKLS0tIFhnSzM2eVV5WWV5RUpjZHBkdWZK\nVzN6WUxSeWtDbjl0dlBJS0lMNCtDZTAKHzS/xYiCxD0zwFld6ii/3c+USs64MlVp\nOSi/LmPirSD7TSrU2E/iynXoH+crn44G+klvoODS2Si84RR6HqzG0w==\n-----END AGE ENCRYPTED FILE-----\n" }, { - "recipient": "age13u2jaly7xxpehmh0r9573gzrh5ffcstfx7u7py57lrugm09nxqeqx5w265", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB3eFhoWkhPTnAxaGl5dU1Z\naHcxNUxJRUdUWDE4cGNIeWxhZGJrVFhEWlFJCllqY0dpSFNzQUsrby9HWEZkM2Y0\nVnI5bXk0MFJJaHZkWXVRTlBJQjREemMKLS0tIHZoc2k4ZDBVQTJBc0w4UUFQaEVW\nR0Ntd3RMZzdHU3c5VTNYSFA4cGdseGMKlpV1zErv0/Vm/fZ6/fi7KmpljsGxzHr1\n1Oj7xR5WWAcW3h9fbHSOIdWHlgPrar6E4iQ7oRA1tre1fMMRFO/QXw==\n-----END AGE ENCRYPTED FILE-----\n" + "recipient": "age12jlzcjwwhtgws4ku4nemwknsps3a6um74kdpxfv9pzvgdlhufp8q08c0j7", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLN1A1ZGhvcUJwWEtpaCtH\ncEhSMkFTWnhKRjZndVdoajJwTXVnN3ZZMUhVCjNuMXFJaVNONjg3a1NwS0ltWXI4\nbUR0OGptdTEvWmZYR2p4Zzl0NDFwdUEKLS0tIDAvN0RpUFgzTElEalVsSmhheENO\nRVhqWTRleUxrNzAzMDRkVUNVQkZWKzAK9hD39NOdHZCBs3ZM35q6rFFmIPpGotcc\nc5r4JukhbqEOBid9rwd/0hB6b3yedEXYE5Sua9uCg5NkC4yQq8khBg==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1smgaynkzdfmhg8yymr49l75cax7fzspgppg2dtjadv269j78vsuqdedhmh", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB0UGJuYWtVR0JSSGl4RHVL\nRkRReDhVSjZtUGpmWHV3UzhhWTk2alFLMlZVCkw2STY2N0dxbUV1TXcrVkhCVFBG\nRDRrWjAxYUUyL0ltTXlMR0lGUDhDa0EKLS0tIHFKWFlUdDBEVXZtV0ErOWR5WFVt\nZHhldC9KSmtacW45bmZwT3JrczBYT2cKXvmlxZ3hJeSCO3kyvqR204wWY0WG3+t8\n6CTfehlsCj60l3cQsJjyQ6DRJm8O66lsKyOw7zPzja3Tt1yQyQVHFg==\n-----END AGE ENCRYPTED FILE-----\n" } ], "lastmodified": "2025-03-30T13:56:27Z", "mac": "ENC[AES256_GCM,data:YtTyMg5pp86ikvIM2ivhbzFrIb2p0AISYol117toZzQ5pGSQeEGuLVt9lvQbHdsOayoPbg5BC8cMW5H5fYat8bx0wQu85fBxCxpQNF5EuIvr97ox9LUKRxjjmdh+Ph6kdNtw89OLRKl9GrMnvyHSA1F2uDdMj2gUHpHetjasX1E=,iv:wPqMzgrUM8mTzphtSCZajKOrjoO9Zaaimi8QPnHtj00=,tag:D6tBqkmmNOlhU5N45xK5JQ==,type:str]", - "pgp": null, "unencrypted_suffix": "_unencrypted", "version": "3.9.4" } -} \ No newline at end of file +} From 63f8ee82f49f630706020c244b425758927bccef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Sat, 19 Apr 2025 11:55:29 +0200 Subject: [PATCH 06/17] Add moritz-laptop to secret --- .../api-key/machines/moritz-laptop | 1 + vars/shared/moritz-openai/api-key/secret | 19 +++++++++---------- 2 files changed, 10 insertions(+), 10 deletions(-) create mode 120000 vars/shared/moritz-openai/api-key/machines/moritz-laptop diff --git a/vars/shared/moritz-openai/api-key/machines/moritz-laptop b/vars/shared/moritz-openai/api-key/machines/moritz-laptop new file mode 120000 index 0000000..8c17ba4 --- /dev/null +++ b/vars/shared/moritz-openai/api-key/machines/moritz-laptop @@ -0,0 +1 @@ +../../../../../sops/machines/moritz-laptop \ No newline at end of file diff --git a/vars/shared/moritz-openai/api-key/secret b/vars/shared/moritz-openai/api-key/secret index 6a70619..8e09e09 100644 --- a/vars/shared/moritz-openai/api-key/secret +++ b/vars/shared/moritz-openai/api-key/secret @@ -1,24 +1,23 @@ { "data": "ENC[AES256_GCM,data:V8oXaA/df8rrJm5lM0QBNHSphRh6o/7ezPxPyaStLfEeXDHWrE+I/3Obzj/t8uP+d0tcA1QYlvJmGZo4eQT5c9lNdQJemxBG3joV5Hiu+CWbaL+7ogK6QOeaybpn6wiFoRFENuimnDVoP89nKYPPxHyO22xIBPxWUFB1AkMBAGQeJg3fxMAtcpEhWo3dQE3Qt2e6BwrVnOv9R+89s/sWjAmBjf8=,iv:01SFpB+P1q4kHn8uUyA/3Ih9xfpk6CQvqgIJfMtds18=,tag:PUWukTGby3O8FPsczoNA6A==,type:str]", "sops": { - "kms": null, - "gcp_kms": null, - "azure_kv": null, - "hc_vault": null, "age": [ { - "recipient": "age12jlzcjwwhtgws4ku4nemwknsps3a6um74kdpxfv9pzvgdlhufp8q08c0j7", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB3QTVDNWQ2UDRONVBwMlNl\nc2ttZ0MydkhMTXRrOFZXTmt0NlBaUys2Y2lvCnRtRDBEbG84VnZmQ2NBT0R3Wmpr\naGR0YTVjd0VWRm9ranlsZmRJalA1SWcKLS0tIGhFalV6Q2NGRkk1T3RNMnFSRGNQ\nWlFPR01OQlROT2k4RDVOc3BHazdsVUUKS9hSuUXJFxSTT6Sx/HwWbeplXvdxe2BC\nuK7pHFBFZpip98Fcc7SUoRfwb5kPciRLQ1nWf+DLwPbZEfRPbIJ4JA==\n-----END AGE ENCRYPTED FILE-----\n" + "recipient": "age13u2jaly7xxpehmh0r9573gzrh5ffcstfx7u7py57lrugm09nxqeqx5w265", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBQRThST01OTk0zUmwrY2ow\nN3JvQ1J5K1E1RDlnNVZ1YUQ4cndnV3laYkdnClQ3bUZOMHFuNUNMR041UHFEdHI2\nZ3AzMWlIbEgrZ094NllPOWRoaDdNSE0KLS0tIGtRQUFlbkRGZ0swOEhjdXNXTzBa\na3pwSktEQVFJK3BqM2FTRnUzamxSRmMKO/RDh75euLBXFAfH4096VNT7RU42ayrA\n79sh277aKv7NRIOEh0xHksPt+nlBwpMMpvLOtLPQDw1bWbFPZM6Mrg==\n-----END AGE ENCRYPTED FILE-----\n" }, { - "recipient": "age13u2jaly7xxpehmh0r9573gzrh5ffcstfx7u7py57lrugm09nxqeqx5w265", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBqeE4wc3Jsd0FSYmdNdU9J\nRG8wNGI1SnNXRWoxK3RGNmZsREFGNCtIOVZFCmxFem9qS09jSlEzNkY0TTFROWFz\nUjczcm1ING5nQUpLdDgrbkRjKzlRZ1EKLS0tIDQ0cys3MkFCNy9pWlF0U09mdUsv\nVnFoSUFCU0hxaUNVRWxkOUh3aHZ2VHMKJwoayLfZyTaB5ttt1K/RtFpZidhfLCxa\nH/QmEYYHRMsRClUtjWhgEnOb+7CxwjUN8CV1/BjiB3BynfItEMmhNg==\n-----END AGE ENCRYPTED FILE-----\n" + "recipient": "age12jlzcjwwhtgws4ku4nemwknsps3a6um74kdpxfv9pzvgdlhufp8q08c0j7", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBXNWV4aERBbERMbFVlQ1FL\nV1hJNHF1Z3JZeGZpbjluUnBXdVpOUnh2TG40CmJWQ1FGTUdnSGw4YWVRY0Y4Nms2\nNiszbnlzSzBBZjhIZ2dCRG1kODNrdzgKLS0tIEtuM2VTU05pMkxXM2Y4NkdrMXQz\nSWF2aXV6UkNidXFBYzhOajlCcHlkeVEKDxHFjzumtXqBdzxGfv/VsNxoH99ghQzF\n3nmzz0wub3N+tj7Qj+vJtkxOg++4b9jc25VkaD477x2I7pqXUVPsTA==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1smgaynkzdfmhg8yymr49l75cax7fzspgppg2dtjadv269j78vsuqdedhmh", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBsLzlETWlxa2VjQmRrOVpC\nMmd5YVVoOXVFV2crZFpKeG1zSzgyMzEvTjFNClQyU3lHLzVrWlordXhXSnlpdk4z\nYUxnNnErRmtueEJ5K1M1R2x2OXhCbXcKLS0tIFdQNXdnTlBrTXMxRG5lM2t1YU5r\nMWFucVRJd1AxYUZsa08wNVUyZ2JtcEkKxYca4AsIL6S4RpCM3E49xOfBAdXbS/kB\nVkLy38qnxNoVZmjyP2rleaWBoOaDgBtTA2nIZEv27jLlqq7WSHSiPg==\n-----END AGE ENCRYPTED FILE-----\n" } ], "lastmodified": "2025-03-30T13:56:47Z", "mac": "ENC[AES256_GCM,data:hSVqJE9K16BhrXhL7W9JdHBNPcg+oWRD4C4791zDie77XhGt7EoppWQ+u1nhT3gHEaCqr9D+WOpPhvEzbgAHspqIoAdPJwvUpaWZOoGDzsirnrH97t4PC6P2Bp9QtIJ+xpRIwlKxqeGnFCfuNRuQFhkxtqljt60CdQs2+4+mbCs=,iv:sEff+fczI2BsArRTlw6h8mQwkC0jor+hbWFA3Ol7dRI=,tag:nPvVI592gZTEFCTvZg46uQ==,type:str]", - "pgp": null, "unencrypted_suffix": "_unencrypted", "version": "3.9.4" } -} \ No newline at end of file +} From 1dd17fbbc097d2885b35ece912a090622067db57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Sat, 19 Apr 2025 11:55:32 +0200 Subject: [PATCH 07/17] Add moritz-laptop to secret --- .../password/machines/moritz-laptop | 1 + vars/shared/moritz-openconnect/password/secret | 15 +++++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) create mode 120000 vars/shared/moritz-openconnect/password/machines/moritz-laptop diff --git a/vars/shared/moritz-openconnect/password/machines/moritz-laptop b/vars/shared/moritz-openconnect/password/machines/moritz-laptop new file mode 120000 index 0000000..8c17ba4 --- /dev/null +++ b/vars/shared/moritz-openconnect/password/machines/moritz-laptop @@ -0,0 +1 @@ +../../../../../sops/machines/moritz-laptop \ No newline at end of file diff --git a/vars/shared/moritz-openconnect/password/secret b/vars/shared/moritz-openconnect/password/secret index 128af65..b1b00b1 100644 --- a/vars/shared/moritz-openconnect/password/secret +++ b/vars/shared/moritz-openconnect/password/secret @@ -1,24 +1,23 @@ { "data": "ENC[AES256_GCM,data:/MVGIg1frJxIQoTEtLYzXCuX+jK5w3P8AV37zTO6vSdfqD+SUrJGVccx40GpP+KSaQ==,iv:OLhclvcp9Q4P1hZM3Pu4yQNz3UBAuEyCS34PIFpAgR8=,tag:wJQtZjJBVo2BWEZWaUbUzA==,type:str]", "sops": { - "kms": null, - "gcp_kms": null, - "azure_kv": null, - "hc_vault": null, "age": [ { "recipient": "age12jlzcjwwhtgws4ku4nemwknsps3a6um74kdpxfv9pzvgdlhufp8q08c0j7", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCcDcrcHA4TndoaGNYT0lt\nZGU0YUtRbDlDR0kyTUhiMU5kTTkrUldFUEVrCjdEcm41OXdqOExBd3NpaFliT010\nOEl0MTk3bHlYLzcxNzE2cWduTFNPckUKLS0tIHNxT2VRZ3RrK1VKdCt6UkxYU3R2\nOGZES1Eya3BEeExkV25rT0pjdVpaTm8KyyZ5+FOByI2TFs8hUMS8bhsUemdFTd6a\nwq9WOzPwxj7RDYHMJ+P25KLC6vqLs0fdcqd1uSFqJ6zKxMNQPyFDnw==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBqOXZYbnl2eFVrWFpaSTNa\nV1pXb1lEVFk5Zkl5VVdFTXA4WUVweUpOTjI4Ckh3akROY05Yak5ZQ2dCNERRcUN1\nNGpRdGJXU2hoM0FVdFQ4YktzSjRzOTQKLS0tIElzODVpU3g1U2s2b1ZLUDg1cjlC\na0Q5bjFPc2tpbkZibDhwSWw3SzlScTgKe3CNGfWJerptKFdwTNsOigjpTIxz3ZO3\nPErjF97FubIc0yok/QdHFs/i73Ut7UNoH5urxqZKBDFrt5NFa/uLLw==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1smgaynkzdfmhg8yymr49l75cax7fzspgppg2dtjadv269j78vsuqdedhmh", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA2cVM3STBNa1NhNTEzUUd4\nK0h1dXhQMHBJWVNEWWlHYTdObE9ZZit1Q3g4CkdncG5xSjZDLzU4NkhXdDd4Zkx5\nMGh2RDFMMWFucHhtbDlqVjBRTTN4TTAKLS0tIGt5SFhaUWVSSkJNc2ZGODlGUkQw\nRXBzR050T0psUjBIYWVpTm1vMHJBRzAKfPF/YzddzaTMsfSG7ScZSzenjwyxb8BU\nefZ4m7bIUl3co6/3002LENV6MFJiac9YBzd6xJwqBOZ7I8HWvK1RHg==\n-----END AGE ENCRYPTED FILE-----\n" }, { "recipient": "age13u2jaly7xxpehmh0r9573gzrh5ffcstfx7u7py57lrugm09nxqeqx5w265", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2VnlhUVBxN2lwNDc3elhM\ndjF6Zm0vSU9jN2RudXZvUjE5L2ovTHl5MTFrClh6ZlBtc2tBbjNrcDgrWXAxQVBB\nYy96NDVFbktFQ09JdDZrMjlmemJzbzAKLS0tIEVFM3p6THdJMzRzcFRsZGhjUzJk\nTUZZNkRUZEg2ais3SDBycnJlS245ZVEKMEC9TcYM4C06ycEE76CD7V1I9BJMqeqi\nNdiZwqfEwS/DbAGDmPAnLX8exue1rHdaN3xEXR1im56xKVcZoiZBLg==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB4djVuUFhlYng5L3kzZXVN\nSHkyZ00ySHlJZVNhekRhTG1mNUJOVlpuNm1zCjFybllJNk1FbXREZDVpU0xJSnZp\nQ29hazVkQWxFb01JWm5KYkF2ajdocVEKLS0tIEVqYjlmREptMkNLT0lhM3p1bkZy\nZmd3OU1YOTUreDBWNTFSTitQdUxVS1kKGN3PUbp1b+PvEOB6WjcHXqKsy7lZN2s0\nJ3Va5zMu5F1zC77vJDT17FEZ5S4VtVXosmOdOxlpDH2CxU9UyBzolQ==\n-----END AGE ENCRYPTED FILE-----\n" } ], "lastmodified": "2025-03-30T14:04:14Z", "mac": "ENC[AES256_GCM,data:pYzz5BZQu+zXK2olJp9j2HpZXGd9tAA4G6uVCu88dlM08ysOxo86cbRS2yOU0ttEG2GPi5227vkVQtFYVfb2RZ4PhWwoFRhyQI86oqoIPeK9GcvSdIRXINrNgcIQpIpCg/LNzdBH3PRCAlrY4YPT9+qejnmov64TQOIdF1+xan4=,iv:PZ1DLgoNhL8yAcTlxTg0tuBUQ3EWwMuJDWVwC8nxLZc=,tag:EPCPqcXoM6WruOsnd425Cg==,type:str]", - "pgp": null, "unencrypted_suffix": "_unencrypted", "version": "3.9.4" } -} \ No newline at end of file +} From 001b6a6327f6dc59bb4fa57cad93f9b426b0c6a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Sat, 19 Apr 2025 11:55:36 +0200 Subject: [PATCH 08/17] Add moritz-laptop to secret --- .../preshared-key/machines/moritz-laptop | 1 + .../moritz-wireguard/preshared-key/secret | 19 +++++++++---------- 2 files changed, 10 insertions(+), 10 deletions(-) create mode 120000 vars/shared/moritz-wireguard/preshared-key/machines/moritz-laptop diff --git a/vars/shared/moritz-wireguard/preshared-key/machines/moritz-laptop b/vars/shared/moritz-wireguard/preshared-key/machines/moritz-laptop new file mode 120000 index 0000000..8c17ba4 --- /dev/null +++ b/vars/shared/moritz-wireguard/preshared-key/machines/moritz-laptop @@ -0,0 +1 @@ +../../../../../sops/machines/moritz-laptop \ No newline at end of file diff --git a/vars/shared/moritz-wireguard/preshared-key/secret b/vars/shared/moritz-wireguard/preshared-key/secret index 329e7d3..26472a6 100644 --- a/vars/shared/moritz-wireguard/preshared-key/secret +++ b/vars/shared/moritz-wireguard/preshared-key/secret @@ -1,24 +1,23 @@ { "data": "ENC[AES256_GCM,data:5TY3YhsCVOfOCZRDRC11Fn26hFDDnj8SGDDKvpHLfhGPZ3jvXTQkTJ7Irt8=,iv:vCZJsKg5xfxwWS5N12BjmqP2UU/HcpXDVFmN8VWidn0=,tag:pgsmygwbTzfxYIk7wyIeFQ==,type:str]", "sops": { - "kms": null, - "gcp_kms": null, - "azure_kv": null, - "hc_vault": null, "age": [ { - "recipient": "age12jlzcjwwhtgws4ku4nemwknsps3a6um74kdpxfv9pzvgdlhufp8q08c0j7", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLRGlLOThIMEc5SzhHNERo\nV29iYy9Xa0g1NUNRd1JDNlJLQ3ZSc0E3K2prClJncCtrc1RDbFpLZEc4S0E1UWgy\nVzJqRGhmT1YxQ2hsTzlpVEU0WTZjWmsKLS0tIGh0WHBIRkc5L0xlSGp1Yzg1bEcy\nc09DbUdsRG1TaEF5QUFxMWpPRERneUEK87OFG8LoIU1bquvoM/wz5GCsXTDed94C\n0jn6QVcoAxhrfaMfkj6VH6lLRNDDtDXPlX39B7iuqI+tP9MUiCwmig==\n-----END AGE ENCRYPTED FILE-----\n" + "recipient": "age13u2jaly7xxpehmh0r9573gzrh5ffcstfx7u7py57lrugm09nxqeqx5w265", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBISlg2cFo2c3VxMWdhWEdx\nZWluVlBOaG5HUDQyRHU5dWd4aWh5U2pzZlJzCjBOTE1TWkhRRnlxM3dSNDQzVGxZ\nN09qUy93cVdkRjY3cm5yNzNhV3hZR3MKLS0tIGUySDNNQ0N4SHVEV3M2dS9IaU4v\nR3Zxdy9oRjMzL1ZMenBUN0FrcDI3QlEK/gHDNzEX75r76RJFXp/DyTJV432//3ky\nYrIg4cWh+KjELo9l8OdCalO/5UmVOqQbjpjCZdhOatPNij5/1xqtqQ==\n-----END AGE ENCRYPTED FILE-----\n" }, { - "recipient": "age13u2jaly7xxpehmh0r9573gzrh5ffcstfx7u7py57lrugm09nxqeqx5w265", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAreWg0SVVEVTZFMkk1RjNS\nU3c0aGhyZ1F6OURHNzZRVGQ5OEJNdWdyZW5ZCkZWZS9YcTRGV1Z4ZTEyc1lTancz\ndkU1VlhMM2RNSW94Sy9jK1NMbHNLMTgKLS0tIFZmUjdyL3VndlM4TDJpVUhzdVR1\nRUpQUUx1Zm5nVTFxTDB2bkVpaSt4T28KMZXB9yyzePiC5NvcamCCZwqSdihAAaIE\nvKRNm1cEZBifpcHihitQln36iWbFqN3HDky19uFPBvN4pl7PKNI6Bw==\n-----END AGE ENCRYPTED FILE-----\n" + "recipient": "age12jlzcjwwhtgws4ku4nemwknsps3a6um74kdpxfv9pzvgdlhufp8q08c0j7", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBQUis2enVuOVUySmZBSUx4\nYUpZcm50VlZGRkVDYkxKaTRhT0pTUFVramtjCitHV2Zld0tSVFNQSkcwanhLam9N\ncVNpTUtIM3Yzd1ByTzVvM1pOQkgzOG8KLS0tIHFaOFVHcUlESmRvb0s1TUFpSEJn\nL05RUTM3WnFSaTJVV2tEV3o4Q3dBbGMKX6GBLMQETWbVbwgVYz+u6k1H9jAIBZZ/\njWDzZ7kc0gBfhwb8YWdO9xGfI16ulx83Eg4QbzzKcxytouuQn70wAQ==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1smgaynkzdfmhg8yymr49l75cax7fzspgppg2dtjadv269j78vsuqdedhmh", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjb1JNZEx0b0JWZWlOQU0v\ndjNTWUNhTXFHT1ZGVDIrV1VoY0tGeVlsOG04CnNMZ2RTSklFWWdzdEZtSHl4TFlQ\nREtKbjdSM0I5T0phV1ZYWGM0aEl5R2MKLS0tIFVzb1RuYzhsQ2pXTk9BVTlXMHpi\nZXNRMW8xUm54em40aUFXSWJIQVJ2OUEKN+vYHEPhrin066NojUmwZJhIaIw0MLRs\nIyfXJ0y7X5IB7iN1YV4Z9Rmn1VFP35iYdaQaTyspoU63MIpRkwx5oA==\n-----END AGE ENCRYPTED FILE-----\n" } ], "lastmodified": "2025-03-30T13:58:43Z", "mac": "ENC[AES256_GCM,data:GmH/cw//gfbzVfe91v/1CBs7eH3ui0EpI3HzeEspzZUL0WWob44T3DxeRPfIKPAmehV0MPjMQqWzPE/ZfVOm77lBpBxOjs/ejlvL+pnlSt0cRaYSfb0dcv6cTC9QXPyCmEkguHp0nL0x46UQidwWpVBpA2I8Uwxar7xzh6b7hv0=,iv:ediYZeREicKfr42gxVdJE/GGz+s0pRtGeX2dYFjUJlg=,tag:RMMhIurnYreU27iYNX3lUw==,type:str]", - "pgp": null, "unencrypted_suffix": "_unencrypted", "version": "3.9.4" } -} \ No newline at end of file +} From a48c0c3dde116bdc026941dedab0f4f6a805b534 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Sat, 19 Apr 2025 11:55:39 +0200 Subject: [PATCH 09/17] Add moritz-laptop to secret --- .../private-key/machines/moritz-laptop | 1 + .../moritz-wireguard/private-key/secret | 19 +++++++++---------- 2 files changed, 10 insertions(+), 10 deletions(-) create mode 120000 vars/shared/moritz-wireguard/private-key/machines/moritz-laptop diff --git a/vars/shared/moritz-wireguard/private-key/machines/moritz-laptop b/vars/shared/moritz-wireguard/private-key/machines/moritz-laptop new file mode 120000 index 0000000..8c17ba4 --- /dev/null +++ b/vars/shared/moritz-wireguard/private-key/machines/moritz-laptop @@ -0,0 +1 @@ +../../../../../sops/machines/moritz-laptop \ No newline at end of file diff --git a/vars/shared/moritz-wireguard/private-key/secret b/vars/shared/moritz-wireguard/private-key/secret index 960ed00..5f7924c 100644 --- a/vars/shared/moritz-wireguard/private-key/secret +++ b/vars/shared/moritz-wireguard/private-key/secret @@ -1,24 +1,23 @@ { "data": "ENC[AES256_GCM,data:AL/UzwRC9DQr20NZ+Rg0Dz1nIqA5UOig07wRqHyHrJ7UETLHCYblo6S1R7o=,iv:O3tpCTiVQN6C+h+CDFIKq5PcI2cT4DjydRKy+XSQfPA=,tag:3Z5R7Vj0YUER5HFJPmG8uw==,type:str]", "sops": { - "kms": null, - "gcp_kms": null, - "azure_kv": null, - "hc_vault": null, "age": [ { - "recipient": "age12jlzcjwwhtgws4ku4nemwknsps3a6um74kdpxfv9pzvgdlhufp8q08c0j7", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2SHpST0wyNEtiL0pkQ1RD\nVEkvV0tZSFMrWmNFSWtrejRvUE1WZksrTWowCmxvSUNrcWRuTDJ6TFg4Zzc0Vkww\nMVdUM2hUZE9ReElsRmVsaWZyS3JWYzQKLS0tIEhNa2JYUGFEcXJFdi9JN0tzanBL\nbGUrU3lvdk1kTEdUUnVadDVzbTloVTAKMebVSVUxE2WQO+CQqT4zZ5yOl6lGvryy\nPGvpj6OpUWvBlAD8Pig9YjY9ZyzK9mwNv8hHb/5rAxG+gszm7wMV/w==\n-----END AGE ENCRYPTED FILE-----\n" + "recipient": "age13u2jaly7xxpehmh0r9573gzrh5ffcstfx7u7py57lrugm09nxqeqx5w265", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBMS3JKc1ZUYkY4ZkFUT1c2\nUkVab2tJQU9tOGl3dklBVVNEb2J5MlNSVlJzCjQwVFhEYTJFbTAvNXA0TURxbWxv\nY3B4Y0dBdzlhUC9SZG0wRGI1c2Jva0UKLS0tIDdXOVBjM05TZjg1bUEvNUsrNE04\nQlhjUzhrcUEzUWVLNVQ5NExra0FQeUEKFsvfO+Wi6MX3Jw2IoJDb+yxhFxyG5qQL\n5TEiA6W+tCgd5cW3fwYq4EFapoJcE/UOJYElGZKA/KFHCHZ8Bs4g4g==\n-----END AGE ENCRYPTED FILE-----\n" }, { - "recipient": "age13u2jaly7xxpehmh0r9573gzrh5ffcstfx7u7py57lrugm09nxqeqx5w265", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxT2Zoc29WRGcxY1FqRVVX\naWsxSDRXQytjSTk2UDlYUDhIZENMM1hZbTNZCkZrSjVNb210dHdQMFJIOXZQY3Mr\nV0lyRjFuYkxUb29RSHFtdFcrNVlNckkKLS0tIENpbFV3MWhqQlE1b25SR0p4bUxH\ndGlVTGtoNUNtc2ZRSVR2czc0dTdkSVUKQOwSg7hq3xVdTgp91L3OCoancPKtfNHv\nzCkoLZACNzfmB9Sb9ngI+Sq4IPYnVGeFemnSqeVgZHm6H03kyDLexA==\n-----END AGE ENCRYPTED FILE-----\n" + "recipient": "age12jlzcjwwhtgws4ku4nemwknsps3a6um74kdpxfv9pzvgdlhufp8q08c0j7", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBSS2tlaFJ0N2RJTzdlV0xR\nV3lzdXpad1NzaFFvdWlyRkc4eEJiLzBGTmhVClFsVk44MTgrSzBHYU5OY3UxdUlk\nTXAvTkpVcS9pcTRMdGxVYnI5R09razQKLS0tIDZwRWgxSDBzY2tQT2pNMkhyV2Ju\nM0RmMFIxeUF5NW5FZDAyWWo3QW9CczQK3gV2LaYizEMutTauJpi2HeSGaWedTDB+\ngfj4gvZPxKTkjJJX48fn650rmL4Os6t8C6XX/uKlNEarh3q5Zwm87w==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1smgaynkzdfmhg8yymr49l75cax7fzspgppg2dtjadv269j78vsuqdedhmh", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBTL2RFV1p5WXVkRGI2bWNa\nWDI2M3pkL1ZidlpwK2lJUXJGb20ycm5OOGxjCitDQjM2SVBaMUJSY2lXQ0tYbXF6\nQklZajBlK01qRFQ1UE9sU2pZZW1UL2MKLS0tIEJsd3pSSTFabTRadW8rS2dXb1gz\nb2xGOHdacnA2NFYyUDJLdTNTK01YOGsKkFSxv5w+ju7om5qvhCV+/LxPvlx3lYnq\nyfUqIofDMKU298d9mBJA+/4n1n+IkwxDoHKZyo+A07mOcLObFL2Ing==\n-----END AGE ENCRYPTED FILE-----\n" } ], "lastmodified": "2025-03-30T13:58:44Z", "mac": "ENC[AES256_GCM,data:WqHNGdMyso+LTKCEYjcTEFbsGIJEchUEnyog2nZXzZE4p2RM8sP3IEDLkyqwDqGt86IGV8N9ug8sriVJRRBdGhNNIYJDhCaJEDYUoD50tJwMVbLSHGRtzkp5BY5Y8Kwc+rKJLvbFir2yIJMEWY3Qut9Z2rXtSU6MmjAuX3SgIIs=,iv:ohhIZFTlBaf9467NnWUXuM1PGBWzPDU0ayKKrg/RueY=,tag:ohkYVRfuiqyFocLKP1CCOg==,type:str]", - "pgp": null, "unencrypted_suffix": "_unencrypted", "version": "3.9.4" } -} \ No newline at end of file +} From a34fa7898f5fefebbc72395703e08b071dbf7c68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Sat, 19 Apr 2025 11:56:10 +0200 Subject: [PATCH 10/17] Update vars via generator machine-id for machine moritz-laptop --- vars/per-machine/moritz-laptop/machine-id/machineId/value | 1 + 1 file changed, 1 insertion(+) create mode 100644 vars/per-machine/moritz-laptop/machine-id/machineId/value diff --git a/vars/per-machine/moritz-laptop/machine-id/machineId/value b/vars/per-machine/moritz-laptop/machine-id/machineId/value new file mode 100644 index 0000000..16727f5 --- /dev/null +++ b/vars/per-machine/moritz-laptop/machine-id/machineId/value @@ -0,0 +1 @@ +a73f6aaa27ee4ac39f0f3610f0697e41 \ No newline at end of file From 49884065a0e5aa2550459ee03d614f7b0316de51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Sat, 19 Apr 2025 11:56:56 +0200 Subject: [PATCH 11/17] Update vars via generator moritz-nextcloud for machine moritz-laptop --- .../password/machines/moritz-laptop | 1 + vars/shared/moritz-nextcloud/password/secret | 19 +++++++++++++++++++ .../moritz-nextcloud/password/users/moritz | 1 + 3 files changed, 21 insertions(+) create mode 120000 vars/shared/moritz-nextcloud/password/machines/moritz-laptop create mode 100644 vars/shared/moritz-nextcloud/password/secret create mode 120000 vars/shared/moritz-nextcloud/password/users/moritz diff --git a/vars/shared/moritz-nextcloud/password/machines/moritz-laptop b/vars/shared/moritz-nextcloud/password/machines/moritz-laptop new file mode 120000 index 0000000..8c17ba4 --- /dev/null +++ b/vars/shared/moritz-nextcloud/password/machines/moritz-laptop @@ -0,0 +1 @@ +../../../../../sops/machines/moritz-laptop \ No newline at end of file diff --git a/vars/shared/moritz-nextcloud/password/secret b/vars/shared/moritz-nextcloud/password/secret new file mode 100644 index 0000000..45d604a --- /dev/null +++ b/vars/shared/moritz-nextcloud/password/secret @@ -0,0 +1,19 @@ +{ + "data": "ENC[AES256_GCM,data:uNA9UikV7gu7MZoRO+tSkxuUWEiZHqXm2Pz9vAHKRSg=,iv:ViNggY5RUGCdrVwSZDl2xnxSPhG0d5X9oRqm6unBd38=,tag:rEaMjk2hpByHn4iqD7guYA==,type:str]", + "sops": { + "age": [ + { + "recipient": "age12jlzcjwwhtgws4ku4nemwknsps3a6um74kdpxfv9pzvgdlhufp8q08c0j7", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBPWjcxNUtrTXNRYWtDTmJt\nYTZTNHVzd3NVZEo3NUZocnh3OU9WVzV2YzFvCm9sRkZwZmloK3d3NkJkalpwTFlr\nWS9lZTJNaVdWVld0OUxUTXJBdVdCdVEKLS0tIGtDZEoxUFJ3M29qSmxKYmczSmpo\nWERzZkZvaFRJcFBNMmNRT09oSGljb3MK/pFpF6c5Lx3tz32PWiLYl5SVezM/pzct\nt3j21/UeiOCTEeIC6sxYVP/AY7aK0T16D2/ipLmYaBMWIZ4+zKWBzg==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1smgaynkzdfmhg8yymr49l75cax7fzspgppg2dtjadv269j78vsuqdedhmh", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBkanRqRFdMNjdBYkk3Y0I2\nb09mUFdCMk4vdmZxcDdJWE9JOGYzc0J6ZUhFCmFRL2NDWEFhcmdzYVBPdnFPOU5k\nUzIxZXJMS2tiNmxmbnJINWhvcVRxVzQKLS0tIGk1V2llZmRaOVlvR1VuRnlzbTVU\nd2pWKzNmV09OeXVxanpadlpKMy9vVlEKWQdm5S0BQInz04YuzQqnY9RGNTmsKBrM\nE5XUx3LzIRO3HyUKkTnwyWd3RVFvVhe86RmL5etAh1VTNdI3tebXTg==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2025-04-19T09:56:52Z", + "mac": "ENC[AES256_GCM,data:dRqO3mpErcgE6icMYnvabE7rY1B/Op2z4FWLKjsE38BWHiGRt2Ala6Xwh/PuCACsSke75mR2XwH/trYFzajXPFzrml2OIp8ngv7yZttJB4RShaiJAZWuCKr3IdHpnhNRBewNU+xaV0otCJ0jnLaW15iFaNPhoWiYUwmWnYBXxJg=,iv:9EmW8r8pvT7GThKsoVxawePHpNGtJDJaZYpr/yTDlIU=,tag:iBNIawOTIA7SsCXnScxq3A==,type:str]", + "unencrypted_suffix": "_unencrypted", + "version": "3.10.1" + } +} diff --git a/vars/shared/moritz-nextcloud/password/users/moritz b/vars/shared/moritz-nextcloud/password/users/moritz new file mode 120000 index 0000000..ed9f9a8 --- /dev/null +++ b/vars/shared/moritz-nextcloud/password/users/moritz @@ -0,0 +1 @@ +../../../../../sops/users/moritz \ No newline at end of file From f5c3b2520e298234d1a251ced7f8b480a162a70b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Sat, 19 Apr 2025 11:57:12 +0200 Subject: [PATCH 12/17] Update vars via generator openssh for machine moritz-laptop --- .../openssh/ssh.id_ed25519.pub/value | 1 + .../ssh.id_ed25519/machines/moritz-laptop | 1 + .../openssh/ssh.id_ed25519/secret | 19 +++++++++++++++++++ .../openssh/ssh.id_ed25519/users/moritz | 1 + 4 files changed, 22 insertions(+) create mode 100644 vars/per-machine/moritz-laptop/openssh/ssh.id_ed25519.pub/value create mode 120000 vars/per-machine/moritz-laptop/openssh/ssh.id_ed25519/machines/moritz-laptop create mode 100644 vars/per-machine/moritz-laptop/openssh/ssh.id_ed25519/secret create mode 120000 vars/per-machine/moritz-laptop/openssh/ssh.id_ed25519/users/moritz diff --git a/vars/per-machine/moritz-laptop/openssh/ssh.id_ed25519.pub/value b/vars/per-machine/moritz-laptop/openssh/ssh.id_ed25519.pub/value new file mode 100644 index 0000000..e401a36 --- /dev/null +++ b/vars/per-machine/moritz-laptop/openssh/ssh.id_ed25519.pub/value @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAxM1EucXBzhDNyWi9AjAPcIM5W5KE5JL5EWyDw4Nntr nixbld@moritz-laptop diff --git a/vars/per-machine/moritz-laptop/openssh/ssh.id_ed25519/machines/moritz-laptop b/vars/per-machine/moritz-laptop/openssh/ssh.id_ed25519/machines/moritz-laptop new file mode 120000 index 0000000..60d1226 --- /dev/null +++ b/vars/per-machine/moritz-laptop/openssh/ssh.id_ed25519/machines/moritz-laptop @@ -0,0 +1 @@ +../../../../../../sops/machines/moritz-laptop \ No newline at end of file diff --git a/vars/per-machine/moritz-laptop/openssh/ssh.id_ed25519/secret b/vars/per-machine/moritz-laptop/openssh/ssh.id_ed25519/secret new file mode 100644 index 0000000..8527087 --- /dev/null +++ b/vars/per-machine/moritz-laptop/openssh/ssh.id_ed25519/secret @@ -0,0 +1,19 @@ +{ + "data": "ENC[AES256_GCM,data:B4w8dbGL1tmaaGjvMmup+dY5W6NAQTvmgvM06V/zvhSP71mcIXjd3xBfwL173jci17VYsEWW2hVdvk0/JFBPRwoykXPsD/INyKi2YhJauQ2lLWs8JgUeYjFcJqyNF7Bz3Scd+Eox5lNI2rX+qZ+hOizjGEYDggM4h5cM2RZ/+T9a3I30hBjNnEp6sc+Rm5Q5rjV9aQX+90EMn2yEPc3AHpBDvsyd/iyFMHgnNTxwBVEMvcCVMQkHetz5uGEK9SA7C0T2SOypeQGA1TKwpb7Nl70jphjH48KnFcjkYkOgcPLecayYIws78nXdgOIaA0Xh7Q/RBiMlNytIlg81rN2zdZAw4iszyaLoEBY/yHFgr7Dms1EnOFQK5o0T4cnFI13WqnZd66wit7CiVVhvdsoF72KxitzOn2dzyxbfze5U1TDcXjv98dUYI1VOtjNoXzCFHIIYtOfZ/z6+GghfwBVS/rVJm0kOIFFWB+EGfc4PjpomwczLOB50qVAfZNkeVn9aPtGFNUV3WAqPdXZb7z12pNtMnFTl150j/OH9,iv:q0h+2hAR2xiCrZtGfQC4HijZBFYq8dkPy72S+5A8i88=,tag:fJTqvIYRr0lMxLnzqi/3Rg==,type:str]", + "sops": { + "age": [ + { + "recipient": "age12jlzcjwwhtgws4ku4nemwknsps3a6um74kdpxfv9pzvgdlhufp8q08c0j7", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCcllpTXowVkxaRjJ2U05O\nUzR6MEtIWFZUZWZrY0RLVFVuKzNOaUMwL2prCis2VXNFWjQ4akx1a2UvdmR0Rkt3\nMThsNElWNkgwSWZLVWFHbzNmMFhwbmMKLS0tIFRMQ3FBZUxKWnc4S0hRbnVlOWJq\nTFZmU3hibjM4ZmsxTVJJSG9VK1Y0eUUKdo3dYshOM3RlQHDpxzqvgcDKefRwmR4x\nQ857vZwGRlIsU9/BGjhR9zCa8F2Ti7NWTf3qUNqZXkLMvH0lEfzSCw==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1smgaynkzdfmhg8yymr49l75cax7fzspgppg2dtjadv269j78vsuqdedhmh", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA5VlpvRk5xeXhzMnRPazQ5\nTzRSb0R5T2N2WjVkNlh5STNtNVM1MzVEZVRjCk5LaHhCc2l6eVdoa1ZmWkNGRk02\ncEliTGdyL0w0SS9ZYVdnRktlT0t5NzgKLS0tIHR5cjM4UXpjSUdDWms2L1JaVVRX\nVTN3bVpKRzMycUw5azZIWks3L2NzejQK6yyLIXo/Q5Jcz5iia/LfOr+FUjhblkdz\n0jdKMhlDdM3EGfzBRv1NkHdBN16yZu2YVGV2hGm92yDa+8JKRInzFg==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2025-04-19T09:57:10Z", + "mac": "ENC[AES256_GCM,data:KLylmujN5POofP0dimUGVLvXnIKuUO5UmhItX661Frt2JlFHWrM/F8PDIN/C0j6+KU1o9oMerb32sn9eIDm5BAF1ewWMUX7HLTtEAQVg247Kxb1Jr2A0KKA1f3b0rRY7oWpwzXvHQ5C4l8r9zvTs1u3SLL0mc1iSuh4cW75JsPk=,iv:6vHlHpK0ufhLPubEr0ko55NoNg5OmrE22EUexcCt09Q=,tag:gwsnS5FzBbTgRvGruSNmGw==,type:str]", + "unencrypted_suffix": "_unencrypted", + "version": "3.10.1" + } +} diff --git a/vars/per-machine/moritz-laptop/openssh/ssh.id_ed25519/users/moritz b/vars/per-machine/moritz-laptop/openssh/ssh.id_ed25519/users/moritz new file mode 120000 index 0000000..1b45802 --- /dev/null +++ b/vars/per-machine/moritz-laptop/openssh/ssh.id_ed25519/users/moritz @@ -0,0 +1 @@ +../../../../../../sops/users/moritz \ No newline at end of file From 84b826a52fef7d07e2190f0a2a612646f1523581 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Sat, 19 Apr 2025 11:57:53 +0200 Subject: [PATCH 13/17] Update vars via generator root-password for machine moritz-laptop --- .../password-hash/machines/moritz-laptop | 1 + .../root-password/password-hash/secret | 19 +++++++++++++++++++ .../root-password/password-hash/users/moritz | 1 + .../root-password/password/secret | 15 +++++++++++++++ .../root-password/password/users/moritz | 1 + 5 files changed, 37 insertions(+) create mode 120000 vars/per-machine/moritz-laptop/root-password/password-hash/machines/moritz-laptop create mode 100644 vars/per-machine/moritz-laptop/root-password/password-hash/secret create mode 120000 vars/per-machine/moritz-laptop/root-password/password-hash/users/moritz create mode 100644 vars/per-machine/moritz-laptop/root-password/password/secret create mode 120000 vars/per-machine/moritz-laptop/root-password/password/users/moritz diff --git a/vars/per-machine/moritz-laptop/root-password/password-hash/machines/moritz-laptop b/vars/per-machine/moritz-laptop/root-password/password-hash/machines/moritz-laptop new file mode 120000 index 0000000..60d1226 --- /dev/null +++ b/vars/per-machine/moritz-laptop/root-password/password-hash/machines/moritz-laptop @@ -0,0 +1 @@ +../../../../../../sops/machines/moritz-laptop \ No newline at end of file diff --git a/vars/per-machine/moritz-laptop/root-password/password-hash/secret b/vars/per-machine/moritz-laptop/root-password/password-hash/secret new file mode 100644 index 0000000..97c7409 --- /dev/null +++ b/vars/per-machine/moritz-laptop/root-password/password-hash/secret @@ -0,0 +1,19 @@ +{ + "data": "ENC[AES256_GCM,data:0uEh/gTBJlH3trRWyABOINon/QsCCi6OPLAklzlsVhPhiI3q+UE3AIZTv/tM+a4u115paZJje7hETebCLYsdplr+5/c4YQYsRr2chS81JMZ3T0WIS6ptqv+Lxom3f9UDeZIHvXb+FagVYw==,iv:YusEJHpQRT0gYyghGgMWr1a/2cCl2gj6HWnOzyldc3k=,tag:vbpymKrYtIuiX4ignyQeng==,type:str]", + "sops": { + "age": [ + { + "recipient": "age12jlzcjwwhtgws4ku4nemwknsps3a6um74kdpxfv9pzvgdlhufp8q08c0j7", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBmQ1FabjN5b2Y0MW5oNWtr\nVExYUDVNY3owTEFidXpLQUpWTlBKUlQyZVZRCnVGdmdhNnh6bUpqQVRmVFRnVEt2\nSVJMQVZ1bjF4clZkRm56dTNNOExLck0KLS0tIHc2SjFQQjc2MXNNdFZBWDAxQWh5\nWXhEZUFqc0x3SXpqY211RERSRjVsMzgKUNgfoVVr9Iq0TnlIUYS1h5c5laWk3y5t\ndSaQ7AROKeUmTIPJcrYdE8bX+wDzmG27EiZb+mn2mliHPFp1rPcbdA==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1smgaynkzdfmhg8yymr49l75cax7fzspgppg2dtjadv269j78vsuqdedhmh", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAra2VBMlVPemdTQktwSnJE\nMmZ3NDNiV1hQMzRWT3pmam5iWlVha1hsT0JRCkRBZml0WVBuM3dWSjBJOElXcFJ5\nWnlBYUt4SStHOTNyOHB3MUhFZ1QwUzQKLS0tIEd5WHcwMEJzbnhPemNXazhpd0xX\nOTNYTDBRcEVweEE1bCs5NWhFRWQ0bmsKbnOI06Coqh9Icm7pWYN17xn8ayVdAZLg\nlD4kHEVFIKNDaGNE4wJA/e0p6NBTsF8rQ4XSMQJdMQvmENUPQwJnmQ==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2025-04-19T09:57:53Z", + "mac": "ENC[AES256_GCM,data:kg1o9H3lGTmbtGMUq7D2cClddEmXtlwWLrSwkDUmMpFs1kaZiPfom6A5k2PrB5a3wkMHRMZ1L6kW76RBdOBfm6yY0tpS477Boiaem/YnUbYGN81CIjBdl5U4xfDCUc1fmYs7FUQiN5kPNpvORdnGjBafj8HIBPa/VXOA0KerDFo=,iv:Sro+NJb0yAXAzGtyg1XobsrSsG3C+4ggvsIB5IUptOU=,tag:8LJF+lA+T096Vvagd2Dm1g==,type:str]", + "unencrypted_suffix": "_unencrypted", + "version": "3.10.1" + } +} diff --git a/vars/per-machine/moritz-laptop/root-password/password-hash/users/moritz b/vars/per-machine/moritz-laptop/root-password/password-hash/users/moritz new file mode 120000 index 0000000..1b45802 --- /dev/null +++ b/vars/per-machine/moritz-laptop/root-password/password-hash/users/moritz @@ -0,0 +1 @@ +../../../../../../sops/users/moritz \ No newline at end of file diff --git a/vars/per-machine/moritz-laptop/root-password/password/secret b/vars/per-machine/moritz-laptop/root-password/password/secret new file mode 100644 index 0000000..b296571 --- /dev/null +++ b/vars/per-machine/moritz-laptop/root-password/password/secret @@ -0,0 +1,15 @@ +{ + "data": "ENC[AES256_GCM,data:kTxZFpg4wLL7cTSNcMa4psfw2UqRJ1kn4C9dpNy2/w==,iv:9h7IwH5esMwtHXEk/SXDDwHiXvuOgC6eEXSxH4fqm+8=,tag:mDtco8BEOUcSJfDwqu315A==,type:str]", + "sops": { + "age": [ + { + "recipient": "age12jlzcjwwhtgws4ku4nemwknsps3a6um74kdpxfv9pzvgdlhufp8q08c0j7", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBUdEE1bGFRT3dWb1FldFQx\naVgxSXJsUk1WQk4relpmaTlyNlFQMmFyRGpFCk16KytwRmtTY3FyWExDUHY4UmRT\nZ005V2h4SjR4Skh2a0E4K2o2WlRETlkKLS0tIGRQbzNCcHZEcGhBbndsU21GekE2\nYzdWZHplZTYxWTB5U3k0UHRINnBYS3MK9JAV3n99W4X4MhvpZaQasxivL71AMWq9\nm0oGES+c1G/3Tvj/UVIUXuinrQ50FFsEcYO2VHRHcSjP/Xe26uTJhQ==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2025-04-19T09:57:39Z", + "mac": "ENC[AES256_GCM,data:ktVtGbffk9TwNOPgo08u3l8iTqfExKE/WsEUZdzzs8SDX+ApOJdvipcRi8dmXD8y7W6YsujgTfrPp2Pbh7BKWnbCvnMGGl2pygL9P0+jurxkvKdiaU2eVgOb5K8vdnVkXnfTbC9J5srAOcvtMnKTzjLbj8Qd8EDMf4giHsrqiE8=,iv:b2CTZ/82z1byK/B7e7RXzLtd7eSNRBxVOfYflDlnxL4=,tag:13bQT8i3YDUxn7YEpbWudA==,type:str]", + "unencrypted_suffix": "_unencrypted", + "version": "3.10.1" + } +} diff --git a/vars/per-machine/moritz-laptop/root-password/password/users/moritz b/vars/per-machine/moritz-laptop/root-password/password/users/moritz new file mode 120000 index 0000000..1b45802 --- /dev/null +++ b/vars/per-machine/moritz-laptop/root-password/password/users/moritz @@ -0,0 +1 @@ +../../../../../../sops/users/moritz \ No newline at end of file From abf1209b478218d4281b124cb977d5d1ca42b193 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Sat, 19 Apr 2025 11:58:01 +0200 Subject: [PATCH 14/17] Update vars via generator state-version for machine moritz-laptop --- vars/per-machine/moritz-laptop/state-version/version/value | 1 + 1 file changed, 1 insertion(+) create mode 100644 vars/per-machine/moritz-laptop/state-version/version/value diff --git a/vars/per-machine/moritz-laptop/state-version/version/value b/vars/per-machine/moritz-laptop/state-version/version/value new file mode 100644 index 0000000..bb7635c --- /dev/null +++ b/vars/per-machine/moritz-laptop/state-version/version/value @@ -0,0 +1 @@ +22.05 \ No newline at end of file From 51f625aa17e74c3c219a6c731fa7648cf6aa3af6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Sat, 19 Apr 2025 11:58:42 +0200 Subject: [PATCH 15/17] Update vars via generator user-password for machine moritz-laptop --- .../user-password-hash/machines/moritz-laptop | 1 + .../user-password/user-password-hash/secret | 19 +++++++++++++++++++ .../user-password-hash/users/moritz | 1 + .../user-password/user-password/secret | 15 +++++++++++++++ .../user-password/user-password/users/moritz | 1 + 5 files changed, 37 insertions(+) create mode 120000 vars/per-machine/moritz-laptop/user-password/user-password-hash/machines/moritz-laptop create mode 100644 vars/per-machine/moritz-laptop/user-password/user-password-hash/secret create mode 120000 vars/per-machine/moritz-laptop/user-password/user-password-hash/users/moritz create mode 100644 vars/per-machine/moritz-laptop/user-password/user-password/secret create mode 120000 vars/per-machine/moritz-laptop/user-password/user-password/users/moritz diff --git a/vars/per-machine/moritz-laptop/user-password/user-password-hash/machines/moritz-laptop b/vars/per-machine/moritz-laptop/user-password/user-password-hash/machines/moritz-laptop new file mode 120000 index 0000000..60d1226 --- /dev/null +++ b/vars/per-machine/moritz-laptop/user-password/user-password-hash/machines/moritz-laptop @@ -0,0 +1 @@ +../../../../../../sops/machines/moritz-laptop \ No newline at end of file diff --git a/vars/per-machine/moritz-laptop/user-password/user-password-hash/secret b/vars/per-machine/moritz-laptop/user-password/user-password-hash/secret new file mode 100644 index 0000000..6d3cd60 --- /dev/null +++ b/vars/per-machine/moritz-laptop/user-password/user-password-hash/secret @@ -0,0 +1,19 @@ +{ + "data": "ENC[AES256_GCM,data:fCiF1YJl2IkR6nBDWK99axlyVjtU03c/BQkowxVlTedhvOXgpCKQob373wwD/d6K7m6wOJaOeULKb9v9QtEWjvFMWwTlfZOkVxlB74J+z05WXsR1EsMy7tiKJ7UBqngUerLszQP+X3EPtg==,iv:O4iXvidvipDnd/5ZNyuIWCBxcNmAiaOdeciMVKrqvzU=,tag:IycDRHmYki9/Swspz5Fp0g==,type:str]", + "sops": { + "age": [ + { + "recipient": "age12jlzcjwwhtgws4ku4nemwknsps3a6um74kdpxfv9pzvgdlhufp8q08c0j7", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB6TFJRVmNwLzdKNlYyNDgz\nbkx0Mm9LRnBYR2xZb2lpN0ppTWxhZm1DUnkwCi8zWVJ4bkhMTWhucDdxM0RvRWRN\nbkZHZVJCSzJZSlJVbERqV2RQN3FNc0kKLS0tIHdhRm9renBUTlpudTJvUDI4VkVx\nek1zM0RTWkZpODJCTThtUDltTDZXcEEKo2EftFiW4hL9tA1GzGMq+YK/seTPeoJB\ngXMpTE3UFzjAW5j0aD67Wsskxizqljtpv/g4PIyslHUImutNSMu6SQ==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1smgaynkzdfmhg8yymr49l75cax7fzspgppg2dtjadv269j78vsuqdedhmh", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBSZlZyMlljSmdCZithZzNQ\nOVV1bC9GYW9EdXJvR1NtU0g4MU1vbTh5cGlnCi9qbGhrd0NGWUZMQ2c3UStQM1JT\nY1I3ZlhidmlUeW5VdWdGMnVubVgrbnMKLS0tIEVqcHZaVnlmcWdnTGdVMUhKeXhM\naGVTQ2xUamsrNUxrSzVWK3FEcXVWcDgKKHKmOOHRHYJrmaVOflghJbPC02jEAkV0\nZA+VucYRcrlVUT5liugj1saJuyW3sgoVPicq1TgWMlOX2qooK8jZnQ==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2025-04-19T09:58:42Z", + "mac": "ENC[AES256_GCM,data:ZpncfTEdfz9W5EQmpNXub4w+2NweBZzIEQCOPzyfF2GtnS43/rY4f1YKQBIo5a/JUuHamPa0uI0K51SSYCo5rwdp+NkRJFrw7cuFtonjFOd+HTAKLxOOoMyP2faFYdPc0WTQYQCquaxUz+fFYjXalXeFUNitmt16xMEA2J+rPXI=,iv:A08+XUkpRhBfi4EJLWrCEDIRXyXJeGJDWwy4j8FJCrE=,tag:CY3T+MWXUdkt1GqnHCI4VA==,type:str]", + "unencrypted_suffix": "_unencrypted", + "version": "3.10.1" + } +} diff --git a/vars/per-machine/moritz-laptop/user-password/user-password-hash/users/moritz b/vars/per-machine/moritz-laptop/user-password/user-password-hash/users/moritz new file mode 120000 index 0000000..1b45802 --- /dev/null +++ b/vars/per-machine/moritz-laptop/user-password/user-password-hash/users/moritz @@ -0,0 +1 @@ +../../../../../../sops/users/moritz \ No newline at end of file diff --git a/vars/per-machine/moritz-laptop/user-password/user-password/secret b/vars/per-machine/moritz-laptop/user-password/user-password/secret new file mode 100644 index 0000000..eb1a79c --- /dev/null +++ b/vars/per-machine/moritz-laptop/user-password/user-password/secret @@ -0,0 +1,15 @@ +{ + "data": "ENC[AES256_GCM,data:rIb+wQHNyTSG8uY=,iv:AXnaVl4XydVywsO5snsab/Al2nsgdgB7rycICd9qNkg=,tag:TeMFASSDSKoNO1dkjSfbBQ==,type:str]", + "sops": { + "age": [ + { + "recipient": "age12jlzcjwwhtgws4ku4nemwknsps3a6um74kdpxfv9pzvgdlhufp8q08c0j7", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAwVzM2b1Y4d0JIOTBGWndu\nS0oxcnJ2azljdTZsYVZSSnBVN1VadWdYUmhnCkxNL0puSktIbWs3RGJZaTRJZUlU\nNHdmUW9jVlV0Vnc4czJ0aWVFVml0TU0KLS0tIFhLOXBnRWJQc09vZUd4Qnp1SGVW\nK1VCajFoMWZ6UVJjV1hsck1WVXJzTzgK5P6Pom1cJv1MCHhjQ/pMfV6Eo5qxZQLJ\n/cZyfxmahLtHGvRySYh4uu3HdsQZoVRu7lFXeTa6wB3T10A9jNSkDQ==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2025-04-19T09:58:34Z", + "mac": "ENC[AES256_GCM,data:hK/IQVTm7N47HUF9IxO4Bq+J65yuRQQ1iQ/nmSr5PYu5QAMWSdpgZZaoRKd91MaboflZtIA92gBaLOonPS9KR++0ZqSFoG04bOvkzm0j2REAtRiMkCGwwefiLGFC1f0oiNeCVm5SKzM8U8VfdrtBlThpIlJimzQE7XFrf62vQLg=,iv:xE3TleNKOikt7VBcIEENz9HDacSNs+LNa0o+tsm1Dm4=,tag:H5LjMaOEirjbQcZfPZLOxA==,type:str]", + "unencrypted_suffix": "_unencrypted", + "version": "3.10.1" + } +} diff --git a/vars/per-machine/moritz-laptop/user-password/user-password/users/moritz b/vars/per-machine/moritz-laptop/user-password/user-password/users/moritz new file mode 120000 index 0000000..1b45802 --- /dev/null +++ b/vars/per-machine/moritz-laptop/user-password/user-password/users/moritz @@ -0,0 +1 @@ +../../../../../../sops/users/moritz \ No newline at end of file From 39d9834a2ba729a1fc3ffeeb40115eab212e19d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Sat, 19 Apr 2025 12:05:34 +0200 Subject: [PATCH 16/17] Update secret moritz-laptop-zerotier-identity-secret --- .../machines/moritz-laptop | 1 + .../secret | 19 +++++++++++++++++++ .../users/moritz | 1 + 3 files changed, 21 insertions(+) create mode 120000 sops/secrets/moritz-laptop-zerotier-identity-secret/machines/moritz-laptop create mode 100644 sops/secrets/moritz-laptop-zerotier-identity-secret/secret create mode 120000 sops/secrets/moritz-laptop-zerotier-identity-secret/users/moritz diff --git a/sops/secrets/moritz-laptop-zerotier-identity-secret/machines/moritz-laptop b/sops/secrets/moritz-laptop-zerotier-identity-secret/machines/moritz-laptop new file mode 120000 index 0000000..aa1abad --- /dev/null +++ b/sops/secrets/moritz-laptop-zerotier-identity-secret/machines/moritz-laptop @@ -0,0 +1 @@ +../../../machines/moritz-laptop \ No newline at end of file diff --git a/sops/secrets/moritz-laptop-zerotier-identity-secret/secret b/sops/secrets/moritz-laptop-zerotier-identity-secret/secret new file mode 100644 index 0000000..22eaea2 --- /dev/null +++ b/sops/secrets/moritz-laptop-zerotier-identity-secret/secret @@ -0,0 +1,19 @@ +{ + "data": "ENC[AES256_GCM,data:BLgNb7+OPIDVOxtc+td1UiQ1UvFSA2xLP3Wgvp5K7c36YAP90yPDZRPM828RsUdoLi8HO5peolJz9zleTURaVWDgWMYv39HdsSSVU8qEUXb56QQLsIkJhzrQ86dhvarUIHeyu6rRbGT+cE1UovplLMoXRmIoyo4hnJ+6YljXv6S6IwZIeSZHjr1mnypAHNhJjfpWJysiEaLDH7HkulFpl6BBYd/YCbbPYHe9yiAquqWTUHJiA3RISxAkRBvFJcmQBe80xfkQqig/TSSrvqq78s0fOm64RvhA+nGucIC85lvOJacqFmj0u4T/k9OK+Q8o9IlGJj1kTR1S2G3waklEfLwClt+tgXxlNWjvzz7y,iv:LzBfXNb1p4+vYxSGhQkJg1bjOSfN5XJuhQqY56Go12Q=,tag:2DSS1Cos9RF+kvQqdmOE8A==,type:str]", + "sops": { + "age": [ + { + "recipient": "age12jlzcjwwhtgws4ku4nemwknsps3a6um74kdpxfv9pzvgdlhufp8q08c0j7", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBqV0Y0ckRQbE43UXlKTVlX\nc3NDcnRZNFZodGpLUi9GTWQvTnJxdGRYN0hBCm9iTERvRFZzYzRoZndmMUkxYTVR\nVDRrY1d2dEZkL0RsNGtpWE1QcDZYaDAKLS0tIEtsdmFDdDgrM1RxTXg5bi80dm5G\nRS9pbUl3QU1aRCtuSXRaTHZoZWFEUVkKmdFE4RvlxGDEECjwiTLfw67yHFhRjpGS\nJ+MoJ102i23Er+dsSLOYMaMHgB4EIw1y2wxjnYw4688vpcb0xhzNOw==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1smgaynkzdfmhg8yymr49l75cax7fzspgppg2dtjadv269j78vsuqdedhmh", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2cXVuZmV1dURGSFdPTDhO\nRFJIbUZuRGxZdWhaMXZCcGdCeXY5V1JVU204CkYxdkN6Vkkra2NpSlRMUit6cWlE\nanM3aEJqUTJqSXZ0NzdWL1BWdzVlN1UKLS0tIGZLY3J0eFVxdXQrSzZSWHN5aWxE\nSDN6SS9IM2hxOENqR29BOS9KaEdMWXcK1EilL9fj1P/L8Ov8fEs3yQ08wc8Ai4z7\nWZACTJSPPThIVvMdxexT82dv6B+CFCLWDr16tQvHNj3MulVbW0o3DA==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2025-04-19T10:05:34Z", + "mac": "ENC[AES256_GCM,data:4ERWxTLbqmn3wA74wtVwliz2ff8x2xPYV9Ok7Z5Ur6k9msLbYZjB8og6du8MzP7riwRnXHv2zfaMKZvjJIEKYzQk/kCS+iFJGaG8sYTQqbmGjsK9xG3eubfn7NY8m95vbRlOMMmTloOMVDK8S+p8aZcDE4rUmpJA9lfE3O+l950=,iv:cnks0m/ENl4kK8/moppFVxvvfkCIzHbFjqtwx/Fe/IU=,tag:15uwynbok653t+kN/eBttA==,type:str]", + "unencrypted_suffix": "_unencrypted", + "version": "3.10.1" + } +} diff --git a/sops/secrets/moritz-laptop-zerotier-identity-secret/users/moritz b/sops/secrets/moritz-laptop-zerotier-identity-secret/users/moritz new file mode 120000 index 0000000..4c7c349 --- /dev/null +++ b/sops/secrets/moritz-laptop-zerotier-identity-secret/users/moritz @@ -0,0 +1 @@ +../../../users/moritz \ No newline at end of file From bdefe8ccd3930383d86a5036e4a832e937ebe25d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Sat, 19 Apr 2025 12:05:36 +0200 Subject: [PATCH 17/17] Update facts/secrets for service zerotier in machine moritz-laptop --- machines/moritz-laptop/facts/zerotier-ip | 1 + 1 file changed, 1 insertion(+) create mode 100644 machines/moritz-laptop/facts/zerotier-ip diff --git a/machines/moritz-laptop/facts/zerotier-ip b/machines/moritz-laptop/facts/zerotier-ip new file mode 100644 index 0000000..426e3fe --- /dev/null +++ b/machines/moritz-laptop/facts/zerotier-ip @@ -0,0 +1 @@ +fd77:acc0:1d56:2265:499:9316:a1c:47f3 \ No newline at end of file