systemd: enable cgroupv1 temorarily

else won't boot
JohnRTitor · Aug 2, 2024 · 3b98261 · 3b98261
1 parent d2608fc
commit 3b98261
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 19 deletions.
diff --git a/programs/neovim.nix b/programs/neovim.nix
@@ -1,5 +1,4 @@
-{...}:
-{
+{...}: {
   programs.neovim = {
     enable = true; # Enable Neovim
     vimAlias = true; # Enable vim alias

diff --git a/system/boot/boot-options.nix b/system/boot/boot-options.nix
@@ -19,6 +19,8 @@
   # boot.consoleLogLevel = 0; # configure silent boot
   boot.kernelParams = [
     "nohibernate" # disable hibernate, can't on zram swap, also skips lockscreen/login manager so not secure
+    "systemd.unified_cgroup_hierachy=0"
+    "SYSTEMD_CGROUP_ENABLE_LEGACY_FORCE=1"
     # "acpi_enforce_resources=lax" # openrgb
     # "quiet"
     # "udev.log_level=3"

diff --git a/system/boot/kernel.nix b/system/boot/kernel.nix
@@ -4,7 +4,7 @@
   pkgs,
   ...
 }: {
-  boot.kernelPackages = pkgs.linuxPackages_cachyos-lto;
+  boot.kernelPackages = pkgs.linuxPackages_cachyos;
 
   boot.extraModulePackages = with config.boot.kernelPackages; [
     # zenpower is used for reading temperature, voltage, current and power

diff --git a/system/default.nix b/system/default.nix
@@ -44,5 +44,5 @@
     # Import if laptop mode is enabled
     lib.optionals (systemSettings.laptop) [./power.nix];
 
-  system.nixos.tags = lib.mkDefault [ "cachyos" ];
+  system.nixos.tags = lib.mkDefault ["cachyos"];
 }
diff --git a/system/hardware/graphics.nix b/system/hardware/graphics.nix
@@ -58,13 +58,17 @@ in {
       libvdpau-va-gl
     ];
   };
-  environment.systemPackages = with pkgs; [
-    ## GRAPHICS UTILS ##
-    clinfo # OpenCL hardware information
-    libva-utils # libva graphics library tools
-    vdpauinfo # vdpau graphics library tools
-    vulkan-tools # vulkan graphics library tools
-  ];
+  environment.systemPackages =
+    (with pkgs; [
+      ## GRAPHICS UTILS ##
+      clinfo # OpenCL hardware information
+      libva-utils # libva graphics library tools
+      vdpauinfo # vdpau graphics library tools
+      vulkan-tools # vulkan graphics library tools
+    ])
+    ++ (with nur-amdgpu; [
+      amdgpu-pro-libs.prefixes
+    ]);
 
   # Use modesetting driver for Xorg, its better and updated
   # AMDGPU graphics driver for Xorg is deprecated

diff --git a/system/hyprland.nix b/system/hyprland.nix
@@ -139,10 +139,10 @@ in {
       xorg.xhost # needed for some packages running x11 like gparted
 
       ## GNOME Suite ##
-      gnome.nautilus # file manager
+      nautilus # file manager
       gnome-text-editor # text editor
       shotcut # video editor
-      gnome.gnome-system-monitor # system monitor
+      gnome-system-monitor # system monitor
       loupe # image viewer
 
       ## Hypr ecosystem ##

diff --git a/system/nix-settings.nix b/system/nix-settings.nix
@@ -5,6 +5,7 @@
   ...
 }: {
   nix.package = pkgs.lix; # pkgs.nixVersions.latest; # Use latest nix
+  # DONOT DISABLE THIS
   nix.settings.trusted-users = [userSettings.username]; # FIXME: if someday custom cache works without this
 
   # Features for building
@@ -24,7 +25,8 @@
     "nix-command"
     "flakes"
   ]; # enable nix command and flakes
-  nix.settings.auto-optimise-store = true; # enable space optimisation by hardlinking
+  # auto optimise sometimes corrupts, DANGEROUS
+  # nix.settings.auto-optimise-store = true; # enable space optimisation by hardlinking
 
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;

diff --git a/system/safe-specialization.nix b/system/safe-specialization.nix
@@ -1,8 +1,11 @@
-{lib, pkgs, ... }:
 {
-  # Creates a second boot entry with LTS kernel, stable ZFS, stable Mesa3D.
+  lib,
+  pkgs,
+  ...
+}: {
+  # Creates a second boot entry with xanmod kernel and scx disabled
   specialisation.safe.configuration = {
-    system.nixos.tags = [ "xanmod" ];
+    system.nixos.tags = ["xanmod"];
     boot.kernelPackages = lib.mkForce pkgs.linuxPackages_xanmod_latest;
     chaotic.scx.enable = lib.mkForce false;
   };

diff --git a/system/services/default.nix b/system/services/default.nix
@@ -27,6 +27,8 @@
   chaotic.scx.enable = true; # by default uses rustland
   chaotic.scx.scheduler = "scx_bpfland";
 
+  # Accounts daemon is needed to remember passwords and other account information
+  # by display manager and other services
   services.accounts-daemon.enable = true;
   services.dbus = {
     enable = true;
@@ -50,7 +52,7 @@
     enable = true;
     settings = {
       default = [
-        "kitty.desktop"
+        "${pkgs.kitty}/share/applications/kitty.desktop"
       ];
       /*
       GNOME = [
@@ -89,5 +91,5 @@
 
   security.polkit.enable = true; # Enable polkit for elevated prompts
 
-  services.colord.enable = true; # For color management
+  # services.colord.enable = true; # For color management
 }