update, foryog compat
This commit is contained in:
parent
5c7facc8c0
commit
71d6a42823
4 changed files with 40 additions and 142 deletions
78
flake.lock
78
flake.lock
|
@ -9,11 +9,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1677033122,
|
"lastModified": 1679679664,
|
||||||
"narHash": "sha256-woPhdK2AvHDWPHD2/Fu3xjJ3TEuHyYyflxAkBKdumfY=",
|
"narHash": "sha256-YSdHsJ73G7TEFzbmpZ2peuMefIa9/vNB2g+xdiyma3U=",
|
||||||
"owner": "kamadorueda",
|
"owner": "kamadorueda",
|
||||||
"repo": "alejandra",
|
"repo": "alejandra",
|
||||||
"rev": "a7005b0c500432549e2aa94fd817f5ff9b529f05",
|
"rev": "d00d03f0b45d2d1d6e0ae2d110c821b497d8fb09",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -46,11 +46,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1673295039,
|
"lastModified": 1680266963,
|
||||||
"narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=",
|
"narHash": "sha256-IW/lzbUCOcldLHWHjNSg1YoViDnZOmz0ZJL7EH9OkV8=",
|
||||||
"owner": "lnl7",
|
"owner": "lnl7",
|
||||||
"repo": "nix-darwin",
|
"repo": "nix-darwin",
|
||||||
"rev": "87b9d090ad39b25b2400029c64825fc2a8868943",
|
"rev": "99d4187d11be86b49baa3a1aec0530004072374f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -83,11 +83,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1680146283,
|
"lastModified": 1680767287,
|
||||||
"narHash": "sha256-YZSw3O6uv6NqOJP+dol/njmzblRFIsrmqqb0HsL4mcQ=",
|
"narHash": "sha256-WW6cLmfCSgffE5TnG+8+IcoWd9PxeM0PqOuYcWnWkEY=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "disko",
|
"repo": "disko",
|
||||||
"rev": "4d9c89abde7ccedf743a01119d41fb880793bcba",
|
"rev": "8891df70294ed9b8c930954f555391c4ba9bfe82",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -212,11 +212,11 @@
|
||||||
},
|
},
|
||||||
"flake-utils": {
|
"flake-utils": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1678901627,
|
"lastModified": 1680946745,
|
||||||
"narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
|
"narHash": "sha256-KqGlwg9UTDsFBZZB8wzXgMnc8XQm95LtSbFvBsnqkPI=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "flake-utils",
|
"repo": "flake-utils",
|
||||||
"rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
|
"rev": "946da791763db1c306b86a8bd3828bf5814a1247",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -288,11 +288,11 @@
|
||||||
"utils": "utils"
|
"utils": "utils"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1679067101,
|
"lastModified": 1680555990,
|
||||||
"narHash": "sha256-tMI1inGT9u4KWQml0w30dhWqQPlth1e9K/68sfDkEQA=",
|
"narHash": "sha256-Tu/i5sd0hk4c4VtWO8XpY3c9KmHDcOWF5Y2GSCh3LXA=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "9154cd519a8942728038819682d6b3ff33f321bb",
|
"rev": "d6f3ba090ed090ae664ab5bac329654093aae725",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -340,11 +340,11 @@
|
||||||
"rust-overlay": "rust-overlay_2"
|
"rust-overlay": "rust-overlay_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1678728829,
|
"lastModified": 1680544266,
|
||||||
"narHash": "sha256-KbA8uakGfjfvRH+Td/VegiLdHrnqIZHkMTQ5XBjL2dE=",
|
"narHash": "sha256-d/TusDXmIo8IT5DNRA21lN+nOVSER8atIx9TJteR6LQ=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "nil",
|
"repo": "nil",
|
||||||
"rev": "e7045f1779fd202a3316f84b864c304f339cccea",
|
"rev": "56a1fa87b98a9508920f4b0ab8fe36d5b54b2362",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -356,11 +356,11 @@
|
||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1679598117,
|
"lastModified": 1680876084,
|
||||||
"narHash": "sha256-Vs1f/7imI77OkMOQhO3xgx4jalN2Gx3D3C2wmnlpWJM=",
|
"narHash": "sha256-eP9yxP0wc7XuVaODugh+ajgbFGaile2O1ihxiLxOuvU=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "648021dcb2b65498eed3ea3a7339cdfc3bea4d82",
|
"rev": "3006d2860a6ed5e01b0c3e7ffb730e9b293116e2",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -372,11 +372,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-master": {
|
"nixpkgs-master": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1679603234,
|
"lastModified": 1680954122,
|
||||||
"narHash": "sha256-0aY2rolFDG553LIuV3OJkyBvEd9fdQ0K54+1twYJPlc=",
|
"narHash": "sha256-uDwWxpnWkJDAKM2pwQbFG+Ppq5arg80uDeKBUGL+5d8=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "6cc53be05a22841d3c9f8446fc03b37db2cdce5a",
|
"rev": "e8a861f940da69ca8d4607b893354b7177f7250e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -388,11 +388,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-nixos-unstable": {
|
"nixpkgs-nixos-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1679437018,
|
"lastModified": 1680758185,
|
||||||
"narHash": "sha256-vOuiDPLHSEo/7NkiWtxpHpHgoXoNmrm+wkXZ6a072Fc=",
|
"narHash": "sha256-sCVWwfnk7zEX8Z+OItiH+pcSklrlsLZ4TJTtnxAYREw=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "19cf008bb18e47b6e3b4e16e32a9a4bdd4b45f7e",
|
"rev": "0e19daa510e47a40e06257e205965f3b96ce0ac9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -420,11 +420,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-stable": {
|
"nixpkgs-stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1679472241,
|
"lastModified": 1680865339,
|
||||||
"narHash": "sha256-VK2YDic2NjPvfsuneJCLIrWS38qUfoW8rLLimx0rWXA=",
|
"narHash": "sha256-H6rmJ1CyJ3Q5ZyoLMYq/UEYMS9Q1orJjRpWiQ47HudE=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "9ef6e7727f4c31507627815d4f8679c5841efb00",
|
"rev": "0040164e473509b4aee6aedb3b923e400d6df10b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -436,11 +436,11 @@
|
||||||
},
|
},
|
||||||
"nur": {
|
"nur": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1679600805,
|
"lastModified": 1680932643,
|
||||||
"narHash": "sha256-/dACLCKi5LaEP6idzXUyoG8LnZnRtFf9HlLGhiJCNz8=",
|
"narHash": "sha256-vHkZJnPfA788UQ0zsfj4P09pVqBsn4niMp5qhN3ue28=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NUR",
|
"repo": "NUR",
|
||||||
"rev": "a6ff7d25d3bff4f6c7f74af5ca36700606fb60bc",
|
"rev": "c468956d1604fb0182d24448a1cb45ab948bf4ca",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -521,11 +521,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1678415622,
|
"lastModified": 1680488274,
|
||||||
"narHash": "sha256-tems1jHETCYEen8QrW61yVVX0F4zOGy4ImB43iDc7bY=",
|
"narHash": "sha256-0vYMrZDdokVmPQQXtFpnqA2wEgCCUXf5a3dDuDVshn0=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "9f687941160108f89dd8bd2c650d32c15a35c7c7",
|
"rev": "7ec2ff598a172c6e8584457167575b3a1a5d80d8",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -544,11 +544,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1679377997,
|
"lastModified": 1680404136,
|
||||||
"narHash": "sha256-O8rmc/b/qgNgoHj2tL5+3Ovkj7A+Sok7gazRoWbpnqg=",
|
"narHash": "sha256-06D8HJmRv4DdpEQGblMhx2Vm81SBWM61XBBIx7QQfo0=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "d8827a8368c307fbc6ed594c9a31d619e7360bed",
|
"rev": "b93eb910f768f9788737bfed596a598557e5625d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -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
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
];
|
|
||||||
}
|
|
|
@ -18,7 +18,6 @@
|
||||||
fileSystems."/" = { options = [ "compress=zstd" ]; };
|
fileSystems."/" = { options = [ "compress=zstd" ]; };
|
||||||
|
|
||||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||||
|
|
||||||
boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
|
boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
|
||||||
boot.plymouth = {
|
boot.plymouth = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
@ -78,8 +78,7 @@ in {
|
||||||
yubikey-manager-qt
|
yubikey-manager-qt
|
||||||
yubikey-personalization
|
yubikey-personalization
|
||||||
yubikey-personalization-gui
|
yubikey-personalization-gui
|
||||||
] ++ (with unstable; [ glaxnimate gnucash kicad paperwork thunderbird ])
|
] ++ (with unstable; [ glaxnimate gnucash kicad thunderbird ]) ++ [
|
||||||
++ [
|
|
||||||
nixpkgs-nixos-stable-and-unfree.discord
|
nixpkgs-nixos-stable-and-unfree.discord
|
||||||
nixpkgs-nixos-unstable-and-unfree.hopper
|
nixpkgs-nixos-unstable-and-unfree.hopper
|
||||||
];
|
];
|
||||||
|
|
Loading…
Reference in a new issue