From 8111b237262973f603f0a3255ac69022b2e867fa Mon Sep 17 00:00:00 2001 From: zuckerberg <5-zuckerberg@users.noreply.git.neet.dev> Date: Sun, 9 May 2021 08:56:47 -0400 Subject: [PATCH 01/10] disable tor browser --- common/pc/de.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/pc/de.nix b/common/pc/de.nix index 24670e7..66c02d2 100644 --- a/common/pc/de.nix +++ b/common/pc/de.nix @@ -10,7 +10,7 @@ in { ./chromium.nix ./firefox.nix ./audio.nix - ./torbrowser.nix +# ./torbrowser.nix ./pithos.nix ./vscodium.nix ./discord.nix From 8c3d166be262c76b450e99aa8c9fd1251580d7a4 Mon Sep 17 00:00:00 2001 From: zuckerberg <5-zuckerberg@users.noreply.git.neet.dev> Date: Sun, 9 May 2021 08:59:43 -0400 Subject: [PATCH 02/10] fix config conflict --- machines/storage/s0/kernel.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/machines/storage/s0/kernel.nix b/machines/storage/s0/kernel.nix index 0a4385b..0d1ab45 100644 --- a/machines/storage/s0/kernel.nix +++ b/machines/storage/s0/kernel.nix @@ -4196,11 +4196,6 @@ in buildLinux { "XFS_RT" = yes; "GFS2_FS" = module; "GFS2_FS_LOCKING_DLM" = yes; - "OCFS2_FS" = module; - "OCFS2_FS_O2CB" = module; - "OCFS2_FS_USERSPACE_CLUSTER" = module; - "OCFS2_FS_STATS" = yes; - "OCFS2_DEBUG_MASKLOG" = yes; "BTRFS_FS" = yes; "BTRFS_FS_POSIX_ACL" = yes; "NILFS2_FS" = module; From c9b7f0831219118f25d29159ea5fb39dcde9ceac Mon Sep 17 00:00:00 2001 From: zuckerberg <5-zuckerberg@users.noreply.git.neet.dev> Date: Sun, 9 May 2021 09:07:59 -0400 Subject: [PATCH 03/10] fix config conflict --- machines/storage/s0/kernel.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/machines/storage/s0/kernel.nix b/machines/storage/s0/kernel.nix index 0d1ab45..2f539dd 100644 --- a/machines/storage/s0/kernel.nix +++ b/machines/storage/s0/kernel.nix @@ -110,9 +110,6 @@ in buildLinux { "NO_HZ_IDLE" = yes; "NO_HZ" = yes; "HIGH_RES_TIMERS" = yes; - "PREEMPT" = yes; - "PREEMPT_COUNT" = yes; - "PREEMPTION" = yes; "TICK_CPU_ACCOUNTING" = yes; "SCHED_THERMAL_PRESSURE" = yes; "BSD_PROCESS_ACCT" = yes; @@ -122,7 +119,6 @@ in buildLinux { "TASK_XACCT" = yes; "TASK_IO_ACCOUNTING" = yes; "TREE_RCU" = yes; - "PREEMPT_RCU" = yes; "SRCU" = yes; "TREE_SRCU" = yes; "TASKS_RCU_GENERIC" = yes; From fae0cad636639b919e30787323b15426f2b6de8e Mon Sep 17 00:00:00 2001 From: zuckerberg <5-zuckerberg@users.noreply.git.neet.dev> Date: Sun, 9 May 2021 09:08:47 -0400 Subject: [PATCH 04/10] fix config conflict --- machines/storage/s0/kernel.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/machines/storage/s0/kernel.nix b/machines/storage/s0/kernel.nix index 2f539dd..5e88be2 100644 --- a/machines/storage/s0/kernel.nix +++ b/machines/storage/s0/kernel.nix @@ -150,7 +150,6 @@ in buildLinux { "CGROUP_SCHED" = yes; "FAIR_GROUP_SCHED" = yes; "CFS_BANDWIDTH" = yes; - "RT_GROUP_SCHED" = yes; "CGROUP_PIDS" = yes; "CGROUP_RDMA" = yes; "CGROUP_FREEZER" = yes; From 4c01c2f86de85d3614236c4a03e9b818d4259bd3 Mon Sep 17 00:00:00 2001 From: zuckerberg <5-zuckerberg@users.noreply.git.neet.dev> Date: Sun, 9 May 2021 09:09:25 -0400 Subject: [PATCH 05/10] fix config conflict --- machines/storage/s0/kernel.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/machines/storage/s0/kernel.nix b/machines/storage/s0/kernel.nix index 5e88be2..db9ff30 100644 --- a/machines/storage/s0/kernel.nix +++ b/machines/storage/s0/kernel.nix @@ -4788,7 +4788,6 @@ in buildLinux { "KUNIT" = module; "ARCH_HAS_KCOV" = yes; "CC_HAS_SANCOV_TRACE_PC" = yes; - "RUNTIME_TESTING_MENU" = yes; "BACKTRACE_SELF_TEST" = module; "RBTREE_TEST" = module; "REED_SOLOMON_TEST" = module; From 4a13584cb45a7209866ddbcdac1140c2b8de9687 Mon Sep 17 00:00:00 2001 From: zuckerberg <5-zuckerberg@users.noreply.git.neet.dev> Date: Sun, 9 May 2021 09:10:02 -0400 Subject: [PATCH 06/10] fix config conflict --- machines/storage/s0/kernel.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/machines/storage/s0/kernel.nix b/machines/storage/s0/kernel.nix index db9ff30..7ffc384 100644 --- a/machines/storage/s0/kernel.nix +++ b/machines/storage/s0/kernel.nix @@ -4417,9 +4417,6 @@ in buildLinux { "SECURITY_APPARMOR_HASH_DEFAULT" = yes; "SECURITY_YAMA" = yes; "SECURITY_SAFESETID" = yes; - "SECURITY_LOCKDOWN_LSM" = yes; - "SECURITY_LOCKDOWN_LSM_EARLY" = yes; - "LOCK_DOWN_KERNEL_FORCE_NONE" = yes; "INTEGRITY" = yes; "INTEGRITY_SIGNATURE" = yes; "INTEGRITY_ASYMMETRIC_KEYS" = yes; From 3d3dfe68d97b28f39d4e00b0d74f7498a8f823c6 Mon Sep 17 00:00:00 2001 From: zuckerberg <5-zuckerberg@users.noreply.git.neet.dev> Date: Sun, 9 May 2021 09:10:39 -0400 Subject: [PATCH 07/10] fix config conflict --- machines/storage/s0/kernel.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/machines/storage/s0/kernel.nix b/machines/storage/s0/kernel.nix index 7ffc384..959e1bb 100644 --- a/machines/storage/s0/kernel.nix +++ b/machines/storage/s0/kernel.nix @@ -1344,7 +1344,6 @@ in buildLinux { "UEVENT_HELPER" = yes; "DEVTMPFS" = yes; "DEVTMPFS_MOUNT" = yes; - "STANDALONE" = yes; "PREVENT_FIRMWARE_BUILD" = yes; "FW_LOADER" = yes; "FW_CACHE" = yes; From 8a6d0b8a4bce9270104d50a46892b0f53665c5f8 Mon Sep 17 00:00:00 2001 From: zuckerberg <5-zuckerberg@users.noreply.git.neet.dev> Date: Sun, 9 May 2021 09:11:15 -0400 Subject: [PATCH 08/10] fix config conflict --- machines/storage/s0/kernel.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/machines/storage/s0/kernel.nix b/machines/storage/s0/kernel.nix index 959e1bb..2867090 100644 --- a/machines/storage/s0/kernel.nix +++ b/machines/storage/s0/kernel.nix @@ -1341,7 +1341,6 @@ in buildLinux { "PCIE_ROCKCHIP_EP" = yes; "PCI_ENDPOINT" = yes; "PCI_ENDPOINT_CONFIGFS" = yes; - "UEVENT_HELPER" = yes; "DEVTMPFS" = yes; "DEVTMPFS_MOUNT" = yes; "PREVENT_FIRMWARE_BUILD" = yes; From d5efae37aa7e07a593f73f6632b82e6760b3416b Mon Sep 17 00:00:00 2001 From: zuckerberg <5-zuckerberg@users.noreply.git.neet.dev> Date: Sun, 9 May 2021 09:12:01 -0400 Subject: [PATCH 09/10] fix config conflict --- machines/storage/s0/kernel.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/machines/storage/s0/kernel.nix b/machines/storage/s0/kernel.nix index 2867090..4bf3517 100644 --- a/machines/storage/s0/kernel.nix +++ b/machines/storage/s0/kernel.nix @@ -4638,15 +4638,6 @@ in buildLinux { "LZ4_DECOMPRESS" = yes; "ZSTD_COMPRESS" = yes; "ZSTD_DECOMPRESS" = yes; - "XZ_DEC" = yes; - "XZ_DEC_X86" = yes; - "XZ_DEC_POWERPC" = yes; - "XZ_DEC_IA64" = yes; - "XZ_DEC_ARM" = yes; - "XZ_DEC_ARMTHUMB" = yes; - "XZ_DEC_SPARC" = yes; - "XZ_DEC_BCJ" = yes; - "XZ_DEC_TEST" = module; "DECOMPRESS_GZIP" = yes; "DECOMPRESS_BZIP2" = yes; "DECOMPRESS_LZMA" = yes; From 8ad73f49d7593c821f0478b06a83759b1cbd2711 Mon Sep 17 00:00:00 2001 From: zuckerberg <5-zuckerberg@users.noreply.git.neet.dev> Date: Sun, 9 May 2021 09:12:51 -0400 Subject: [PATCH 10/10] fix config conflict --- machines/storage/s0/kernel.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/machines/storage/s0/kernel.nix b/machines/storage/s0/kernel.nix index 4bf3517..872911e 100644 --- a/machines/storage/s0/kernel.nix +++ b/machines/storage/s0/kernel.nix @@ -604,15 +604,6 @@ in buildLinux { "FRONTSWAP" = yes; "CMA" = yes; "CMA_AREAS" = freeform "7"; - "ZSWAP" = yes; - "ZSWAP_COMPRESSOR_DEFAULT_LZO" = yes; - "ZSWAP_COMPRESSOR_DEFAULT" = freeform "lzo"; - "ZSWAP_ZPOOL_DEFAULT_ZBUD" = yes; - "ZSWAP_ZPOOL_DEFAULT" = freeform "zbud"; - "ZPOOL" = yes; - "ZBUD" = yes; - "Z3FOLD" = yes; - "ZSMALLOC" = yes; "GENERIC_EARLY_IOREMAP" = yes; "ARCH_HAS_PTE_DEVMAP" = yes; "FRAME_VECTOR" = yes;