From 71d6a42823220872846156ca97f29fe335966a28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Sat, 8 Apr 2023 19:13:30 +0100 Subject: [PATCH] update, foryog compat --- flake.lock | 78 ++++++++++----------- nixos/boxes/foryog/custom-kernel.nix | 100 --------------------------- nixos/boxes/foryog/default.nix | 1 - nixos/gui/default.nix | 3 +- 4 files changed, 40 insertions(+), 142 deletions(-) delete mode 100644 nixos/boxes/foryog/custom-kernel.nix diff --git a/flake.lock b/flake.lock index 29bb060e..9947c9b8 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ ] }, "locked": { - "lastModified": 1677033122, - "narHash": "sha256-woPhdK2AvHDWPHD2/Fu3xjJ3TEuHyYyflxAkBKdumfY=", + "lastModified": 1679679664, + "narHash": "sha256-YSdHsJ73G7TEFzbmpZ2peuMefIa9/vNB2g+xdiyma3U=", "owner": "kamadorueda", "repo": "alejandra", - "rev": "a7005b0c500432549e2aa94fd817f5ff9b529f05", + "rev": "d00d03f0b45d2d1d6e0ae2d110c821b497d8fb09", "type": "github" }, "original": { @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1673295039, - "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=", + "lastModified": 1680266963, + "narHash": "sha256-IW/lzbUCOcldLHWHjNSg1YoViDnZOmz0ZJL7EH9OkV8=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "87b9d090ad39b25b2400029c64825fc2a8868943", + "rev": "99d4187d11be86b49baa3a1aec0530004072374f", "type": "github" }, "original": { @@ -83,11 +83,11 @@ ] }, "locked": { - "lastModified": 1680146283, - "narHash": "sha256-YZSw3O6uv6NqOJP+dol/njmzblRFIsrmqqb0HsL4mcQ=", + "lastModified": 1680767287, + "narHash": "sha256-WW6cLmfCSgffE5TnG+8+IcoWd9PxeM0PqOuYcWnWkEY=", "owner": "nix-community", "repo": "disko", - "rev": "4d9c89abde7ccedf743a01119d41fb880793bcba", + "rev": "8891df70294ed9b8c930954f555391c4ba9bfe82", "type": "github" }, "original": { @@ -212,11 +212,11 @@ }, "flake-utils": { "locked": { - "lastModified": 1678901627, - "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", + "lastModified": 1680946745, + "narHash": "sha256-KqGlwg9UTDsFBZZB8wzXgMnc8XQm95LtSbFvBsnqkPI=", "owner": "numtide", "repo": "flake-utils", - "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", + "rev": "946da791763db1c306b86a8bd3828bf5814a1247", "type": "github" }, "original": { @@ -288,11 +288,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1679067101, - "narHash": "sha256-tMI1inGT9u4KWQml0w30dhWqQPlth1e9K/68sfDkEQA=", + "lastModified": 1680555990, + "narHash": "sha256-Tu/i5sd0hk4c4VtWO8XpY3c9KmHDcOWF5Y2GSCh3LXA=", "owner": "nix-community", "repo": "home-manager", - "rev": "9154cd519a8942728038819682d6b3ff33f321bb", + "rev": "d6f3ba090ed090ae664ab5bac329654093aae725", "type": "github" }, "original": { @@ -340,11 +340,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1678728829, - "narHash": "sha256-KbA8uakGfjfvRH+Td/VegiLdHrnqIZHkMTQ5XBjL2dE=", + "lastModified": 1680544266, + "narHash": "sha256-d/TusDXmIo8IT5DNRA21lN+nOVSER8atIx9TJteR6LQ=", "owner": "oxalica", "repo": "nil", - "rev": "e7045f1779fd202a3316f84b864c304f339cccea", + "rev": "56a1fa87b98a9508920f4b0ab8fe36d5b54b2362", "type": "github" }, "original": { @@ -356,11 +356,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1679598117, - "narHash": "sha256-Vs1f/7imI77OkMOQhO3xgx4jalN2Gx3D3C2wmnlpWJM=", + "lastModified": 1680876084, + "narHash": "sha256-eP9yxP0wc7XuVaODugh+ajgbFGaile2O1ihxiLxOuvU=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "648021dcb2b65498eed3ea3a7339cdfc3bea4d82", + "rev": "3006d2860a6ed5e01b0c3e7ffb730e9b293116e2", "type": "github" }, "original": { @@ -372,11 +372,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1679603234, - "narHash": "sha256-0aY2rolFDG553LIuV3OJkyBvEd9fdQ0K54+1twYJPlc=", + "lastModified": 1680954122, + "narHash": "sha256-uDwWxpnWkJDAKM2pwQbFG+Ppq5arg80uDeKBUGL+5d8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6cc53be05a22841d3c9f8446fc03b37db2cdce5a", + "rev": "e8a861f940da69ca8d4607b893354b7177f7250e", "type": "github" }, "original": { @@ -388,11 +388,11 @@ }, "nixpkgs-nixos-unstable": { "locked": { - "lastModified": 1679437018, - "narHash": "sha256-vOuiDPLHSEo/7NkiWtxpHpHgoXoNmrm+wkXZ6a072Fc=", + "lastModified": 1680758185, + "narHash": "sha256-sCVWwfnk7zEX8Z+OItiH+pcSklrlsLZ4TJTtnxAYREw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "19cf008bb18e47b6e3b4e16e32a9a4bdd4b45f7e", + "rev": "0e19daa510e47a40e06257e205965f3b96ce0ac9", "type": "github" }, "original": { @@ -420,11 +420,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1679472241, - "narHash": "sha256-VK2YDic2NjPvfsuneJCLIrWS38qUfoW8rLLimx0rWXA=", + "lastModified": 1680865339, + "narHash": "sha256-H6rmJ1CyJ3Q5ZyoLMYq/UEYMS9Q1orJjRpWiQ47HudE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9ef6e7727f4c31507627815d4f8679c5841efb00", + "rev": "0040164e473509b4aee6aedb3b923e400d6df10b", "type": "github" }, "original": { @@ -436,11 +436,11 @@ }, "nur": { "locked": { - "lastModified": 1679600805, - "narHash": "sha256-/dACLCKi5LaEP6idzXUyoG8LnZnRtFf9HlLGhiJCNz8=", + "lastModified": 1680932643, + "narHash": "sha256-vHkZJnPfA788UQ0zsfj4P09pVqBsn4niMp5qhN3ue28=", "owner": "nix-community", "repo": "NUR", - "rev": "a6ff7d25d3bff4f6c7f74af5ca36700606fb60bc", + "rev": "c468956d1604fb0182d24448a1cb45ab948bf4ca", "type": "github" }, "original": { @@ -521,11 +521,11 @@ ] }, "locked": { - "lastModified": 1678415622, - "narHash": "sha256-tems1jHETCYEen8QrW61yVVX0F4zOGy4ImB43iDc7bY=", + "lastModified": 1680488274, + "narHash": "sha256-0vYMrZDdokVmPQQXtFpnqA2wEgCCUXf5a3dDuDVshn0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "9f687941160108f89dd8bd2c650d32c15a35c7c7", + "rev": "7ec2ff598a172c6e8584457167575b3a1a5d80d8", "type": "github" }, "original": { @@ -544,11 +544,11 @@ ] }, "locked": { - "lastModified": 1679377997, - "narHash": "sha256-O8rmc/b/qgNgoHj2tL5+3Ovkj7A+Sok7gazRoWbpnqg=", + "lastModified": 1680404136, + "narHash": "sha256-06D8HJmRv4DdpEQGblMhx2Vm81SBWM61XBBIx7QQfo0=", "owner": "Mic92", "repo": "sops-nix", - "rev": "d8827a8368c307fbc6ed594c9a31d619e7360bed", + "rev": "b93eb910f768f9788737bfed596a598557e5625d", "type": "github" }, "original": { diff --git a/nixos/boxes/foryog/custom-kernel.nix b/nixos/boxes/foryog/custom-kernel.nix deleted file mode 100644 index 8d09e437..00000000 --- a/nixos/boxes/foryog/custom-kernel.nix +++ /dev/null @@ -1,100 +0,0 @@ -{ - config, - pkgs, - ... -}: { - boot.kernelPackages = pkgs.linuxPackages_latest; - nixpkgs.overlays = [ - (self: super: { - buildLinux = x: - super.buildLinux ({ - ignoreConfigErrors = true; - enableParallelBuilding = true; - } - // x); - }) - ]; - boot.kernelPatches = [ - { - name = "foureighty"; - patch = null; - extraConfig = '' - ACPI_CUSTOM_METHOD n - ACPI_DPTF y - BUG y - CC_STACKPROTECTOR_STRONG y - CPU_IDLE_GOV_HALTPOLL y - CPU_IDLE_GOV_TEO y - DEBUG_CREDENTIALS y - DEBUG_NOTIFIERS y - DEBUG_PI_LIST y - DEBUG_PLIST y - DEBUG_RODATA y - DEBUG_SET_MODULE_RONX y - DEBUG_SG y - DEVMEM y - DPTF_PCH_FIVR m - DPTF_POWER m - ENERGY_MODEL y - FORTIFY_SOURCE y - GCC_PLUGINS y - GCC_PLUGIN_LATENT_ENTROPY y - GCC_PLUGIN_RANDSTRUCT y - GCC_PLUGIN_RANDSTRUCT_PERFORMANCE y - GCC_PLUGIN_STACKLEAK y - GCC_PLUGIN_STRUCTLEAK y - GCC_PLUGIN_STRUCTLEAK_BYREF_ALL y - HARDENED_USERCOPY y - HARDENED_USERCOPY_FALLBACK y - HARDLOCKUP_DETECTOR y - HZ_300 y - INET_DIAG n - INET_DIAG_DESTROY option no - INET_MPTCP_DIAG option no - INET_RAW_DIAG option no - INET_TCP_DIAG option no - INET_UDP_DIAG option no - INIT_ON_ALLOC_DEFAULT_ON y - INIT_ON_FREE_DEFAULT_ON y - INTEL_TXT y - KEXEC n - KFENCE y - LEGACY_VSYSCALL_NONE y - LOCKUP_DETECTOR y - MCORE2 y - NR_CPUS 16 - NUMA_BALANCING y - NUMA_BALANCING_DEFAULT_ENABLED y - PAGE_POISONING y - PAGE_POISONING_NO_SANITY y - PAGE_POISONING_ZERO y - PANIC_TIMEOUT -1 - PM_AUTOSLEEP y - POWER_EFFICIENT_DEFAULT y - PREEMPT y - PREEMPTION y - PREEMPT_COUNT y - PREEMPT_DYNAMIC y - PREEMPT_RCU y - PROC_KCORE n - RANDOMIZE_KSTACK_OFFSET_DEFAULT y - SCHED_CORE y - SCHED_STACK_END_CHECK y - SECURITY_SAFESETID y - SECURITY_SELINUX_DISABLE n - SECURITY_WRITABLE_HOOKS n - SHUFFLE_PAGE_ALLOCATOR y - SLAB_FREELIST_HARDENED y - SLAB_FREELIST_RANDOM y - SLUB_DEBUG y - STRICT_DEVMEM y - STRICT_KERNEL_RWX y - UNINLINE_SPIN_UNLOCK y - WATCH_QUEUE y - X86_INTEL_TSX_MODE_AUTO y - X86_SGX y - X86_SGX_KVM y - ''; - } - ]; -} diff --git a/nixos/boxes/foryog/default.nix b/nixos/boxes/foryog/default.nix index de54dfe7..39db3dca 100644 --- a/nixos/boxes/foryog/default.nix +++ b/nixos/boxes/foryog/default.nix @@ -18,7 +18,6 @@ fileSystems."/" = { options = [ "compress=zstd" ]; }; boot.kernelPackages = pkgs.linuxPackages_latest; - boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; boot.plymouth = { enable = true; diff --git a/nixos/gui/default.nix b/nixos/gui/default.nix index 9e05da1b..f11901af 100644 --- a/nixos/gui/default.nix +++ b/nixos/gui/default.nix @@ -78,8 +78,7 @@ in { yubikey-manager-qt yubikey-personalization yubikey-personalization-gui - ] ++ (with unstable; [ glaxnimate gnucash kicad paperwork thunderbird ]) - ++ [ + ] ++ (with unstable; [ glaxnimate gnucash kicad thunderbird ]) ++ [ nixpkgs-nixos-stable-and-unfree.discord nixpkgs-nixos-unstable-and-unfree.hopper ];