From 9d887bf07ac1dec542028212909b9ac7e461d0db Mon Sep 17 00:00:00 2001 From: Jasper Ras Date: Sun, 9 Feb 2025 00:04:30 +0100 Subject: core stuff, snorlax zfs --- configuration/core/packages.nix | 8 +- configuration/core/services.nix | 39 +--- configuration/hyprland.nix | 49 +++++ configuration/snorlax/default.nix | 6 + configuration/snorlax/disk-config.nix | 34 +++- configuration/snorlax/facter.json | 356 +++++++++++++++++----------------- 6 files changed, 259 insertions(+), 233 deletions(-) diff --git a/configuration/core/packages.nix b/configuration/core/packages.nix index cf4baea..37d1562 100644 --- a/configuration/core/packages.nix +++ b/configuration/core/packages.nix @@ -1,15 +1,9 @@ { pkgs, ... }: { environment.systemPackages = with pkgs; [ - kitty - - helix - alacritty - firefox git git-crypt - whatsapp-for-linux - obsidian + helix devenv busybox diff --git a/configuration/core/services.nix b/configuration/core/services.nix index 15da1f4..f3d1d24 100644 --- a/configuration/core/services.nix +++ b/configuration/core/services.nix @@ -1,47 +1,10 @@ -{ pkgs, lib, ... }: +{ lib, ... }: { services = { - pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - }; - keyd = { - enable = true; - keyboards = { - default = { - ids = [ "*" ]; - settings.main.capslock = "overload(meta, esc)"; - }; - }; - }; - greetd = { - enable = true; - settings = { - default_session = { - command = "${pkgs.hyprland}/bin/Hyprland"; - user = "jras"; - }; - }; - }; - gnome.gnome-keyring.enable = true; openssh = { enable = true; openFirewall = lib.mkDefault false; settings.AllowUsers = [ "jras" ]; }; }; - - systemd.user.services.kanshi = { - description = "kanshi daemon"; - environment = { - WAYLAND_DISPLAY="wayland-1"; - DISPLAY=":0"; - }; - serviceConfig = { - Type = "simple"; - ExecStart = ''${pkgs.kanshi}/bin/kanshi -c kanshi_config_file''; - }; - }; } diff --git a/configuration/hyprland.nix b/configuration/hyprland.nix index bf06cc3..92d5ee2 100644 --- a/configuration/hyprland.nix +++ b/configuration/hyprland.nix @@ -1,5 +1,14 @@ { inputs, pkgs, ... }: { + # find a better home: + environment.systemPackages = with pkgs; [ + kitty + alacritty + firefox + whatsapp-for-linux + obsidian + ]; + nix.settings = { substituters = ["https://hyprland.cachix.org"]; trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="]; @@ -11,4 +20,44 @@ package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland; }; + + # Some of these do not belong here + services = { + pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + }; + keyd = { + enable = true; + keyboards = { + default = { + ids = [ "*" ]; + settings.main.capslock = "overload(meta, esc)"; + }; + }; + }; + greetd = { + enable = true; + settings = { + default_session = { + command = "${pkgs.hyprland}/bin/Hyprland"; + user = "jras"; + }; + }; + }; + gnome.gnome-keyring.enable = true; + }; + systemd.user.services.kanshi = { + description = "kanshi daemon"; + environment = { + WAYLAND_DISPLAY="wayland-1"; + DISPLAY=":0"; + }; + serviceConfig = { + Type = "simple"; + ExecStart = ''${pkgs.kanshi}/bin/kanshi -c kanshi_config_file''; + }; + }; } diff --git a/configuration/snorlax/default.nix b/configuration/snorlax/default.nix index dd9841c..65e6f6f 100644 --- a/configuration/snorlax/default.nix +++ b/configuration/snorlax/default.nix @@ -8,7 +8,13 @@ ]; system.stateVersion = "24.11"; + + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + networking.hostName = "snorlax"; + networking.hostId = "1d1ebf34"; + time.timeZone = "Europe/Amsterdam"; programs.mtr.enable = true; diff --git a/configuration/snorlax/disk-config.nix b/configuration/snorlax/disk-config.nix index aa789a3..8c910d6 100644 --- a/configuration/snorlax/disk-config.nix +++ b/configuration/snorlax/disk-config.nix @@ -7,14 +7,9 @@ content = { type = "gpt"; partitions = { - MBR = { - type = "EF02"; # for grub MBR - size = "1M"; - priority = 1; # Needs to be first partition - }; ESP = { type = "EF00"; - size = "500M"; + size = "64M"; content = { type = "filesystem"; format = "vfat"; @@ -22,17 +17,36 @@ mountOptions = [ "umask=0077" ]; }; }; - root = { + zfs = { size = "100%"; content = { - type = "filesystem"; - format = "ext4"; - mountpoint = "/"; + type = "zfs"; + pool = "zroot"; }; }; }; }; }; }; + + zpool = { + zroot = { + type = "zpool"; + rootFsOptions = { + compression = "zstd"; + "com.sun:auto-snapshot" = "false"; + }; + mountpoint = "/"; + postCreateHook = "zfs list -t snap -H -o name | grep -E '^zroot@blank$' || zfs snapshot zroot@blank"; + + datasets = { + git = { + type = "zfs_fs"; + mountpoint = "/var/lib/git"; + options."com.sun:auto-snapshot" = "true"; + }; + }; + }; + }; }; } diff --git a/configuration/snorlax/facter.json b/configuration/snorlax/facter.json index 521d8e2..572dc4c 100644 --- a/configuration/snorlax/facter.json +++ b/configuration/snorlax/facter.json @@ -350,7 +350,7 @@ "srbds", "mmio_unknown" ], - "bogo": 6186.05, + "bogo": 6185.66, "cache": 6144, "units": 16, "physical_id": 0, @@ -416,7 +416,7 @@ "model": "Multiple Card Reader", "sysfs_id": "/class/block/sdb", "sysfs_bus_id": "6:0:0:0", - "sysfs_device_link": "/devices/pci0000:00/0000:00:14.0/usb3/3-1/3-1:1.0/host6/target6:0:0/6:0:0:0", + "sysfs_device_link": "/devices/pci0000:00/0000:00:14.0/usb3/3-2/3-2:1.0/host6/target6:0:0/6:0:0:0", "unix_device_name": "/dev/sdb", "unix_device_number": { "type": 98, @@ -427,8 +427,8 @@ "unix_device_names": [ "/dev/disk/by-diskseq/12", "/dev/disk/by-id/usb-Multiple_Card_Reader_058F63666438-0:0", - "/dev/disk/by-path/pci-0000:00:14.0-usb-0:1:1.0-scsi-0:0:0:0", - "/dev/disk/by-path/pci-0000:00:14.0-usbv2-0:1:1.0-scsi-0:0:0:0", + "/dev/disk/by-path/pci-0000:00:14.0-usb-0:2:1.0-scsi-0:0:0:0", + "/dev/disk/by-path/pci-0000:00:14.0-usbv2-0:2:1.0-scsi-0:0:0:0", "/dev/sdb" ], "unix_device_name2": "/dev/sg2", @@ -676,8 +676,8 @@ ], "hub": [ { - "index": 26, - "attached_to": 39, + "index": 24, + "attached_to": 27, "class_list": [ "usb", "hub" @@ -697,16 +697,22 @@ "value": 266 }, "vendor": { - "hex": "8087", - "value": 32903 + "hex": "1a40", + "value": 6720 }, "device": { - "hex": "0024", - "value": 36 + "hex": "0101", + "name": "USB 2.0 Hub", + "value": 257 }, - "model": "Hub", - "sysfs_id": "/devices/pci0000:00/0000:00:1a.0/usb2/2-1/2-1:1.0", - "sysfs_bus_id": "2-1:1.0", + "revision": { + "hex": "0000", + "name": "1.11", + "value": 0 + }, + "model": "USB 2.0 Hub", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-3/3-3:1.0", + "sysfs_bus_id": "3-3:1.0", "resources": [ { "type": "baud", @@ -748,11 +754,11 @@ "drivers": [ "hub" ], - "module_alias": "usb:v8087p0024d0000dc09dsc00dp01ic09isc00ip00in00" + "module_alias": "usb:v1A40p0101d0111dc09dsc00dp01ic09isc00ip00in00" }, { - "index": 27, - "attached_to": 18, + "index": 26, + "attached_to": 38, "class_list": [ "usb", "hub" @@ -772,24 +778,16 @@ "value": 266 }, "vendor": { - "hex": "1d6b", - "name": "Linux 6.12.11 xhci-hcd", - "value": 7531 + "hex": "8087", + "value": 32903 }, "device": { - "hex": "0002", - "name": "xHCI Host Controller", - "value": 2 - }, - "revision": { - "hex": "0000", - "name": "6.12", - "value": 0 + "hex": "0024", + "value": 36 }, - "serial": "0000:00:14.0", - "model": "Linux 6.12.11 xhci-hcd xHCI Host Controller", - "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-0:1.0", - "sysfs_bus_id": "3-0:1.0", + "model": "Hub", + "sysfs_id": "/devices/pci0000:00/0000:00:1d.0/usb2/2-1/2-1:1.0", + "sysfs_bus_id": "2-1:1.0", "resources": [ { "type": "baud", @@ -831,11 +829,11 @@ "drivers": [ "hub" ], - "module_alias": "usb:v1D6Bp0002d0612dc09dsc00dp01ic09isc00ip00in00" + "module_alias": "usb:v8087p0024d0000dc09dsc00dp01ic09isc00ip00in00" }, { - "index": 29, - "attached_to": 27, + "index": 27, + "attached_to": 18, "class_list": [ "usb", "hub" @@ -855,22 +853,24 @@ "value": 266 }, "vendor": { - "hex": "1a40", - "value": 6720 + "hex": "1d6b", + "name": "Linux 6.12.11 xhci-hcd", + "value": 7531 }, "device": { - "hex": "0101", - "name": "USB 2.0 Hub", - "value": 257 + "hex": "0002", + "name": "xHCI Host Controller", + "value": 2 }, "revision": { "hex": "0000", - "name": "1.11", + "name": "6.12", "value": 0 }, - "model": "USB 2.0 Hub", - "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-4/3-4:1.0", - "sysfs_bus_id": "3-4:1.0", + "serial": "0000:00:14.0", + "model": "Linux 6.12.11 xhci-hcd xHCI Host Controller", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-0:1.0", + "sysfs_bus_id": "3-0:1.0", "resources": [ { "type": "baud", @@ -912,10 +912,10 @@ "drivers": [ "hub" ], - "module_alias": "usb:v1A40p0101d0111dc09dsc00dp01ic09isc00ip00in00" + "module_alias": "usb:v1D6Bp0002d0612dc09dsc00dp01ic09isc00ip00in00" }, { - "index": 32, + "index": 30, "attached_to": 18, "class_list": [ "usb", @@ -988,8 +988,8 @@ "module_alias": "usb:v1D6Bp0003d0612dc09dsc00dp03ic09isc00ip00in00" }, { - "index": 34, - "attached_to": 16, + "index": 33, + "attached_to": 15, "class_list": [ "usb", "hub" @@ -1023,9 +1023,9 @@ "name": "6.12", "value": 0 }, - "serial": "0000:00:1d.0", + "serial": "0000:00:1a.0", "model": "Linux 6.12.11 ehci_hcd EHCI Host Controller", - "sysfs_id": "/devices/pci0000:00/0000:00:1d.0/usb1/1-0:1.0", + "sysfs_id": "/devices/pci0000:00/0000:00:1a.0/usb1/1-0:1.0", "sysfs_bus_id": "1-0:1.0", "resources": [ { @@ -1071,8 +1071,8 @@ "module_alias": "usb:v1D6Bp0002d0612dc09dsc00dp00ic09isc00ip00in00" }, { - "index": 38, - "attached_to": 34, + "index": 37, + "attached_to": 33, "class_list": [ "usb", "hub" @@ -1100,7 +1100,7 @@ "value": 36 }, "model": "Hub", - "sysfs_id": "/devices/pci0000:00/0000:00:1d.0/usb1/1-1/1-1:1.0", + "sysfs_id": "/devices/pci0000:00/0000:00:1a.0/usb1/1-1/1-1:1.0", "sysfs_bus_id": "1-1:1.0", "resources": [ { @@ -1146,8 +1146,8 @@ "module_alias": "usb:v8087p0024d0000dc09dsc00dp01ic09isc00ip00in00" }, { - "index": 39, - "attached_to": 15, + "index": 38, + "attached_to": 16, "class_list": [ "usb", "hub" @@ -1181,9 +1181,9 @@ "name": "6.12", "value": 0 }, - "serial": "0000:00:1a.0", + "serial": "0000:00:1d.0", "model": "Linux 6.12.11 ehci_hcd EHCI Host Controller", - "sysfs_id": "/devices/pci0000:00/0000:00:1a.0/usb2/2-0:1.0", + "sysfs_id": "/devices/pci0000:00/0000:00:1d.0/usb2/2-0:1.0", "sysfs_bus_id": "2-0:1.0", "resources": [ { @@ -1231,8 +1231,8 @@ ], "keyboard": [ { - "index": 25, - "attached_to": 29, + "index": 36, + "attached_to": 24, "class_list": [ "keyboard", "usb" @@ -1272,8 +1272,8 @@ "value": 0 }, "model": "Logitech USB Receiver", - "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-4/3-4.4/3-4.4:1.0", - "sysfs_bus_id": "3-4.4:1.0", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-3/3-3.4/3-3.4:1.0", + "sysfs_bus_id": "3-3.4:1.0", "resources": [ { "type": "baud", @@ -1349,7 +1349,7 @@ { "type": "mem", "base": 0, - "range": 3991343104, + "range": 3991175168, "enabled": true, "access": "read_write", "prefetch": "unknown" @@ -1490,8 +1490,8 @@ ], "mouse": [ { - "index": 33, - "attached_to": 29, + "index": 28, + "attached_to": 24, "class_list": [ "mouse", "usb" @@ -1533,8 +1533,8 @@ "compat_vendor": "Unknown", "compat_device": "Generic USB Mouse", "model": "Logitech USB Receiver", - "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-4/3-4.4/3-4.4:1.1", - "sysfs_bus_id": "3-4.4:1.1", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-3/3-3.4/3-3.4:1.1", + "sysfs_bus_id": "3-3.4:1.1", "resources": [ { "type": "baud", @@ -1594,8 +1594,8 @@ "module_alias": "usb:v046DpC52Bd2411dc00dsc00dp00ic03isc01ip02in01" }, { - "index": 36, - "attached_to": 29, + "index": 31, + "attached_to": 24, "class_list": [ "mouse", "usb" @@ -1633,8 +1633,8 @@ "compat_vendor": "Unknown", "compat_device": "Generic USB Mouse", "model": "Ducky One 3 SF RGB", - "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-4/3-4.3/3-4.3:1.2", - "sysfs_bus_id": "3-4.3:1.2", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-3/3-3.3/3-3.3:1.2", + "sysfs_bus_id": "3-3.3:1.2", "unix_device_name": "/dev/input/mice", "unix_device_number": { "type": 99, @@ -1780,7 +1780,7 @@ }, { "type": "irq", - "base": 30, + "base": 31, "triggered": 0, "enabled": true }, @@ -1810,7 +1810,7 @@ "command": 1031, "header_type": 0, "secondary_bus": 0, - "irq": 30, + "irq": 31, "prog_if": 0 }, "driver": "e1000e", @@ -1828,29 +1828,6 @@ "network_interface": [ { "index": 40, - "attached_to": 0, - "class_list": [ - "network_interface" - ], - "base_class": { - "hex": "0107", - "name": "Network Interface", - "value": 263 - }, - "sub_class": { - "hex": "0000", - "name": "Loopback", - "value": 0 - }, - "model": "Loopback network interface", - "sysfs_id": "/class/net/lo", - "unix_device_name": "lo", - "unix_device_names": [ - "lo" - ] - }, - { - "index": 41, "attached_to": 12, "class_list": [ "network_interface" @@ -1890,6 +1867,29 @@ "driver_modules": [ "e1000e" ] + }, + { + "index": 41, + "attached_to": 0, + "class_list": [ + "network_interface" + ], + "base_class": { + "hex": "0107", + "name": "Network Interface", + "value": 263 + }, + "sub_class": { + "hex": "0000", + "name": "Loopback", + "value": 0 + }, + "model": "Loopback network interface", + "sysfs_id": "/class/net/lo", + "unix_device_name": "lo", + "unix_device_names": [ + "lo" + ] } ], "pci": [ @@ -1946,7 +1946,7 @@ "resources": [ { "type": "irq", - "base": 31, + "base": 30, "triggered": 0, "enabled": true }, @@ -1964,7 +1964,7 @@ "command": 1030, "header_type": 0, "secondary_bus": 0, - "irq": 31, + "irq": 30, "prog_if": 0 }, "driver": "mei_me", @@ -2332,8 +2332,8 @@ ], "usb": [ { - "index": 24, - "attached_to": 29, + "index": 25, + "attached_to": 24, "class_list": [ "usb", "unknown" @@ -2358,23 +2358,32 @@ "value": 0 }, "vendor": { - "hex": "046d", - "name": "Logitech Inc.", - "value": 1133 + "hex": "3233", + "name": "Ducky", + "value": 12851 }, "device": { - "hex": "c52b", - "name": "USB Receiver", - "value": 50475 + "hex": "5311", + "name": "Ducky One 3 SF RGB", + "value": 21265 }, - "revision": { - "hex": "0000", - "name": "24.11", - "value": 0 + "serial": "DK-V1.11-220819", + "model": "Ducky One 3 SF RGB", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-3/3-3.3/3-3.3:1.1", + "sysfs_bus_id": "3-3.3:1.1", + "unix_device_name": "/dev/input/event1", + "unix_device_number": { + "type": 99, + "major": 13, + "minor": 65, + "range": 1 }, - "model": "Logitech USB Receiver", - "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-4/3-4.4/3-4.4:1.2", - "sysfs_bus_id": "3-4.4:1.2", + "unix_device_names": [ + "/dev/input/by-id/usb-Ducky_Ducky_One_3_SF_RGB_DK-V1.11-220819-if01-event-kbd", + "/dev/input/by-path/pci-0000:00:14.0-usb-0:3.3:1.1-event-kbd", + "/dev/input/by-path/pci-0000:00:14.0-usbv2-0:3.3:1.1-event-kbd", + "/dev/input/event1" + ], "resources": [ { "type": "baud", @@ -2407,8 +2416,8 @@ "name": "per_interface", "value": 0 }, - "interface_protocol": 0, - "interface_number": 2, + "interface_protocol": 1, + "interface_number": 1, "interface_alternate_setting": 0 }, "hotplug": "usb", @@ -2420,11 +2429,11 @@ "driver_modules": [ "usbhid" ], - "module_alias": "usb:v046DpC52Bd2411dc00dsc00dp00ic03isc00ip00in02" + "module_alias": "usb:v3233p5311d0000dc00dsc00dp00ic03isc00ip01in01" }, { - "index": 28, - "attached_to": 29, + "index": 29, + "attached_to": 24, "class_list": [ "usb", "unknown" @@ -2460,20 +2469,20 @@ }, "serial": "DK-V1.11-220819", "model": "Ducky One 3 SF RGB", - "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-4/3-4.3/3-4.3:1.3", - "sysfs_bus_id": "3-4.3:1.3", - "unix_device_name": "/dev/input/event3", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-3/3-3.3/3-3.3:1.4", + "sysfs_bus_id": "3-3.3:1.4", + "unix_device_name": "/dev/input/event4", "unix_device_number": { "type": 99, "major": 13, - "minor": 67, + "minor": 68, "range": 1 }, "unix_device_names": [ - "/dev/input/by-id/usb-Ducky_Ducky_One_3_SF_RGB_DK-V1.11-220819-if03-event-kbd", - "/dev/input/by-path/pci-0000:00:14.0-usb-0:4.3:1.3-event-kbd", - "/dev/input/by-path/pci-0000:00:14.0-usbv2-0:4.3:1.3-event-kbd", - "/dev/input/event3" + "/dev/input/by-id/usb-Ducky_Ducky_One_3_SF_RGB_DK-V1.11-220819-event-if04", + "/dev/input/by-path/pci-0000:00:14.0-usb-0:3.3:1.4-event", + "/dev/input/by-path/pci-0000:00:14.0-usbv2-0:3.3:1.4-event", + "/dev/input/event4" ], "resources": [ { @@ -2507,8 +2516,8 @@ "name": "per_interface", "value": 0 }, - "interface_protocol": 1, - "interface_number": 3, + "interface_protocol": 0, + "interface_number": 4, "interface_alternate_setting": 0 }, "hotplug": "usb", @@ -2520,11 +2529,11 @@ "driver_modules": [ "usbhid" ], - "module_alias": "usb:v3233p5311d0000dc00dsc00dp00ic03isc00ip01in03" + "module_alias": "usb:v3233p5311d0000dc00dsc00dp00ic03isc00ip00in04" }, { - "index": 30, - "attached_to": 29, + "index": 32, + "attached_to": 24, "class_list": [ "usb", "unknown" @@ -2560,20 +2569,20 @@ }, "serial": "DK-V1.11-220819", "model": "Ducky One 3 SF RGB", - "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-4/3-4.3/3-4.3:1.1", - "sysfs_bus_id": "3-4.3:1.1", - "unix_device_name": "/dev/input/event1", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-3/3-3.3/3-3.3:1.0", + "sysfs_bus_id": "3-3.3:1.0", + "unix_device_name": "/dev/input/js0", "unix_device_number": { "type": 99, "major": 13, - "minor": 65, + "minor": 0, "range": 1 }, "unix_device_names": [ - "/dev/input/by-id/usb-Ducky_Ducky_One_3_SF_RGB_DK-V1.11-220819-if01-event-kbd", - "/dev/input/by-path/pci-0000:00:14.0-usb-0:4.3:1.1-event-kbd", - "/dev/input/by-path/pci-0000:00:14.0-usbv2-0:4.3:1.1-event-kbd", - "/dev/input/event1" + "/dev/input/by-id/usb-Ducky_Ducky_One_3_SF_RGB_DK-V1.11-220819-joystick", + "/dev/input/by-path/pci-0000:00:14.0-usb-0:3.3:1.0-joystick", + "/dev/input/by-path/pci-0000:00:14.0-usbv2-0:3.3:1.0-joystick", + "/dev/input/js0" ], "resources": [ { @@ -2607,8 +2616,8 @@ "name": "per_interface", "value": 0 }, - "interface_protocol": 1, - "interface_number": 1, + "interface_protocol": 0, + "interface_number": 0, "interface_alternate_setting": 0 }, "hotplug": "usb", @@ -2620,11 +2629,11 @@ "driver_modules": [ "usbhid" ], - "module_alias": "usb:v3233p5311d0000dc00dsc00dp00ic03isc00ip01in01" + "module_alias": "usb:v3233p5311d0000dc00dsc00dp00ic03isc00ip00in00" }, { "index": 35, - "attached_to": 29, + "attached_to": 24, "class_list": [ "usb", "unknown" @@ -2649,32 +2658,23 @@ "value": 0 }, "vendor": { - "hex": "3233", - "name": "Ducky", - "value": 12851 + "hex": "046d", + "name": "Logitech Inc.", + "value": 1133 }, "device": { - "hex": "5311", - "name": "Ducky One 3 SF RGB", - "value": 21265 + "hex": "c52b", + "name": "USB Receiver", + "value": 50475 }, - "serial": "DK-V1.11-220819", - "model": "Ducky One 3 SF RGB", - "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-4/3-4.3/3-4.3:1.4", - "sysfs_bus_id": "3-4.3:1.4", - "unix_device_name": "/dev/input/event4", - "unix_device_number": { - "type": 99, - "major": 13, - "minor": 68, - "range": 1 + "revision": { + "hex": "0000", + "name": "24.11", + "value": 0 }, - "unix_device_names": [ - "/dev/input/by-id/usb-Ducky_Ducky_One_3_SF_RGB_DK-V1.11-220819-event-if04", - "/dev/input/by-path/pci-0000:00:14.0-usb-0:4.3:1.4-event", - "/dev/input/by-path/pci-0000:00:14.0-usbv2-0:4.3:1.4-event", - "/dev/input/event4" - ], + "model": "Logitech USB Receiver", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-3/3-3.4/3-3.4:1.2", + "sysfs_bus_id": "3-3.4:1.2", "resources": [ { "type": "baud", @@ -2708,7 +2708,7 @@ "value": 0 }, "interface_protocol": 0, - "interface_number": 4, + "interface_number": 2, "interface_alternate_setting": 0 }, "hotplug": "usb", @@ -2720,11 +2720,11 @@ "driver_modules": [ "usbhid" ], - "module_alias": "usb:v3233p5311d0000dc00dsc00dp00ic03isc00ip00in04" + "module_alias": "usb:v046DpC52Bd2411dc00dsc00dp00ic03isc00ip00in02" }, { - "index": 37, - "attached_to": 29, + "index": 39, + "attached_to": 24, "class_list": [ "usb", "unknown" @@ -2760,20 +2760,20 @@ }, "serial": "DK-V1.11-220819", "model": "Ducky One 3 SF RGB", - "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-4/3-4.3/3-4.3:1.0", - "sysfs_bus_id": "3-4.3:1.0", - "unix_device_name": "/dev/input/js0", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-3/3-3.3/3-3.3:1.3", + "sysfs_bus_id": "3-3.3:1.3", + "unix_device_name": "/dev/input/event3", "unix_device_number": { "type": 99, "major": 13, - "minor": 0, + "minor": 67, "range": 1 }, "unix_device_names": [ - "/dev/input/by-id/usb-Ducky_Ducky_One_3_SF_RGB_DK-V1.11-220819-joystick", - "/dev/input/by-path/pci-0000:00:14.0-usb-0:4.3:1.0-joystick", - "/dev/input/by-path/pci-0000:00:14.0-usbv2-0:4.3:1.0-joystick", - "/dev/input/js0" + "/dev/input/by-id/usb-Ducky_Ducky_One_3_SF_RGB_DK-V1.11-220819-if03-event-kbd", + "/dev/input/by-path/pci-0000:00:14.0-usb-0:3.3:1.3-event-kbd", + "/dev/input/by-path/pci-0000:00:14.0-usbv2-0:3.3:1.3-event-kbd", + "/dev/input/event3" ], "resources": [ { @@ -2807,8 +2807,8 @@ "name": "per_interface", "value": 0 }, - "interface_protocol": 0, - "interface_number": 0, + "interface_protocol": 1, + "interface_number": 3, "interface_alternate_setting": 0 }, "hotplug": "usb", @@ -2820,7 +2820,7 @@ "driver_modules": [ "usbhid" ], - "module_alias": "usb:v3233p5311d0000dc00dsc00dp00ic03isc00ip00in00" + "module_alias": "usb:v3233p5311d0000dc00dsc00dp00ic03isc00ip01in03" } ], "usb_controller": [ -- cgit v1.2.3