diff --git a/flake.lock b/flake.lock index 54f5c0c..1e8b299 100644 --- a/flake.lock +++ b/flake.lock @@ -79,11 +79,11 @@ ] }, "locked": { - "lastModified": 1728330715, - "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", + "lastModified": 1735644329, + "narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=", "owner": "numtide", "repo": "devshell", - "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", + "rev": "f7795ede5b02664b57035b3b757876703e2c3eac", "type": "github" }, "original": { @@ -99,11 +99,11 @@ ] }, "locked": { - "lastModified": 1732645828, - "narHash": "sha256-+4U2I2653JvPFxcux837ulwYS864QvEueIljUkwytsk=", + "lastModified": 1736711425, + "narHash": "sha256-8hKhPQuMtXfJi+4lPvw3FBk/zSJVHeb726Zo0uF1PP8=", "owner": "nix-community", "repo": "disko", - "rev": "869ba3a87486289a4197b52a6c9e7222edf00b3e", + "rev": "f720e64ec37fa16ebba6354eadf310f81555cc07", "type": "github" }, "original": { @@ -143,11 +143,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1732593794, - "narHash": "sha256-VhS+81/eTDiin5ULZLWvqI+9ggI+qXNUSvi3dIQfBX4=", + "lastModified": 1736913802, + "narHash": "sha256-72be03HWS5Q8I1W9hlWRVicZxL5MJURVKbnJGIcbjIE=", "owner": "rycee", "repo": "nur-expressions", - "rev": "9b7d4fb4739c0bf808d31e2b66b337f1234e4447", + "rev": "79a77a7d0b22e82d52a90055cc8206447ab85285", "type": "gitlab" }, "original": { @@ -238,11 +238,11 @@ ] }, "locked": { - "lastModified": 1726153070, - "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -259,11 +259,11 @@ ] }, "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "lastModified": 1736143030, + "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", "type": "github" }, "original": { @@ -333,18 +333,14 @@ "nixpkgs": [ "nixvim", "nixpkgs" - ], - "nixpkgs-stable": [ - "nixvim", - "nixpkgs" ] }, "locked": { - "lastModified": 1732021966, - "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=", + "lastModified": 1735882644, + "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "3308484d1a443fc5bc92012435d79e80458fe43c", + "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", "type": "github" }, "original": { @@ -382,11 +378,11 @@ ] }, "locked": { - "lastModified": 1732482255, - "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=", + "lastModified": 1736785676, + "narHash": "sha256-TY0jUwR3EW0fnS0X5wXMAVy6h4Z7Y6a3m+Yq++C9AyE=", "owner": "nix-community", "repo": "home-manager", - "rev": "a9953635d7f34e7358d5189751110f87e3ac17da", + "rev": "fc52a210b60f2f52c74eac41a8647c1573d2071d", "type": "github" }, "original": { @@ -397,11 +393,11 @@ }, "impermanence": { "locked": { - "lastModified": 1731242966, - "narHash": "sha256-B3C3JLbGw0FtLSWCjBxU961gLNv+BOOBC6WvstKLYMw=", + "lastModified": 1736688610, + "narHash": "sha256-1Zl9xahw399UiZSJ9Vxs1W4WRFjO1SsNdVZQD4nghz0=", "owner": "nix-community", "repo": "impermanence", - "rev": "3ed3f0eaae9fcc0a8331e77e9319c8a4abd8a71a", + "rev": "c64bed13b562fc3bb454b48773d4155023ac31b7", "type": "github" }, "original": { @@ -496,11 +492,11 @@ ] }, "locked": { - "lastModified": 1732324260, - "narHash": "sha256-0xzQvoId/P008QkTSAdFVv465P9rL9nYkIOWXL5pdsY=", + "lastModified": 1736370755, + "narHash": "sha256-iWcjToBpx4PUd74uqvIGAfqqVfyrvRLRauC/SxEKIF0=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "698a62c628c2ec423aa770d8ec0e1d0bcf4fca1a", + "rev": "57733bd1dc81900e13438e5b4439239f1b29db0e", "type": "github" }, "original": { @@ -511,11 +507,11 @@ }, "nixlib": { "locked": { - "lastModified": 1732410305, - "narHash": "sha256-/hxIKRTBsdrnudJWDGaBN8wIjHovqVAVxXdi8ByVtck=", + "lastModified": 1736643958, + "narHash": "sha256-tmpqTSWVRJVhpvfSN9KXBvKEXplrwKnSZNAoNPf/S/s=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "87b6978992e2eb605732fba842cad0a7e14b2047", + "rev": "1418bc28a52126761c02dd3d89b2d8ca0f521181", "type": "github" }, "original": { @@ -538,11 +534,11 @@ "treefmt-nix": "treefmt-nix_3" }, "locked": { - "lastModified": 1731763758, - "narHash": "sha256-zcoxeMRGPpOd46dLeo2bgGLkjW5w50VC5DwZlvZD+A4=", + "lastModified": 1735024884, + "narHash": "sha256-aoTJqEImmpgsol+TyDASuyHW6tuL7NIS8gusUJ/kxyk=", "owner": "nix-community", "repo": "nixos-anywhere", - "rev": "80a2e7d6d9816a80fd412befd5f173836e675185", + "rev": "97b45ac774699b1cfd267e98a8bdecb74bace593", "type": "github" }, "original": { @@ -569,15 +565,15 @@ }, "nixos-facter-modules_2": { "locked": { - "lastModified": 1732288619, - "narHash": "sha256-zSQ2cR+NRJfHUVfkv+O6Wi53wXfzX8KHiO8fRfnvc0M=", - "owner": "numtide", + "lastModified": 1736931726, + "narHash": "sha256-aY55yiifyo1XPPpbpH0kWlV1g2dNGBlx6622b7OK8ks=", + "owner": "nix-community", "repo": "nixos-facter-modules", - "rev": "862648589993a96480c2255197a28feea712f68f", + "rev": "fa11d87b61b2163efbb9aed7b7a5ae0299e5ab9c", "type": "github" }, "original": { - "owner": "numtide", + "owner": "nix-community", "repo": "nixos-facter-modules", "type": "github" } @@ -590,11 +586,11 @@ ] }, "locked": { - "lastModified": 1732496924, - "narHash": "sha256-/MNhZLR0eh9z/d3l+ammq+F5XxHln0RHgO4Bhtjr0IM=", + "lastModified": 1736730523, + "narHash": "sha256-mvTZ7fLKA6ggGnA8GZwcXV57EvVReRTCfi26xc08Q3g=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "098e8b6ff72c86944a8d54b64ddd7b7e6635830a", + "rev": "74b8e31dd709760c86eed16b6c1d0b88d7360937", "type": "github" }, "original": { @@ -605,11 +601,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1732483221, - "narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=", + "lastModified": 1736441705, + "narHash": "sha256-OL7leZ6KBhcDF3nEKe4aZVfIm6xQpb1Kb+mxySIP93o=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405", + "rev": "8870dcaff63dfc6647fb10648b827e9d40b0a337", "type": "github" }, "original": { @@ -630,11 +626,11 @@ ] }, "locked": { - "lastModified": 1727367213, - "narHash": "sha256-7O4pi8MmcJpA0nYUQkdolvKGyu6zNjf2gFYD1Q0xppc=", + "lastModified": 1734098258, + "narHash": "sha256-3mzGstXtPqt+zWzXqesgQ2haEI6LNCFhc/uU3Bcj6Ak=", "owner": "nix-community", "repo": "nixos-images", - "rev": "3e7978bab153f39f3fc329ad346d35a8871420f7", + "rev": "231f5f6370e78d04675c9fa8199be6c3b1b85773", "type": "github" }, "original": { @@ -645,48 +641,48 @@ }, "nixos-stable": { "locked": { - "lastModified": 1727264057, - "narHash": "sha256-KQPI8CTTnB9CrJ7LrmLC4VWbKZfljEPBXOFGZFRpxao=", + "lastModified": 1733808091, + "narHash": "sha256-KWwINTQelKOoQgrXftxoqxmKFZb9pLVfnRvK270nkVk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "759537f06e6999e141588ff1c9be7f3a5c060106", + "rev": "a0f3e10d94359665dba45b71b4227b0aeb851f8e", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", - "owner": "NixOS", + "lastModified": 1736798957, + "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-24_05": { + "nixpkgs-24_11": { "locked": { - "lastModified": 1717144377, - "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=", + "lastModified": 1734083684, + "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "805a384895c696f802a9bf5bf4720f37385df547", + "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "type": "indirect" } }, @@ -707,11 +703,11 @@ "treefmt-nix": "treefmt-nix_4" }, "locked": { - "lastModified": 1732629460, - "narHash": "sha256-Cr8EyxEFPbVmX6p8LsslFBjDEuVlFNPILrWlwbBNnNA=", + "lastModified": 1736961674, + "narHash": "sha256-nuOFHtSUHYsb6PHueFF9KPLS8v+Wi+wGCXZCI+J54QI=", "owner": "nix-community", "repo": "nixvim", - "rev": "8b19d154823619af7ced464185e8d13ec80a758b", + "rev": "54e6dbd8c83586d9553f61c21fa639b500e51f93", "type": "github" }, "original": { @@ -729,11 +725,11 @@ ] }, "locked": { - "lastModified": 1731936508, - "narHash": "sha256-z0BSSf78LkxIrrFXZYmCoRRAxAmxMUKpK7CyxQRvkZI=", + "lastModified": 1735854821, + "narHash": "sha256-Iv59gMDZajNfezTO0Fw6LHE7uKAShxbvMidmZREit7c=", "owner": "NuschtOS", "repo": "search", - "rev": "fe07070f811b717a4626d01fab714a87d422a9e1", + "rev": "836908e3bddd837ae0f13e215dd48767aee355f0", "type": "github" }, "original": { @@ -752,11 +748,11 @@ ] }, "locked": { - "lastModified": 1731936508, - "narHash": "sha256-z0BSSf78LkxIrrFXZYmCoRRAxAmxMUKpK7CyxQRvkZI=", + "lastModified": 1735854821, + "narHash": "sha256-Iv59gMDZajNfezTO0Fw6LHE7uKAShxbvMidmZREit7c=", "owner": "NuschtOS", "repo": "search", - "rev": "fe07070f811b717a4626d01fab714a87d422a9e1", + "rev": "836908e3bddd837ae0f13e215dd48767aee355f0", "type": "github" }, "original": { @@ -792,14 +788,14 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-24_05": "nixpkgs-24_05" + "nixpkgs-24_11": "nixpkgs-24_11" }, "locked": { - "lastModified": 1722877200, - "narHash": "sha256-qgKDNJXs+od+1UbRy62uk7dYal3h98I4WojfIqMoGcg=", + "lastModified": 1735230346, + "narHash": "sha256-zgR8NTiNDPVNrfaiOlB9yHSmCqFDo7Ks2IavaJ2dZo4=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "af7d3bf5daeba3fc28089b015c0dd43f06b176f2", + "rev": "dc0569066e79ae96184541da6fa28f35a33fbf7b", "type": "gitlab" }, "original": { @@ -841,11 +837,11 @@ ] }, "locked": { - "lastModified": 1732575825, - "narHash": "sha256-xtt95+c7OUMoqZf4OvA/7AemiH3aVuWHQbErYQoPwFk=", + "lastModified": 1736808430, + "narHash": "sha256-wlgdf/n7bJMLBheqt1jmPoxJFrUP6FByKQFXuM9YvIk=", "owner": "Mic92", "repo": "sops-nix", - "rev": "3433ea14fbd9e6671d0ff0dd45ed15ee4c156ffa", + "rev": "553c7cb22fed19fd60eb310423fdc93045c51ba8", "type": "github" }, "original": { @@ -861,11 +857,11 @@ ] }, "locked": { - "lastModified": 1732570520, - "narHash": "sha256-ANPZf+osgErYUs27N7ItYovc0d/TJKwOpMtlpk6W9+M=", + "lastModified": 1736810122, + "narHash": "sha256-29Mp0xa3jXF33Qu92hd/uPz1HZWBestpEKmgG4RyzCo=", "owner": "nix-community", "repo": "srvos", - "rev": "0ba8119cd4077eaea0f2406b8e1ec491429b8fc4", + "rev": "61cc2047ad1a4c52ef18d117ac8e6ccfc0e38ea5", "type": "github" }, "original": { @@ -970,11 +966,11 @@ ] }, "locked": { - "lastModified": 1727252110, - "narHash": "sha256-3O7RWiXpvqBcCl84Mvqa8dXudZ1Bol1ubNdSmQt7nF4=", + "lastModified": 1733761991, + "narHash": "sha256-s4DalCDepD22jtKL5Nw6f4LP5UwoMcPzPZgHWjAfqbQ=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "1bff2ba6ec22bc90e9ad3f7e94cca0d37870afa3", + "rev": "0ce9d149d99bc383d1f2d85f31f6ebd146e46085", "type": "github" }, "original": { @@ -991,11 +987,11 @@ ] }, "locked": { - "lastModified": 1732292307, - "narHash": "sha256-5WSng844vXt8uytT5djmqBCkopyle6ciFgteuA9bJpw=", + "lastModified": 1736154270, + "narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "705df92694af7093dfbb27109ce16d828a79155f", + "rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b", "type": "github" }, "original": { @@ -1011,11 +1007,11 @@ ] }, "locked": { - "lastModified": 1732643199, - "narHash": "sha256-uI7TXEb231o8dkwB5AUCecx3AQtosRmL6hKgnckvjps=", + "lastModified": 1736154270, + "narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "84637a7ab04179bdc42aa8fd0af1909fba76ad0c", + "rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index d9c2f64..6fed9f5 100644 --- a/flake.nix +++ b/flake.nix @@ -2,8 +2,8 @@ description = "jopejoe1 NixOS configuration"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - nixos-facter-modules.url = "github:numtide/nixos-facter-modules"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixos-facter-modules.url = "github:nix-community/nixos-facter-modules"; # Outputs nixos-generators = { diff --git a/home-modules/git/default.nix b/home-modules/git/default.nix index af6723f..a47c7f5 100644 --- a/home-modules/git/default.nix +++ b/home-modules/git/default.nix @@ -18,7 +18,7 @@ in programs.git = { enable = true; package = pkgs.git; - userEmail = "johannes@joens.email"; + userEmail = "jopejoe1@missing.ninja"; userName = "jopejoe1"; extraConfig = { core = { diff --git a/nixos-modules/boot/systemd/default.nix b/nixos-modules/boot/systemd/default.nix index d205795..91a709a 100644 --- a/nixos-modules/boot/systemd/default.nix +++ b/nixos-modules/boot/systemd/default.nix @@ -13,7 +13,7 @@ in loader = { systemd-boot = { enable = true; - configurationLimit = 10; + configurationLimit = 5; editor = false; }; efi = { diff --git a/nixos-modules/printing/default.nix b/nixos-modules/printing/default.nix index d72a43d..5bda132 100644 --- a/nixos-modules/printing/default.nix +++ b/nixos-modules/printing/default.nix @@ -17,7 +17,7 @@ in services.printing = { enable = true; webInterface = true; - drivers = with pkgs; [ ]; + drivers = with pkgs; [ hplip ]; }; hardware = { @@ -30,6 +30,7 @@ in services.avahi = { enable = true; nssmdns4 = true; + nssmdns6 = true; openFirewall = true; }; }; diff --git a/nixos-modules/sops/default.nix b/nixos-modules/sops/default.nix index 33bc526..b87ee47 100644 --- a/nixos-modules/sops/default.nix +++ b/nixos-modules/sops/default.nix @@ -11,7 +11,9 @@ let in { options.jopejoe1.sops = { - enable = (lib.mkEnableOption "Enable sops") // { default = true;}; + enable = (lib.mkEnableOption "Enable sops") // { + default = true; + }; }; config = lib.mkIf cfg.enable { diff --git a/nixos-modules/users/jopejoe1/default.nix b/nixos-modules/users/jopejoe1/default.nix index 56d1173..ce4e99d 100644 --- a/nixos-modules/users/jopejoe1/default.nix +++ b/nixos-modules/users/jopejoe1/default.nix @@ -18,7 +18,7 @@ in users.users.jopejoe1 = { isNormalUser = true; shell = pkgs.nushell; - description = "Johannes Jöns"; + description = "jopejoe1"; hashedPassword = "$2b$05$Uk84TY/RHlH8DIigUlFYjeorjTlCMEY9wN2pAcw5BLaPoc7dKiSsC"; extraGroups = [ "wheel" diff --git a/systems/benzaiten/default.nix b/systems/benzaiten/default.nix index 7323b74..48742f0 100644 --- a/systems/benzaiten/default.nix +++ b/systems/benzaiten/default.nix @@ -10,8 +10,8 @@ ./hardware-configuration.nix nixos-hardware.nixosModules.common-cpu-intel #nixos-hardware.nixosModules.common-gpu-nvidia - nixos-hardware.nixosModules.common-pc-laptop - nixos-hardware.nixosModules.common-pc-laptop-hdd + #nixos-hardware.nixosModules.common-pc-laptop + #nixos-hardware.nixosModules.common-pc-laptop-hdd ]; facter.reportPath = ./facter.json; diff --git a/systems/hetzner/default.nix b/systems/hetzner/default.nix index dc39ce2..f04fd6b 100644 --- a/systems/hetzner/default.nix +++ b/systems/hetzner/default.nix @@ -6,6 +6,9 @@ ... }: +let + network_interface_name = (lib.elemAt config.facter.report.hardware.network_interface 0).unix_device_name; +in { imports = [ @@ -40,10 +43,36 @@ }; }; - networking.firewall = { - enable = true; - allowedTCPPorts = [ 21 80 ]; - allowedUDPPorts = [ 21 80 ]; + networking = { + firewall = { + enable = true; + allowedTCPPorts = [ + 21 + 80 + ]; + allowedUDPPorts = [ + 21 + 80 + ]; + }; + bridges.br0.interfaces = [ + network_interface_name + ]; + useDHCP = false; + interfaces."br0" = { + useDHCP = true; + ipv4.addresses = [ + { + address = "192.168.100.3"; + prefixLength = 24; + } + ]; + }; + defaultGateway = { + address = "192.168.100.1"; + interface = network_interface_name; + }; + nameservers = [ "192.168.100.1" ]; }; systemd.network.networks."10-uplink".networkConfig.Address = "2a01:4f8:a0:31e5::/64"; @@ -66,6 +95,36 @@ chrootlocalUser = true; }; + services.akkoma = { + enable = true; + package = pkgs.akkoma.overrideAttrs (finalAttrs: previousAttrs: { + patches = [ + (pkgs.fetchpatch2 { + url = "https://akkoma.dev/AkkomaGang/akkoma/pulls/846.patch"; + hash = "sha256-KTv7YKzSAzLqBnG22EIbIiX4B5D4WUYT9FzZCb4CYrU="; + }) + ]; + }); + nginx = { + enableACME = true; + forceSSL = true; + }; + config = { + ":pleroma" = { + ":instance" = { + name = "Nyan Social"; + description = "More detailed description"; + email = "admin@nyan.social"; + registration_open = false; + }; + "Pleroma.Web.Endpoint" = { + url.host = "nyan.social"; + }; + "Pleroma.Upload".base_url = "https://nyan.social/media/"; + }; + }; + }; + users.users.backupftp = { isNormalUser = true; initialPassword = "backupPassword"; diff --git a/systems/hetzner/mail.nix b/systems/hetzner/mail.nix index 0ade0e1..4312983 100644 --- a/systems/hetzner/mail.nix +++ b/systems/hetzner/mail.nix @@ -25,6 +25,9 @@ "net0loggy.de" "dtg-c.de" "joens.email" + "nyan.social" + "miau.social" + "pumkin.social" ]; # A list of all login accounts. To create the password hashes, use @@ -48,6 +51,9 @@ "@net0loggy.de" "@dtg-c.de" "@joens.email" + "@nyan.social" + "@miau.social" + "@pumpkin.social" ]; }; }; diff --git a/systems/hetzner/nginx.nix b/systems/hetzner/nginx.nix index d81a24c..3c4ecc9 100644 --- a/systems/hetzner/nginx.nix +++ b/systems/hetzner/nginx.nix @@ -58,7 +58,8 @@ "cache.missing.ninja" = { forceSSL = true; enableACME = true; - locations."/".proxyPass = "http://${config.services.nix-serve.bindAddress}:${toString config.services.nix-serve.port}"; + locations."/".proxyPass = + "http://${config.services.nix-serve.bindAddress}:${toString config.services.nix-serve.port}"; }; "nix.missing.ninja" = { forceSSL = true; @@ -71,15 +72,6 @@ specialArgs.modulesPath = pkgs.path + "/nixos/modules"; urlPrefix = "https://github.com/nix-community/disko/blob/master/"; } - { - modules = lib.attrValues self.inputs.nixos-hardware.nixosModules; - name = "NixOS Hardware"; - specialArgs = { - modulesPath = pkgs.path + "/nixos/modules"; - inherit pkgs; - }; - urlPrefix = "https://github.com/NixOS/nixos-hardware/blob/master/"; - } { modules = [ self.inputs.snm.nixosModules.default @@ -98,23 +90,29 @@ urlPrefix = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/blob/master/"; } { - optionsJSON = (import "${self.inputs.nixpkgs}/nixos/release.nix" { }).options + /share/doc/nixos/options.json; + optionsJSON = + (import "${self.inputs.nixpkgs}/nixos/release.nix" { }).options + /share/doc/nixos/options.json; name = "NixOS"; urlPrefix = "https://github.com/NixOS/nixpkgs/tree/master/"; } { - optionsJSON = self.inputs.home-manager.packages.${pkgs.stdenv.system}.docs-html.passthru.home-manager-options.nixos + /share/doc/nixos/options.json; + optionsJSON = + self.inputs.home-manager.packages.${pkgs.stdenv.system}.docs-html.passthru.home-manager-options.nixos + + /share/doc/nixos/options.json; name = "Home Manager NixOS"; urlPrefix = "https://github.com/nix-community/home-manager/tree/master/"; } { - optionsJSON = self.inputs.home-manager.packages.${pkgs.stdenv.system}.docs-json + /share/doc/home-manager/options.json; + optionsJSON = + self.inputs.home-manager.packages.${pkgs.stdenv.system}.docs-json + + /share/doc/home-manager/options.json; optionsPrefix = "home-manager.users."; name = "Home Manager"; urlPrefix = "https://github.com/nix-community/home-manager/tree/master/"; } { - optionsJSON = self.inputs.nixvim.packages.${pkgs.stdenv.system}.options-json + /share/doc/nixos/options.json; + optionsJSON = + self.inputs.nixvim.packages.${pkgs.stdenv.system}.options-json + /share/doc/nixos/options.json; optionsPrefix = "programs.nixvim"; name = "NixVim"; urlPrefix = "https://github.com/nix-community/nixvim/tree/main/"; diff --git a/systems/kuraokami/default.nix b/systems/kuraokami/default.nix index 3deed70..9b3957a 100644 --- a/systems/kuraokami/default.nix +++ b/systems/kuraokami/default.nix @@ -50,15 +50,22 @@ networking = { hostId = "16c22faf"; + firewall = { + allowedTCPPorts = [ 8080 ]; + allowedUDPPorts = [ 8080 ]; + }; }; services = { hardware.openrgb = { enable = true; }; + zerotierone.joinNetworks = [ + "d5e5fb653774ee43" + ]; postgresql = { enable = true; - extraPlugins = ps: with ps; [ pg_libversion ]; + extensions = ps: with ps; [ pg_libversion ]; enableTCPIP = true; initialScript = pkgs.writeText "backend-initScript" '' CREATE DATABASE repology @@ -77,6 +84,10 @@ openFirewall = true; secretKeyFile = "/var/cache-priv-key.pem"; }; + shairport-sync = { + enable = true; + package = pkgs.shairport-sync-airplay2; + }; }; nixpkgs = { @@ -105,11 +116,11 @@ environment.systemPackages = with pkgs; [ prismlauncher picard - mixxx + #mixxx goverlay strawberry-qt6 - jitsi-meet-electron thunderbird + gh (ffmpeg-full.override { #withTensorflow = true; withUnfree = true; diff --git a/systems/omoikane/default.nix b/systems/omoikane/default.nix index fa3722e..1bd54d1 100644 --- a/systems/omoikane/default.nix +++ b/systems/omoikane/default.nix @@ -65,6 +65,10 @@ udev.packages = [ pkgs.yubikey-personalization ]; fwupd.enable = true; libinput.enable = true; + #repology.enable = true; + zerotierone.joinNetworks = [ + "d5e5fb653774ee43" + ]; }; time.timeZone = "Europe/Berlin"; @@ -79,7 +83,6 @@ environment.systemPackages = with pkgs; [ prismlauncher - goverlay thunderbird strawberry-qt6 picard @@ -106,14 +109,16 @@ "nixos-test" ]; + networking.firewall = { + allowedTCPPorts = [ 8080 ]; + allowedUDPPorts = [ 8080 ]; + }; + boot.binfmt.emulatedSystems = [ "riscv64-linux" "aarch64-linux" "armv6l-linux" ]; - boot.plymouth = { - enable = true; - }; boot.initrd.systemd.enable = true; programs.captive-browser = { diff --git a/systems/omoikane/disk.nix b/systems/omoikane/disk.nix index 06fd1be..4d56549 100644 --- a/systems/omoikane/disk.nix +++ b/systems/omoikane/disk.nix @@ -1,4 +1,4 @@ -{...}: +{ ... }: { disko.devices = { disk = { diff --git a/systems/omoikane/facter.json b/systems/omoikane/facter.json index b0215b0..77908e1 100644 --- a/systems/omoikane/facter.json +++ b/systems/omoikane/facter.json @@ -23,8 +23,8 @@ }, "bluetooth": [ { - "index": 79, - "attached_to": 87, + "index": 80, + "attached_to": 89, "class_list": [ "usb", "bluetooth" @@ -125,8 +125,8 @@ "module_alias": "usb:v0E8DpE616d0100dcEFdsc02dp01icE0isc01ip01in01" }, { - "index": 93, - "attached_to": 87, + "index": 94, + "attached_to": 89, "class_list": [ "usb", "bluetooth" @@ -216,19 +216,11 @@ } }, "hotplug": "usb", - "driver": "btusb", - "driver_module": "btusb", - "drivers": [ - "btusb" - ], - "driver_modules": [ - "btusb" - ], "module_alias": "usb:v0E8DpE616d0100dcEFdsc02dp01icE0isc01ip01in02" }, { "index": 97, - "attached_to": 87, + "attached_to": 89, "class_list": [ "usb", "bluetooth" @@ -2066,11 +2058,12 @@ "decodeassists", "pausefilter", "pfthreshold", - "v_vmsave_vmload", "vgif", "x2avic", "v_spec_ctrl", - "vn" + "vnmi", + "avx512vbmi", + "um" ], "bugs": [ "sysret_ss_attrs", @@ -2090,7 +2083,7 @@ "[14]", "[15]" ], - "bogo": 7985.06, + "bogo": 7985.41, "cache": 1024, "units": 16, "physical_id": 0, @@ -2171,7 +2164,9 @@ "/dev/disk/by-id/nvme-WD_BLACK_SN770M_500GB_233104400961", "/dev/disk/by-id/nvme-WD_BLACK_SN770M_500GB_233104400961_1", "/dev/disk/by-id/nvme-eui.e8238fa6bf530001001b444a48dc22ef", + "/dev/disk/by-label/framework_root", "/dev/disk/by-path/pci-0000:04:00.0-nvme-1", + "/dev/disk/by-uuid/74c6ec50-88b4-41a8-91fc-c58f4c718d6e", "/dev/nvme0n1" ], "resources": [ @@ -2201,6 +2196,103 @@ }, { "index": 69, + "attached_to": 24, + "class_list": [ + "disk", + "usb", + "scsi", + "block_device" + ], + "bus_type": { + "hex": "0084", + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "0106", + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "hex": "0000", + "name": "Disk", + "value": 0 + }, + "vendor": { + "hex": "090c", + "name": "SMI", + "value": 2316 + }, + "device": { + "hex": "1000", + "name": "USB DISK", + "value": 4096 + }, + "revision": { + "hex": "0000", + "name": "1100", + "value": 0 + }, + "serial": "SM3350", + "model": "SMI USB DISK", + "sysfs_id": "/class/block/sdb", + "sysfs_bus_id": "0:0:0:0", + "sysfs_device_link": "/devices/pci0000:00/0000:00:08.1/0000:c5:00.3/usb2/2-2/2-2.2/2-2.2:1.0/host0/target0:0:0/0:0:0:0", + "unix_device_name": "/dev/sdb", + "unix_device_number": { + "type": 98, + "major": 8, + "minor": 16, + "range": 16 + }, + "unix_device_names": [ + "/dev/disk/by-diskseq/14", + "/dev/disk/by-id/usb-SMI_USB_DISK_AA00000000015055-0:0", + "/dev/disk/by-path/pci-0000:c5:00.3-usb-0:2.2:1.0-scsi-0:0:0:0", + "/dev/disk/by-path/pci-0000:c5:00.3-usbv3-0:2.2:1.0-scsi-0:0:0:0", + "/dev/sdb" + ], + "unix_device_name2": "/dev/sg1", + "unix_device_number2": { + "type": 99, + "major": 21, + "minor": 1, + "range": 1 + }, + "resources": [ + { + "type": "disk_geo", + "cylinders": 31107, + "heads": 255, + "sectors": 63, + "size": 0, + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 499744768, + "value_2": 512 + } + ], + "driver": "usb-storage", + "driver_module": "usb_storage", + "drivers": [ + "sd", + "usb-storage" + ], + "driver_modules": [ + "sd_mod", + "usb_storage" + ], + "module_alias": "usb:v090Cp1000d1100dc00dsc00dp00ic08isc06ip50in00" + }, + { + "index": 70, "attached_to": 46, "class_list": [ "disk", @@ -2289,7 +2381,7 @@ ] }, { - "index": 70, + "index": 71, "attached_to": 24, "class_list": [ "disk", @@ -2303,7 +2395,7 @@ "value": 132 }, "slot": { - "bus": 0, + "bus": 1, "number": 0 }, "base_class": { @@ -2334,8 +2426,8 @@ "serial": "071C4350011FA939", "model": "FRMW 1TB Card", "sysfs_id": "/class/block/sda", - "sysfs_bus_id": "0:0:0:0", - "sysfs_device_link": "/devices/pci0000:00/0000:00:08.1/0000:c5:00.3/usb2/2-2/2-2.3/2-2.3:1.0/host0/target0:0:0/0:0:0:0", + "sysfs_bus_id": "1:0:0:0", + "sysfs_device_link": "/devices/pci0000:00/0000:00:08.1/0000:c5:00.3/usb2/2-2/2-2.3/2-2.3:1.0/host1/target1:0:0/1:0:0:0", "unix_device_name": "/dev/sda", "unix_device_number": { "type": 98, @@ -2629,7 +2721,7 @@ ], "hub": [ { - "index": 71, + "index": 72, "attached_to": 58, "class_list": [ "usb", @@ -2651,7 +2743,7 @@ }, "vendor": { "hex": "1d6b", - "name": "Linux 6.11.5 xhci-hcd", + "name": "Linux 6.12.8 xhci-hcd", "value": 7531 }, "device": { @@ -2661,11 +2753,11 @@ }, "revision": { "hex": "0000", - "name": "6.11", + "name": "6.12", "value": 0 }, "serial": "0000:c7:00.3", - "model": "Linux 6.11.5 xhci-hcd xHCI Host Controller", + "model": "Linux 6.12.8 xhci-hcd xHCI Host Controller", "sysfs_id": "/devices/pci0000:00/0000:00:08.3/0000:c7:00.3/usb6/6-0:1.0", "sysfs_bus_id": "6-0:1.0", "detail": { @@ -2699,11 +2791,11 @@ "drivers": [ "hub" ], - "module_alias": "usb:v1D6Bp0003d0611dc09dsc00dp03ic09isc00ip00in00" + "module_alias": "usb:v1D6Bp0003d0612dc09dsc00dp03ic09isc00ip00in00" }, { "index": 74, - "attached_to": 87, + "attached_to": 89, "class_list": [ "usb", "hub" @@ -2806,7 +2898,7 @@ }, "vendor": { "hex": "1d6b", - "name": "Linux 6.11.5 xhci-hcd", + "name": "Linux 6.12.8 xhci-hcd", "value": 7531 }, "device": { @@ -2816,11 +2908,11 @@ }, "revision": { "hex": "0000", - "name": "6.11", + "name": "6.12", "value": 0 }, "serial": "0000:c5:00.4", - "model": "Linux 6.11.5 xhci-hcd xHCI Host Controller", + "model": "Linux 6.12.8 xhci-hcd xHCI Host Controller", "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:c5:00.4/usb3/3-0:1.0", "sysfs_bus_id": "3-0:1.0", "resources": [ @@ -2864,7 +2956,7 @@ "drivers": [ "hub" ], - "module_alias": "usb:v1D6Bp0002d0611dc09dsc00dp01ic09isc00ip00in00" + "module_alias": "usb:v1D6Bp0002d0612dc09dsc00dp01ic09isc00ip00in00" }, { "index": 78, @@ -2889,7 +2981,7 @@ }, "vendor": { "hex": "1d6b", - "name": "Linux 6.11.5 xhci-hcd", + "name": "Linux 6.12.8 xhci-hcd", "value": 7531 }, "device": { @@ -2899,11 +2991,11 @@ }, "revision": { "hex": "0000", - "name": "6.11", + "name": "6.12", "value": 0 }, "serial": "0000:c7:00.4", - "model": "Linux 6.11.5 xhci-hcd xHCI Host Controller", + "model": "Linux 6.12.8 xhci-hcd xHCI Host Controller", "sysfs_id": "/devices/pci0000:00/0000:00:08.3/0000:c7:00.4/usb7/7-0:1.0", "sysfs_bus_id": "7-0:1.0", "resources": [ @@ -2947,11 +3039,11 @@ "drivers": [ "hub" ], - "module_alias": "usb:v1D6Bp0002d0611dc09dsc00dp01ic09isc00ip00in00" + "module_alias": "usb:v1D6Bp0002d0612dc09dsc00dp01ic09isc00ip00in00" }, { - "index": 80, - "attached_to": 87, + "index": 81, + "attached_to": 89, "class_list": [ "usb", "hub" @@ -3031,7 +3123,7 @@ "module_alias": "usb:v05E3p0610d6060dc09dsc00dp02ic09isc00ip02in00" }, { - "index": 81, + "index": 82, "attached_to": 96, "class_list": [ "usb", @@ -3103,7 +3195,7 @@ "module_alias": "usb:v05E3p0625d3404dc09dsc00dp03ic09isc00ip00in00" }, { - "index": 84, + "index": 85, "attached_to": 44, "class_list": [ "usb", @@ -3125,7 +3217,7 @@ }, "vendor": { "hex": "1d6b", - "name": "Linux 6.11.5 xhci-hcd", + "name": "Linux 6.12.8 xhci-hcd", "value": 7531 }, "device": { @@ -3135,11 +3227,11 @@ }, "revision": { "hex": "0000", - "name": "6.11", + "name": "6.12", "value": 0 }, "serial": "0000:c5:00.4", - "model": "Linux 6.11.5 xhci-hcd xHCI Host Controller", + "model": "Linux 6.12.8 xhci-hcd xHCI Host Controller", "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:c5:00.4/usb4/4-0:1.0", "sysfs_bus_id": "4-0:1.0", "detail": { @@ -3173,10 +3265,10 @@ "drivers": [ "hub" ], - "module_alias": "usb:v1D6Bp0003d0611dc09dsc00dp03ic09isc00ip00in00" + "module_alias": "usb:v1D6Bp0003d0612dc09dsc00dp03ic09isc00ip00in00" }, { - "index": 85, + "index": 87, "attached_to": 32, "class_list": [ "usb", @@ -3198,7 +3290,7 @@ }, "vendor": { "hex": "1d6b", - "name": "Linux 6.11.5 xhci-hcd", + "name": "Linux 6.12.8 xhci-hcd", "value": 7531 }, "device": { @@ -3208,11 +3300,11 @@ }, "revision": { "hex": "0000", - "name": "6.11", + "name": "6.12", "value": 0 }, "serial": "0000:c7:00.4", - "model": "Linux 6.11.5 xhci-hcd xHCI Host Controller", + "model": "Linux 6.12.8 xhci-hcd xHCI Host Controller", "sysfs_id": "/devices/pci0000:00/0000:00:08.3/0000:c7:00.4/usb8/8-0:1.0", "sysfs_bus_id": "8-0:1.0", "detail": { @@ -3246,10 +3338,10 @@ "drivers": [ "hub" ], - "module_alias": "usb:v1D6Bp0003d0611dc09dsc00dp03ic09isc00ip00in00" + "module_alias": "usb:v1D6Bp0003d0612dc09dsc00dp03ic09isc00ip00in00" }, { - "index": 87, + "index": 89, "attached_to": 24, "class_list": [ "usb", @@ -3271,7 +3363,7 @@ }, "vendor": { "hex": "1d6b", - "name": "Linux 6.11.5 xhci-hcd", + "name": "Linux 6.12.8 xhci-hcd", "value": 7531 }, "device": { @@ -3281,11 +3373,11 @@ }, "revision": { "hex": "0000", - "name": "6.11", + "name": "6.12", "value": 0 }, "serial": "0000:c5:00.3", - "model": "Linux 6.11.5 xhci-hcd xHCI Host Controller", + "model": "Linux 6.12.8 xhci-hcd xHCI Host Controller", "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:c5:00.3/usb1/1-0:1.0", "sysfs_bus_id": "1-0:1.0", "resources": [ @@ -3329,11 +3421,11 @@ "drivers": [ "hub" ], - "module_alias": "usb:v1D6Bp0002d0611dc09dsc00dp01ic09isc00ip00in00" + "module_alias": "usb:v1D6Bp0002d0612dc09dsc00dp01ic09isc00ip00in00" }, { - "index": 89, - "attached_to": 87, + "index": 90, + "attached_to": 89, "class_list": [ "usb", "hub" @@ -3435,7 +3527,7 @@ }, "vendor": { "hex": "1d6b", - "name": "Linux 6.11.5 xhci-hcd", + "name": "Linux 6.12.8 xhci-hcd", "value": 7531 }, "device": { @@ -3445,11 +3537,11 @@ }, "revision": { "hex": "0000", - "name": "6.11", + "name": "6.12", "value": 0 }, "serial": "0000:c7:00.3", - "model": "Linux 6.11.5 xhci-hcd xHCI Host Controller", + "model": "Linux 6.12.8 xhci-hcd xHCI Host Controller", "sysfs_id": "/devices/pci0000:00/0000:00:08.3/0000:c7:00.3/usb5/5-0:1.0", "sysfs_bus_id": "5-0:1.0", "resources": [ @@ -3493,7 +3585,7 @@ "drivers": [ "hub" ], - "module_alias": "usb:v1D6Bp0002d0611dc09dsc00dp01ic09isc00ip00in00" + "module_alias": "usb:v1D6Bp0002d0612dc09dsc00dp01ic09isc00ip00in00" }, { "index": 96, @@ -3518,7 +3610,7 @@ }, "vendor": { "hex": "1d6b", - "name": "Linux 6.11.5 xhci-hcd", + "name": "Linux 6.12.8 xhci-hcd", "value": 7531 }, "device": { @@ -3528,11 +3620,11 @@ }, "revision": { "hex": "0000", - "name": "6.11", + "name": "6.12", "value": 0 }, "serial": "0000:c5:00.3", - "model": "Linux 6.11.5 xhci-hcd xHCI Host Controller", + "model": "Linux 6.12.8 xhci-hcd xHCI Host Controller", "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:c5:00.3/usb2/2-0:1.0", "sysfs_bus_id": "2-0:1.0", "detail": { @@ -3566,13 +3658,123 @@ "drivers": [ "hub" ], - "module_alias": "usb:v1D6Bp0003d0611dc09dsc00dp03ic09isc00ip00in00" + "module_alias": "usb:v1D6Bp0003d0612dc09dsc00dp03ic09isc00ip00in00" } ], "keyboard": [ { - "index": 90, - "attached_to": 89, + "index": 75, + "attached_to": 81, + "class_list": [ + "keyboard", + "usb" + ], + "bus_type": { + "hex": "0086", + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "0108", + "name": "Keyboard", + "value": 264 + }, + "sub_class": { + "hex": "0000", + "name": "Keyboard", + "value": 0 + }, + "vendor": { + "hex": "32ac", + "name": "Framework", + "value": 12972 + }, + "device": { + "hex": "0013", + "name": "Laptop 16 RGB Macropad", + "value": 19 + }, + "revision": { + "hex": "0000", + "name": "0.29", + "value": 0 + }, + "serial": "FRAKDKEN0100000000", + "model": "Framework Laptop 16 RGB Macropad", + "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:c5:00.3/usb1/1-3/1-3.2/1-3.2:1.0", + "sysfs_bus_id": "1-3.2: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-Framework_Laptop_16_RGB_Macropad_FRAKDKEN0100000000-event-kbd", + "/dev/input/by-path/pci-0000:c5:00.3-usb-0:3.2:1.0-event-kbd", + "/dev/input/by-path/pci-0000:c5:00.3-usbv2-0:3.2:1.0-event-kbd", + "/dev/input/event1" + ], + "resources": [ + { + "type": "baud", + "speed": 12000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_protocol": 0, + "interface_class": { + "hex": "0003", + "name": "hid", + "value": 3 + }, + "interface_subclass": { + "hex": "0001", + "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:v32ACp0013d0029dc00dsc00dp00ic03isc01ip01in00" + }, + { + "index": 83, + "attached_to": 90, "class_list": [ "keyboard", "usb" @@ -3613,20 +3815,20 @@ }, "serial": "FRAKDKEN0100000000", "model": "Framework Laptop 16 Keyboard Module - ANSI", - "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:c5:00.3/usb1/1-4/1-4.3/1-4.3:1.0", - "sysfs_bus_id": "1-4.3:1.0", - "unix_device_name": "/dev/input/event1", + "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:c5:00.3/usb1/1-4/1-4.2/1-4.2:1.0", + "sysfs_bus_id": "1-4.2:1.0", + "unix_device_name": "/dev/input/event6", "unix_device_number": { "type": 99, "major": 13, - "minor": 65, + "minor": 70, "range": 1 }, "unix_device_names": [ "/dev/input/by-id/usb-Framework_Laptop_16_Keyboard_Module_-_ANSI_FRAKDKEN0100000000-event-kbd", - "/dev/input/by-path/pci-0000:c5:00.3-usb-0:4.3:1.0-event-kbd", - "/dev/input/by-path/pci-0000:c5:00.3-usbv2-0:4.3:1.0-event-kbd", - "/dev/input/event1" + "/dev/input/by-path/pci-0000:c5:00.3-usb-0:4.2:1.0-event-kbd", + "/dev/input/by-path/pci-0000:c5:00.3-usbv2-0:4.2:1.0-event-kbd", + "/dev/input/event6" ], "resources": [ { @@ -3703,7 +3905,7 @@ { "type": "mem", "base": 0, - "range": 65111613440, + "range": 65110425600, "enabled": true, "access": "read_write", "prefetch": "unknown" @@ -3793,6 +3995,40 @@ } } ], + "mouse": [ + { + "index": 102, + "attached_to": 0, + "bus_type": { + "hex": "0081", + "name": "serial", + "value": 129 + }, + "base_class": { + "hex": "0118", + "name": "touchpad", + "value": 280 + }, + "sub_class": { + "hex": "0001", + "name": "bus", + "value": 1 + }, + "vendor": { + "hex": "093a", + "value": 2362 + }, + "device": { + "hex": "0274", + "value": 628 + }, + "sysfs_id": "/devices/platform/AMDI0010:03/i2c-1/i2c-PIXA3854:00/0018:093A:0274.000A/input/input23", + "unix_device_names": [ + "/dev/input/event21", + "/dev/input/ + handler" + ] + } + ], "network_controller": [ { "index": 54, @@ -3852,7 +4088,7 @@ }, { "type": "irq", - "base": 137, + "base": 141, "triggered": 0, "enabled": true }, @@ -3965,7 +4201,7 @@ "command": 1030, "header_type": 0, "secondary_bus": 0, - "irq": 137, + "irq": 141, "prog_if": 0 }, "driver": "mt7921e", @@ -3982,6 +4218,29 @@ "network_interface": [ { "index": 98, + "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": 100, "attached_to": 54, "class_list": [ "network_interface" @@ -4021,29 +4280,6 @@ "driver_modules": [ "mt7921e" ] - }, - { - "index": 100, - "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": [ @@ -4611,7 +4847,7 @@ "resources": [ { "type": "irq", - "base": 140, + "base": 137, "triggered": 0, "enabled": true }, @@ -4629,7 +4865,7 @@ "command": 1031, "header_type": 0, "secondary_bus": 0, - "irq": 140, + "irq": 137, "prog_if": 0 }, "driver": "snd_hda_intel", @@ -4691,7 +4927,7 @@ "resources": [ { "type": "irq", - "base": 67, + "base": 51, "triggered": 0, "enabled": true }, @@ -4709,7 +4945,7 @@ "command": 1031, "header_type": 0, "secondary_bus": 0, - "irq": 67, + "irq": 51, "prog_if": 0 }, "driver": "snd_hda_intel", @@ -4771,7 +5007,7 @@ "resources": [ { "type": "irq", - "base": 141, + "base": 138, "triggered": 0, "enabled": true }, @@ -4789,7 +5025,7 @@ "command": 1031, "header_type": 0, "secondary_bus": 0, - "irq": 141, + "irq": 138, "prog_if": 0 }, "driver": "snd_hda_intel", @@ -4860,7 +5096,7 @@ "resources": [ { "type": "irq", - "base": 64, + "base": 50, "triggered": 0, "enabled": true }, @@ -4878,7 +5114,7 @@ "command": 1031, "header_type": 0, "secondary_bus": 0, - "irq": 64, + "irq": 50, "prog_if": 2 }, "driver": "nvme", @@ -4947,7 +5183,7 @@ "resources": [ { "type": "irq", - "base": 65, + "base": 49, "triggered": 0, "enabled": true }, @@ -4965,7 +5201,7 @@ "command": 1031, "header_type": 0, "secondary_bus": 0, - "irq": 65, + "irq": 49, "prog_if": 2 }, "driver": "nvme", @@ -4983,101 +5219,9 @@ "form_factor": "laptop" }, "usb": [ - { - "index": 72, - "attached_to": 89, - "class_list": [ - "usb", - "unknown" - ], - "bus_type": { - "hex": "0086", - "name": "USB", - "value": 134 - }, - "slot": { - "bus": 0, - "number": 0 - }, - "base_class": { - "hex": "0000", - "name": "Unclassified device", - "value": 0 - }, - "sub_class": { - "hex": "0000", - "name": "Unclassified device", - "value": 0 - }, - "vendor": { - "hex": "32ac", - "name": "Framework", - "value": 12972 - }, - "device": { - "hex": "0012", - "name": "Laptop 16 Keyboard Module - ANSI", - "value": 18 - }, - "revision": { - "hex": "0000", - "name": "0.29", - "value": 0 - }, - "serial": "FRAKDKEN0100000000", - "model": "Framework Laptop 16 Keyboard Module - ANSI", - "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:c5:00.3/usb1/1-4/1-4.3/1-4.3:1.3", - "sysfs_bus_id": "1-4.3:1.3", - "resources": [ - { - "type": "baud", - "speed": 12000000, - "bits": 0, - "stop_bits": 0, - "parity": 0, - "handshake": 0 - } - ], - "detail": { - "device_class": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "device_subclass": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "device_protocol": 0, - "interface_class": { - "hex": "0003", - "name": "hid", - "value": 3 - }, - "interface_subclass": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "interface_protocol": 0, - "interface_number": 3, - "interface_alternate_setting": 0 - }, - "hotplug": "usb", - "driver": "usbhid", - "driver_module": "usbhid", - "drivers": [ - "usbhid" - ], - "driver_modules": [ - "usbhid" - ], - "module_alias": "usb:v32ACp0012d0029dc00dsc00dp00ic03isc00ip00in03" - }, { "index": 73, - "attached_to": 74, + "attached_to": 81, "class_list": [ "usb", "unknown" @@ -5107,96 +5251,9 @@ "value": 12972 }, "device": { - "hex": "0002", - "name": "HDMI Expansion Card", - "value": 2 - }, - "serial": "11AD1D00A49C40112C250B00", - "model": "Framework HDMI Expansion Card", - "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:c5:00.3/usb1/1-2/1-2.1/1-2.1:1.1", - "sysfs_bus_id": "1-2.1:1.1", - "resources": [ - { - "type": "baud", - "speed": 12000000, - "bits": 0, - "stop_bits": 0, - "parity": 0, - "handshake": 0 - } - ], - "detail": { - "device_class": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "device_subclass": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "device_protocol": 0, - "interface_class": { - "hex": "0003", - "name": "hid", - "value": 3 - }, - "interface_subclass": { - "hex": "0000", - "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:v32ACp0002d0000dc00dsc00dp00ic03isc00ip00in01" - }, - { - "index": 75, - "attached_to": 89, - "class_list": [ - "usb", - "unknown" - ], - "bus_type": { - "hex": "0086", - "name": "USB", - "value": 134 - }, - "slot": { - "bus": 0, - "number": 0 - }, - "base_class": { - "hex": "0000", - "name": "Unclassified device", - "value": 0 - }, - "sub_class": { - "hex": "0000", - "name": "Unclassified device", - "value": 0 - }, - "vendor": { - "hex": "32ac", - "name": "Framework", - "value": 12972 - }, - "device": { - "hex": "0012", - "name": "Laptop 16 Keyboard Module - ANSI", - "value": 18 + "hex": "0013", + "name": "Laptop 16 RGB Macropad", + "value": 19 }, "revision": { "hex": "0000", @@ -5204,9 +5261,22 @@ "value": 0 }, "serial": "FRAKDKEN0100000000", - "model": "Framework Laptop 16 Keyboard Module - ANSI", - "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:c5:00.3/usb1/1-4/1-4.3/1-4.3:1.1", - "sysfs_bus_id": "1-4.3:1.1", + "model": "Framework Laptop 16 RGB Macropad", + "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:c5:00.3/usb1/1-3/1-3.2/1-3.2:1.2", + "sysfs_bus_id": "1-3.2:1.2", + "unix_device_name": "/dev/input/event5", + "unix_device_number": { + "type": 99, + "major": 13, + "minor": 69, + "range": 1 + }, + "unix_device_names": [ + "/dev/input/by-id/usb-Framework_Laptop_16_RGB_Macropad_FRAKDKEN0100000000-if02-event-kbd", + "/dev/input/by-path/pci-0000:c5:00.3-usb-0:3.2:1.2-event-kbd", + "/dev/input/by-path/pci-0000:c5:00.3-usbv2-0:3.2:1.2-event-kbd", + "/dev/input/event5" + ], "resources": [ { "type": "baud", @@ -5240,7 +5310,7 @@ "value": 0 }, "interface_protocol": 0, - "interface_number": 1, + "interface_number": 2, "interface_alternate_setting": 0 }, "hotplug": "usb", @@ -5252,11 +5322,11 @@ "driver_modules": [ "usbhid" ], - "module_alias": "usb:v32ACp0012d0029dc00dsc00dp00ic03isc00ip00in01" + "module_alias": "usb:v32ACp0013d0029dc00dsc00dp00ic03isc00ip00in02" }, { "index": 77, - "attached_to": 89, + "attached_to": 90, "class_list": [ "usb", "unknown" @@ -5339,192 +5409,8 @@ "module_alias": "usb:v27C6p609Cd0100dcEFdsc00dp00icFFisc00ip00in00" }, { - "index": 82, - "attached_to": 80, - "class_list": [ - "usb", - "unknown" - ], - "bus_type": { - "hex": "0086", - "name": "USB", - "value": 134 - }, - "slot": { - "bus": 0, - "number": 0 - }, - "base_class": { - "hex": "0000", - "name": "Unclassified device", - "value": 0 - }, - "sub_class": { - "hex": "0000", - "name": "Unclassified device", - "value": 0 - }, - "vendor": { - "hex": "32ac", - "name": "Framework Computer Inc", - "value": 12972 - }, - "device": { - "hex": "0020", - "name": "LED Matrix Input Module", - "value": 32 - }, - "revision": { - "hex": "0000", - "name": "0.20", - "value": 0 - }, - "serial": "FRAKDEBZ0100000000", - "model": "Framework LED Matrix Input Module", - "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:c5:00.3/usb1/1-3/1-3.3/1-3.3:1.0", - "sysfs_bus_id": "1-3.3:1.0", - "resources": [ - { - "type": "baud", - "speed": 12000000, - "bits": 0, - "stop_bits": 0, - "parity": 0, - "handshake": 0 - } - ], - "detail": { - "device_class": { - "hex": "0002", - "name": "comm", - "value": 2 - }, - "device_subclass": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "device_protocol": 0, - "interface_class": { - "hex": "0002", - "name": "comm", - "value": 2 - }, - "interface_subclass": { - "hex": "0002", - "name": "comm", - "value": 2 - }, - "interface_protocol": 0, - "interface_number": 0, - "interface_alternate_setting": 0 - }, - "hotplug": "usb", - "driver": "cdc_acm", - "driver_module": "cdc_acm", - "drivers": [ - "cdc_acm" - ], - "driver_modules": [ - "cdc_acm" - ], - "module_alias": "usb:v32ACp0020d0020dc02dsc00dp00ic02isc02ip00in00" - }, - { - "index": 83, - "attached_to": 89, - "class_list": [ - "usb", - "unknown" - ], - "bus_type": { - "hex": "0086", - "name": "USB", - "value": 134 - }, - "slot": { - "bus": 0, - "number": 0 - }, - "base_class": { - "hex": "0000", - "name": "Unclassified device", - "value": 0 - }, - "sub_class": { - "hex": "0000", - "name": "Unclassified device", - "value": 0 - }, - "vendor": { - "hex": "32ac", - "name": "Framework Computer Inc", - "value": 12972 - }, - "device": { - "hex": "0020", - "name": "LED Matrix Input Module", - "value": 32 - }, - "revision": { - "hex": "0000", - "name": "0.20", - "value": 0 - }, - "serial": "FRAKDEBZ0100000000", - "model": "Framework LED Matrix Input Module", - "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:c5:00.3/usb1/1-4/1-4.2/1-4.2:1.0", - "sysfs_bus_id": "1-4.2:1.0", - "resources": [ - { - "type": "baud", - "speed": 12000000, - "bits": 0, - "stop_bits": 0, - "parity": 0, - "handshake": 0 - } - ], - "detail": { - "device_class": { - "hex": "0002", - "name": "comm", - "value": 2 - }, - "device_subclass": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "device_protocol": 0, - "interface_class": { - "hex": "0002", - "name": "comm", - "value": 2 - }, - "interface_subclass": { - "hex": "0002", - "name": "comm", - "value": 2 - }, - "interface_protocol": 0, - "interface_number": 0, - "interface_alternate_setting": 0 - }, - "hotplug": "usb", - "driver": "cdc_acm", - "driver_module": "cdc_acm", - "drivers": [ - "cdc_acm" - ], - "driver_modules": [ - "cdc_acm" - ], - "module_alias": "usb:v32ACp0020d0020dc02dsc00dp00ic02isc02ip00in00" - }, - { - "index": 86, - "attached_to": 89, + "index": 79, + "attached_to": 90, "class_list": [ "usb", "unknown" @@ -5565,20 +5451,17 @@ }, "serial": "FRAKDKEN0100000000", "model": "Framework Laptop 16 Keyboard Module - ANSI", - "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:c5:00.3/usb1/1-4/1-4.3/1-4.3:1.2", - "sysfs_bus_id": "1-4.3:1.2", - "unix_device_name": "/dev/input/event5", + "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:c5:00.3/usb1/1-4/1-4.2/1-4.2:1.2", + "sysfs_bus_id": "1-4.2:1.2", + "unix_device_name": "/dev/input/event9", "unix_device_number": { "type": 99, "major": 13, - "minor": 69, + "minor": 73, "range": 1 }, "unix_device_names": [ - "/dev/input/by-id/usb-Framework_Laptop_16_Keyboard_Module_-_ANSI_FRAKDKEN0100000000-if02-event-kbd", - "/dev/input/by-path/pci-0000:c5:00.3-usb-0:4.3:1.2-event-kbd", - "/dev/input/by-path/pci-0000:c5:00.3-usbv2-0:4.3:1.2-event-kbd", - "/dev/input/event5" + "/dev/input/event9" ], "resources": [ { @@ -5628,8 +5511,8 @@ "module_alias": "usb:v32ACp0012d0029dc00dsc00dp00ic03isc00ip00in02" }, { - "index": 88, - "attached_to": 74, + "index": 86, + "attached_to": 81, "class_list": [ "usb", "unknown" @@ -5659,14 +5542,19 @@ "value": 12972 }, "device": { - "hex": "0002", - "name": "HDMI Expansion Card", - "value": 2 + "hex": "0013", + "name": "Laptop 16 RGB Macropad", + "value": 19 }, - "serial": "11AD1D00A49C40112C250B00", - "model": "Framework HDMI Expansion Card", - "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:c5:00.3/usb1/1-2/1-2.1/1-2.1:1.0", - "sysfs_bus_id": "1-2.1:1.0", + "revision": { + "hex": "0000", + "name": "0.29", + "value": 0 + }, + "serial": "FRAKDKEN0100000000", + "model": "Framework Laptop 16 RGB Macropad", + "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:c5:00.3/usb1/1-3/1-3.2/1-3.2:1.3", + "sysfs_bus_id": "1-3.2:1.3", "resources": [ { "type": "baud", @@ -5690,9 +5578,9 @@ }, "device_protocol": 0, "interface_class": { - "hex": "0011", - "name": "billboard", - "value": 17 + "hex": "0003", + "name": "hid", + "value": 3 }, "interface_subclass": { "hex": "0000", @@ -5700,15 +5588,23 @@ "value": 0 }, "interface_protocol": 0, - "interface_number": 0, + "interface_number": 3, "interface_alternate_setting": 0 }, "hotplug": "usb", - "module_alias": "usb:v32ACp0002d0000dc00dsc00dp00ic11isc00ip00in00" + "driver": "usbhid", + "driver_module": "usbhid", + "drivers": [ + "usbhid" + ], + "driver_modules": [ + "usbhid" + ], + "module_alias": "usb:v32ACp0013d0029dc00dsc00dp00ic03isc00ip00in03" }, { - "index": 94, - "attached_to": 80, + "index": 88, + "attached_to": 81, "class_list": [ "usb", "unknown" @@ -5734,23 +5630,23 @@ }, "vendor": { "hex": "32ac", - "name": "Framework Computer Inc", + "name": "Framework", "value": 12972 }, "device": { - "hex": "0020", - "name": "LED Matrix Input Module", - "value": 32 + "hex": "0013", + "name": "Laptop 16 RGB Macropad", + "value": 19 }, "revision": { "hex": "0000", - "name": "0.20", + "name": "0.29", "value": 0 }, - "serial": "FRAKDEBZ0100000000", - "model": "Framework LED Matrix Input Module", - "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:c5:00.3/usb1/1-3/1-3.3/1-3.3:1.1", - "sysfs_bus_id": "1-3.3:1.1", + "serial": "FRAKDKEN0100000000", + "model": "Framework Laptop 16 RGB Macropad", + "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:c5:00.3/usb1/1-3/1-3.2/1-3.2:1.1", + "sysfs_bus_id": "1-3.2:1.1", "resources": [ { "type": "baud", @@ -5763,9 +5659,9 @@ ], "detail": { "device_class": { - "hex": "0002", - "name": "comm", - "value": 2 + "hex": "0000", + "name": "per_interface", + "value": 0 }, "device_subclass": { "hex": "0000", @@ -5774,9 +5670,9 @@ }, "device_protocol": 0, "interface_class": { - "hex": "000a", - "name": "data", - "value": 10 + "hex": "0003", + "name": "hid", + "value": 3 }, "interface_subclass": { "hex": "0000", @@ -5788,19 +5684,19 @@ "interface_alternate_setting": 0 }, "hotplug": "usb", - "driver": "cdc_acm", - "driver_module": "cdc_acm", + "driver": "usbhid", + "driver_module": "usbhid", "drivers": [ - "cdc_acm" + "usbhid" ], "driver_modules": [ - "cdc_acm" + "usbhid" ], - "module_alias": "usb:v32ACp0020d0020dc02dsc00dp00ic0Aisc00ip00in01" + "module_alias": "usb:v32ACp0013d0029dc00dsc00dp00ic03isc00ip00in01" }, { - "index": 95, - "attached_to": 89, + "index": 93, + "attached_to": 90, "class_list": [ "usb", "unknown" @@ -5826,21 +5722,113 @@ }, "vendor": { "hex": "32ac", - "name": "Framework Computer Inc", + "name": "Framework", "value": 12972 }, "device": { - "hex": "0020", - "name": "LED Matrix Input Module", - "value": 32 + "hex": "0012", + "name": "Laptop 16 Keyboard Module - ANSI", + "value": 18 }, "revision": { "hex": "0000", - "name": "0.20", + "name": "0.29", "value": 0 }, - "serial": "FRAKDEBZ0100000000", - "model": "Framework LED Matrix Input Module", + "serial": "FRAKDKEN0100000000", + "model": "Framework Laptop 16 Keyboard Module - ANSI", + "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:c5:00.3/usb1/1-4/1-4.2/1-4.2:1.3", + "sysfs_bus_id": "1-4.2:1.3", + "resources": [ + { + "type": "baud", + "speed": 12000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_protocol": 0, + "interface_class": { + "hex": "0003", + "name": "hid", + "value": 3 + }, + "interface_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "interface_protocol": 0, + "interface_number": 3, + "interface_alternate_setting": 0 + }, + "hotplug": "usb", + "driver": "usbhid", + "driver_module": "usbhid", + "drivers": [ + "usbhid" + ], + "driver_modules": [ + "usbhid" + ], + "module_alias": "usb:v32ACp0012d0029dc00dsc00dp00ic03isc00ip00in03" + }, + { + "index": 95, + "attached_to": 90, + "class_list": [ + "usb", + "unknown" + ], + "bus_type": { + "hex": "0086", + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "0000", + "name": "Unclassified device", + "value": 0 + }, + "sub_class": { + "hex": "0000", + "name": "Unclassified device", + "value": 0 + }, + "vendor": { + "hex": "32ac", + "name": "Framework", + "value": 12972 + }, + "device": { + "hex": "0012", + "name": "Laptop 16 Keyboard Module - ANSI", + "value": 18 + }, + "revision": { + "hex": "0000", + "name": "0.29", + "value": 0 + }, + "serial": "FRAKDKEN0100000000", + "model": "Framework Laptop 16 Keyboard Module - ANSI", "sysfs_id": "/devices/pci0000:00/0000:00:08.1/0000:c5:00.3/usb1/1-4/1-4.2/1-4.2:1.1", "sysfs_bus_id": "1-4.2:1.1", "resources": [ @@ -5855,9 +5843,9 @@ ], "detail": { "device_class": { - "hex": "0002", - "name": "comm", - "value": 2 + "hex": "0000", + "name": "per_interface", + "value": 0 }, "device_subclass": { "hex": "0000", @@ -5866,9 +5854,9 @@ }, "device_protocol": 0, "interface_class": { - "hex": "000a", - "name": "data", - "value": 10 + "hex": "0003", + "name": "hid", + "value": 3 }, "interface_subclass": { "hex": "0000", @@ -5880,15 +5868,15 @@ "interface_alternate_setting": 0 }, "hotplug": "usb", - "driver": "cdc_acm", - "driver_module": "cdc_acm", + "driver": "usbhid", + "driver_module": "usbhid", "drivers": [ - "cdc_acm" + "usbhid" ], "driver_modules": [ - "cdc_acm" + "usbhid" ], - "module_alias": "usb:v32ACp0020d0020dc02dsc00dp00ic0Aisc00ip00in01" + "module_alias": "usb:v32ACp0012d0029dc00dsc00dp00ic03isc00ip00in01" } ], "usb_controller": [ @@ -5946,7 +5934,7 @@ "resources": [ { "type": "irq", - "base": 49, + "base": 53, "triggered": 0, "enabled": true }, @@ -5964,7 +5952,7 @@ "command": 1031, "header_type": 0, "secondary_bus": 0, - "irq": 49, + "irq": 53, "prog_if": 48 }, "driver": "xhci_hcd", @@ -6286,7 +6274,7 @@ "resources": [ { "type": "irq", - "base": 51, + "base": 54, "triggered": 0, "enabled": true }, @@ -6304,7 +6292,7 @@ "command": 1031, "header_type": 0, "secondary_bus": 0, - "irq": 51, + "irq": 54, "prog_if": 64 }, "driver": "thunderbolt", diff --git a/systems/omoikane/hardware.nix b/systems/omoikane/hardware.nix index 539489f..006d1f7 100644 --- a/systems/omoikane/hardware.nix +++ b/systems/omoikane/hardware.nix @@ -12,7 +12,7 @@ fileSystems."/home/jopejoe1/Public/games" = { device = "/dev/sda"; fsType = "bcachefs"; - options = [ "compression=zstd" ]; + options = [ "compression=zstd" "nofail" ]; }; powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand"; diff --git a/systems/zap/wp-test.nix b/systems/zap/wp-test.nix index a5bdf45..668e0fe 100644 --- a/systems/zap/wp-test.nix +++ b/systems/zap/wp-test.nix @@ -121,11 +121,9 @@ if ! test -e "${hostStateDir}/secret-keys.php"; then umask 0177 echo "> "${hostStateDir}/secret-keys.php" - ${ - lib.concatMapStringsSep "\n" (var: '' - echo "define('${var}', '`tr -dc a-zA-Z0-9 > "${hostStateDir}/secret-keys.php" - '') secretsVars - } + ${lib.concatMapStringsSep "\n" (var: '' + echo "define('${var}', '`tr -dc a-zA-Z0-9 > "${hostStateDir}/secret-keys.php" + '') secretsVars} echo "?>" >> "${hostStateDir}/secret-keys.php" chmod 440 "${hostStateDir}/secret-keys.php" fi