diff --git a/flake.lock b/flake.lock index 686c8c6..b050d95 100644 --- a/flake.lock +++ b/flake.lock @@ -15,28 +15,6 @@ "type": "github" } }, - "crane_2": { - "inputs": { - "nixpkgs": [ - "schizofox", - "searx-randomizer", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1701386725, - "narHash": "sha256-w4aBlMYh9Y8co1V80m5LzEKMijUJ7CBTq209WbqVwUU=", - "owner": "ipetkov", - "repo": "crane", - "rev": "8b9bad9b30bd7a9ed08782e64846b7485f9d0a38", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -53,61 +31,6 @@ "type": "github" } }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "schizofox", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1722555600, - "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1698882062, - "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -147,54 +70,6 @@ "type": "github" } }, - "hercules-ci-effects": { - "inputs": { - "flake-parts": [ - "schizofox", - "nixpak", - "flake-parts" - ], - "nixpkgs": [ - "schizofox", - "nixpak", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1719226092, - "narHash": "sha256-YNkUMcCUCpnULp40g+svYsaH1RbSEj6s4WdZY/SHe38=", - "owner": "hercules-ci", - "repo": "hercules-ci-effects", - "rev": "11e4b8dc112e2f485d7c97e1cee77f9958f498f5", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "hercules-ci-effects", - "type": "github" - } - }, - "home-manager": { - "inputs": { - "nixpkgs": [ - "schizofox", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1723015306, - "narHash": "sha256-jQnFEtH20/OsDPpx71ntZzGdRlpXhUENSQCGTjn//NA=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "b3d5ea65d88d67d4ec578ed11d4d2d51e3de525e", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, "impermanence": { "locked": { "lastModified": 1730403150, @@ -210,32 +85,6 @@ "type": "github" } }, - "nixpak": { - "inputs": { - "flake-parts": [ - "schizofox", - "flake-parts" - ], - "hercules-ci-effects": "hercules-ci-effects", - "nixpkgs": [ - "schizofox", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1723083542, - "narHash": "sha256-Nkbb3j+P0zMqvZUlV6WbT5erHasZ14NW0TJS3Bb9dVY=", - "owner": "nixpak", - "repo": "nixpak", - "rev": "d36970c58794c90401617accae0eb48868e335e6", - "type": "github" - }, - "original": { - "owner": "nixpak", - "repo": "nixpak", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1728018373, @@ -252,24 +101,6 @@ "type": "github" } }, - "nixpkgs-lib": { - "locked": { - "dir": "lib", - "lastModified": 1698611440, - "narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735", - "type": "github" - }, - "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1730785428, @@ -291,7 +122,6 @@ "helix": "helix", "impermanence": "impermanence", "nixpkgs": "nixpkgs_2", - "schizofox": "schizofox", "spicetify-nix": "spicetify-nix" } }, @@ -316,58 +146,9 @@ "type": "github" } }, - "schizofox": { - "inputs": { - "flake-compat": "flake-compat", - "flake-parts": "flake-parts", - "home-manager": "home-manager", - "nixpak": "nixpak", - "nixpkgs": [ - "nixpkgs" - ], - "searx-randomizer": "searx-randomizer", - "systems": "systems_2" - }, - "locked": { - "lastModified": 1730097974, - "narHash": "sha256-IA3w1sgSDC+Y5v6UcclWFk3WVrz1YesxH/TN5g1joaY=", - "owner": "schizofox", - "repo": "schizofox", - "rev": "5e29ad08854513d19acbdb7e54906f3ca85c81e7", - "type": "github" - }, - "original": { - "owner": "schizofox", - "repo": "schizofox", - "type": "github" - } - }, - "searx-randomizer": { - "inputs": { - "crane": "crane_2", - "flake-parts": "flake-parts_2", - "nixpkgs": [ - "schizofox", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1704412376, - "narHash": "sha256-Ap/AudJxCYBDWYy0lyqP0/FZYJCibL7jKkoj6hp1WS0=", - "owner": "schizofox", - "repo": "searx-randomizer", - "rev": "c36a473732ba6b4f6024ac1c181631cf4d542b17", - "type": "github" - }, - "original": { - "owner": "schizofox", - "repo": "searx-randomizer", - "type": "github" - } - }, "spicetify-nix": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "nixpkgs": [ "nixpkgs" ] @@ -400,21 +181,6 @@ "repo": "default", "type": "github" } - }, - "systems_2": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index d3c28e6..823037b 100644 --- a/flake.nix +++ b/flake.nix @@ -34,12 +34,6 @@ # Helix my beloved helix.url = "github:helix-editor/helix"; - # I use schizofox as my personal browser. This is because I am schizophrenic. - schizofox = { - url = "github:schizofox/schizofox"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - spicetify-nix = { url = "github:gerg-l/spicetify-nix"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/hosts/default.nix b/hosts/default.nix index d821660..ea3d308 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -2,7 +2,7 @@ inputs: let inherit (inputs) self; inherit (inputs.nixpkgs) lib; inherit (lib.lists) concatLists flatten singleton; - inherit (lib) mkDefault nixosSystem recursiveUpdate; + inherit (lib) nixosSystem recursiveUpdate; inherit (builtins) filter map toString; inherit (lib.filesystem) listFilesRecursive; inherit (lib.strings) hasSuffix; @@ -15,7 +15,6 @@ inputs: let ... } @ args: nixosSystem { - inherit system; specialArgs = recursiveUpdate { @@ -32,7 +31,6 @@ inputs: let ] (singleton { networking.hostName = hostname; - #thanks raf nixpkgs.hostPlatform = system; }) (flatten ( diff --git a/hosts/temperance/configuration.nix b/hosts/temperance/configuration.nix index 2e52b34..778a1b7 100644 --- a/hosts/temperance/configuration.nix +++ b/hosts/temperance/configuration.nix @@ -28,8 +28,8 @@ in { console.keyMap = "de"; security.polkit.enable = true; - # boot.kernelPackages = pkgs.linuxPackagesFor xanmod_blox; - boot.kernelPackages = pkgs.linuxPackages_xanmod_latest; + boot.kernelPackages = pkgs.linuxPackagesFor xanmod_blox; + # boot.kernelPackages = pkgs.linuxPackages_xanmod_latest; programs.nix-ld.enable = true; services = { fstrim.enable = lib.mkDefault true; @@ -66,7 +66,6 @@ in { sound.enable = true; hardware.nvidia.enable = true; }; - # style.colorScheme.name = "Zenburn"; usrEnv = { desktops.hyprland.enable = true; @@ -89,10 +88,6 @@ in { }; }; - style = { - gtk.enable = true; - qt.enable = true; - }; }; other = { system = { @@ -104,7 +99,6 @@ in { ssh.enable = true; btop.enable = true; nh.enable = true; - # steam.enable = true; }; }; diff --git a/hosts/temperance/filesystem/default.nix b/hosts/temperance/filesystem/default.nix index bad8be3..2f79bbf 100644 --- a/hosts/temperance/filesystem/default.nix +++ b/hosts/temperance/filesystem/default.nix @@ -10,7 +10,7 @@ "/" = { device = "none"; fsType = "tmpfs"; - options = ["defaults" "size=25%" "mode=755"]; + options = ["defaults" "size=40%" "mode=755"]; }; "/nix" = { device = "/dev/disk/by-uuid/f0569993-722e-4721-b0d9-8ac537a7a548"; diff --git a/hosts/temperance/kernel/unused.nix b/hosts/temperance/kernel/unused.nix new file mode 100644 index 0000000..8f4cc06 --- /dev/null +++ b/hosts/temperance/kernel/unused.nix @@ -0,0 +1,307 @@ +{lib, ...}: let + inherit (lib.kernel) no unset; + inherit (lib.attrsets) mapAttrs; + inherit (lib.modules) mkForce; +in { + boot.kernelPatches = [ + { + name = "disable-unused-features"; + patch = null; + extraStructuredConfig = mapAttrs (_: mkForce) { + ATALK = no; + BATMAN_ADV = no; + CAIF = no; + COMEDI = no; + DVB_CORE = no; + FB_TFT = no; + IIO = no; + INPUT_TOUCHSCREEN = no; + NFC = no; + SND_FIREWIRE = unset; + USB_GSPCA = no; + USB_SERIAL = no; + USB_SERIAL_CONSOLE = unset; + USB_SERIAL_GENERIC = unset; + WATCHDOG = no; + WATCHDOG_SYSFS = unset; + XEN = no; + + CRYPTO_842 = no; + DEBUG_MISC = no; + DEBUG_PREEMPT = no; + HIBERNATION = no; + KEXEC = no; + KEXEC_FILE = no; + + "60XX_WDT" = no; + "6LOWPAN" = no; + "8139CP" = no; + "8139TOO" = no; + "8139TOO_8129" = no; + + ALIENWARE_WMI = no; + ALIM1535_WDT = no; + ALIM7101_WDT = no; + ALTERA_MBOX = no; + ALTERA_MSGDMA = no; + ALTERA_TSE = no; + ALX = no; + + GENERIC_ADC_BATTERY = no; + IP5XXX_POWER = no; + TEST_POWER = no; + CHARGER_ADP5061 = no; + BATTERY_CW2015 = no; + BATTERY_DS2760 = no; + BATTERY_DS2780 = no; + BATTERY_DS2781 = no; + BATTERY_DS2782 = no; + BATTERY_SAMSUNG_SDI = no; + BATTERY_SBS = no; + CHARGER_SBS = no; + MANAGER_SBS = no; + BATTERY_BQ27XXX = no; + BATTERY_BQ27XXX_I2C = no; + BATTERY_BQ27XXX_HDQ = no; + BATTERY_BQ27XXX_DT_UPDATES_NVM = no; + CHARGER_DA9150 = no; + BATTERY_AXP20X = no; + AXP20X_POWER = no; + AXP288_CHARGER = no; + AXP288_FUEL_GAUGE = no; + BATTERY_MAX17040 = no; + BATTERY_MAX17042 = no; + BATTERY_MAX1721X = no; + CHARGER_PCF50633 = no; + CHARGER_ISP1704 = no; + CHARGER_MAX8903 = no; + CHARGER_LP8727 = no; + CHARGER_GPIO = no; + CHARGER_MANAGER = no; + CHARGER_LT3651 = no; + CHARGER_LTC4162L = no; + CHARGER_MAX14577 = no; + CHARGER_MAX77693 = no; + CHARGER_MAX77976 = no; + CHARGER_MP2629 = no; + CHARGER_MT6360 = no; + CHARGER_MT6370 = no; + CHARGER_BQ2415X = no; + CHARGER_BQ24190 = no; + CHARGER_BQ24257 = no; + CHARGER_BQ24735 = no; + CHARGER_BQ2515X = no; + CHARGER_BQ25890 = no; + CHARGER_BQ25980 = no; + CHARGER_BQ256XX = no; + CHARGER_SMB347 = no; + BATTERY_GAUGE_LTC2941 = no; + BATTERY_GOLDFISH = no; + BATTERY_RT5033 = no; + CHARGER_RT5033 = no; + CHARGER_RT9455 = no; + CHARGER_RT9467 = no; + CHARGER_RT9471 = no; + CHARGER_CROS_USBPD = no; + CHARGER_CROS_PCHG = no; + CHARGER_BD99954 = no; + CHARGER_WILCO = no; + BATTERY_SURFACE = no; + CHARGER_SURFACE = no; + BATTERY_UG3105 = no; + FUEL_GAUGE_MM8013 = no; + + GENERIC_IRQ_DEBUGFS = no; + + # remove samba support + CIFS = no; + CIFS_ROOT = no; + + # disable amdgpu cik support + DRM_AMDGPU_CIK = no; + + # disable radeon drivers + DRM_RADEON = no; + FB_RADEON = no; + FB_RADEON_I2C = no; + FB_RADEON_BACKLIGHT = no; + + # firewire + FIREWIRE = no; + FIREWIRE_OHCI = no; + FIREWIRE_SBP2 = no; + FIREWIRE_NET = no; + FIREWIRE_NOSY = no; + + # ms surface hid + SURFACE_AGGREGATOR = no; + + DELL_RBTN = no; + DELL_RBU = no; + DELL_SMBIOS = no; + DELL_WMI = no; + DELL_WMI_AIO = no; + DELL_WMI_DESCRIPTOR = no; + DELL_WMI_LED = no; + DELL_WMI_SYSMAN = no; + + HID_A4TECH = no; + HID_ACRUX = no; + HID_ALPS = no; + HID_APPLEIR = no; + HID_ASUS = no; + HID_AUREAL = no; + HID_BETOP_FF = no; + HID_BIGBEN_FF = no; + HID_CMEDIA = no; + HID_COUGAR = no; + HID_CREATIVE_SB0540 = no; + HID_CYPRESS = no; + HID_DRAGONRISE = no; + HID_ELAN = no; + HID_ELECOM = no; + HID_ELO = no; + HID_EMS_FF = no; + HID_EZKEY = no; + HID_GEMBIRD = no; + HID_GFRM = no; + HID_GOOGLE_HAMMER = no; + HID_GREENASIA = no; + HID_GT683R = no; + HID_GYRATION = no; + HID_HOLTEK = no; + HID_HYPERV_MOUSE = no; + HID_ICADE = no; + HID_ITE = no; + HID_KEYTOUCH = no; + HID_KYE = no; + HID_LCPOWER = no; + HID_LED = no; + HID_MALTRON = no; + HID_MCP2221 = no; + HID_MONTEREY = no; + HID_MULTITOUCH = no; + HID_NTI = no; + HID_NTRIG = no; + HID_PANTHERLORD = no; + HID_PENMOUNT = no; + HID_PETALYNX = no; + HID_PICOLCD = no; + HID_PLAYSTATION = no; + HID_PRIMAX = no; + HID_REDRAGON = no; + HID_RETRODE = no; + HID_RMI = no; + HID_RMI4 = no; + HID_SAITEK = no; + HID_SAMSUNG = no; + HID_SEMITEK = no; + HID_SMARTJOYPLUS = no; + HID_SONY = no; + HID_SPEEDLINK = no; + HID_SUNPLUS = no; + HID_THINGM = no; + HID_THRUSTMASTER = no; + HID_TIVO = no; + HID_TOPSEED = no; + HID_TWINHAN = no; + HID_U2FZERO = no; + HID_UCLOGIC = no; + HID_UDRAW_PS3 = no; + HID_VIEWSONIC = no; + HID_VIVALDI = no; + HID_WALTOP = no; + HID_WIIMOTE = no; + HID_XINMO = no; + HID_ZEROPLUS = no; + HID_ZYDACRON = no; + + # disable unused soc modules + SND_SOC_CHV3_I2S = no; + SND_SOC_ADI = no; + SND_SOC_APPLE_MCA = no; + SND_ATMEL_SOC = no; + SND_DESIGNWARE_I2S = no; + SND_SOC_FSL_ASRC = no; + SND_SOC_FSL_SAI = no; + SND_SOC_FSL_MQS = no; + SND_SOC_FSL_AUDMIX = no; + SND_SOC_FSL_SSI = no; + SND_SOC_FSL_SPDIF = no; + SND_SOC_FSL_ESAI = no; + SND_SOC_FSL_MICFIL = no; + SND_SOC_FSL_EASRC = no; + SND_SOC_FSL_XCVR = no; + SND_SOC_FSL_UTILS = no; + SND_SOC_FSL_RPMSG = no; + SND_I2S_HI6210_I2S = no; + SND_SOC_IMG = no; + SND_SOC_STI = no; + SND_SOC_XILINX_I2S = no; + SND_SOC_XILINX_AUDIO_FORMATTER = no; + SND_SOC_XILINX_SPDIF = no; + SND_XEN_FRONTEND = no; + + INFINIBAND = no; + INFINIBAND_IPOIB = unset; + INFINIBAND_IPOIB_CM = unset; + NET_DSA = no; + NET_VENDOR_CISCO = no; + NET_VENDOR_HUAWEI = no; + NET_VENDOR_MARVELL = no; + NET_VENDOR_MELLANOX = no; + NET_VENDOR_RENESAS = no; + NET_VENDOR_STMICRO = no; + RT2800USB_RT53XX = unset; + RT2800USB_RT55XX = unset; + WLAN_VENDOR_MARVELL = no; + WLAN_VENDOR_MEDIATEK = no; + WLAN_VENDOR_RALINK = no; + X25 = no; + + AFFS_FS = no; + AFS_FS = no; + BEFS_FS = no; + CODA_FS = no; + JFS_FS = no; + OCFS2_FS = no; + OMFS_FS = no; + ORANGEFS_FS = no; + SYSV_FS = no; + + CHROME_PLATFORMS = no; + CHROMEOS_LAPTOP = unset; + CHROMEOS_PSTORE = unset; + CHROMEOS_TBMC = unset; + CROS_EC = unset; + CROS_EC_I2C = unset; + CROS_EC_ISHTP = unset; + CROS_EC_LPC = unset; + CROS_EC_SPI = unset; + CROS_KBD_LED_BACKLIGHT = unset; + + SND_SOC = no; + SND_SOC_INTEL_SOUNDWIRE_SOF_MACH = unset; + SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES = unset; + SND_SOC_SOF_ACPI = unset; + SND_SOC_SOF_APOLLOLAKE = unset; + SND_SOC_SOF_CANNONLAKE = unset; + SND_SOC_SOF_COFFEELAKE = unset; + SND_SOC_SOF_COMETLAKE = unset; + SND_SOC_SOF_ELKHARTLAKE = unset; + SND_SOC_SOF_GEMINILAKE = unset; + SND_SOC_SOF_HDA_AUDIO_CODEC = unset; + SND_SOC_SOF_HDA_LINK = unset; + SND_SOC_SOF_ICELAKE = unset; + SND_SOC_SOF_INTEL_TOPLEVEL = unset; + SND_SOC_SOF_JASPERLAKE = unset; + SND_SOC_SOF_MERRIFIELD = unset; + SND_SOC_SOF_PCI = unset; + SND_SOC_SOF_TIGERLAKE = unset; + SND_SOC_SOF_TOPLEVEL = unset; + + HUAWEI_WMI = no; + }; + } + ]; +} diff --git a/hosts/temperance/kernel/xanmod.nix b/hosts/temperance/kernel/xanmod.nix index 6ffdedd..d366252 100644 --- a/hosts/temperance/kernel/xanmod.nix +++ b/hosts/temperance/kernel/xanmod.nix @@ -1,6 +1,5 @@ { lib, - stdenv, fetchFromGitHub, buildLinux, kernelPatches, @@ -9,54 +8,66 @@ pname = "linux-xanmod"; version = "6.11.5"; vendorSuffix = "xanmod1"; - modDirVersion = lib.versions.pad 3 "${version}-xanmod1"; + modDirVersion = lib.versions.pad 3 "${version}-blox"; - inherit (lib.modules) mkForce; + inherit (lib.modules) mkForce mkOverride; inherit (lib.kernel) freeform yes no; - xanmod_blox = buildLinux { - inherit pname version modDirVersion; + xanmod_blox = + (buildLinux { + inherit pname version modDirVersion; - src = fetchFromGitHub { - owner = "xanmod"; - repo = "linux"; - rev = "refs/tags/${version}-${vendorSuffix}"; - hash = "sha256-G4u0LQtIeJ0dNAmjNH0OKihmbkivYVbrbXDB9vPw2xI="; - }; + src = fetchFromGitHub { + owner = "xanmod"; + repo = "linux"; + rev = "refs/tags/${version}-${vendorSuffix}"; + hash = "sha256-G4u0LQtIeJ0dNAmjNH0OKihmbkivYVbrbXDB9vPw2xI="; + }; - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - ]; + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; - enableCommonConfig = true; - # Default Xanmod options - structuredExtraConfig = { - # CPUFreq governor Performance - CPU_FREQ_DEFAULT_GOV_PERFORMANCE = mkForce 60 yes; - CPU_FREQ_DEFAULT_GOV_SCHEDUTIL = mkForce 60 no; + enableCommonConfig = true; + # Default Xanmod options + structuredExtraConfig = { + # CPUFreq governor Performance + CPU_FREQ_DEFAULT_GOV_PERFORMANCE = mkOverride 60 yes; + CPU_FREQ_DEFAULT_GOV_SCHEDUTIL = mkOverride 60 no; - # Full preemption - PREEMPT = mkForce 60 yes; - PREEMPT_VOLUNTARY = mkForce 60 no; + # Full preemption + PREEMPT = mkOverride 60 yes; + PREEMPT_VOLUNTARY = mkOverride 60 no; - # Google's BBRv3 TCP congestion Control - TCP_CONG_BBR = yes; - DEFAULT_BBR = yes; + # Google's BBRv3 TCP congestion Control + TCP_CONG_BBR = yes; + DEFAULT_BBR = yes; - # Preemptive Full Tickless Kernel at 250Hz - HZ = freeform "250"; - HZ_250 = yes; - HZ_1000 = no; + # Preemptive Full Tickless Kernel at 250Hz + HZ = freeform "250"; + HZ_250 = yes; + HZ_1000 = no; - # RCU_BOOST and RCU_EXP_KTHREAD - RCU_EXPERT = yes; - RCU_FANOUT = freeform "64"; - RCU_FANOUT_LEAF = freeform "16"; - RCU_BOOST = yes; - RCU_BOOST_DELAY = freeform "0"; - RCU_EXP_KTHREAD = yes; - }; - }; + # RCU_BOOST and RCU_EXP_KTHREAD + RCU_EXPERT = yes; + RCU_FANOUT = freeform "64"; + RCU_FANOUT_LEAF = freeform "16"; + RCU_BOOST = yes; + RCU_BOOST_DELAY = freeform "0"; + RCU_EXP_KTHREAD = yes; + }; + }) + # 1:1 taken from raf's custom kernel, check out his config for this. + .overrideAttrs (oa: { + prePatch = + (oa.prePatch or "") + + '' + # bragging rights + echo "Replacing localversion with custom suffix" + substituteInPlace localversion \ + --replace-fail "xanmod1" "blox" + ''; + }); in { inherit xanmod_blox diff --git a/modules/services/mpd.nix b/modules/services/mpd.nix index a813203..8cd3cee 100644 --- a/modules/services/mpd.nix +++ b/modules/services/mpd.nix @@ -22,7 +22,6 @@ in { extraConfig = '' restore_paused "yes" auto_update "yes" - playlist_directory "${cfg.musicDirectory}/.playlists" audio_output { type "pipewire"