undo accidental closing bracket removal

flake.lock

@@ -43,6 +43,38 @@
         "type": "github"
       }
     },
+    "cachyos-kernel": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1769201405,
+        "narHash": "sha256-k/KQL7J9ZnLlF28E6ywGpfo5dxkuxCcEtJ/XEZDTw3M=",
+        "owner": "CachyOS",
+        "repo": "linux-cachyos",
+        "rev": "ff53672af48a106f52857d62c9275b165cc452ef",
+        "type": "github"
+      },
+      "original": {
+        "owner": "CachyOS",
+        "repo": "linux-cachyos",
+        "type": "github"
+      }
+    },
+    "cachyos-kernel-patches": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1769199354,
+        "narHash": "sha256-y1DKMryOr1w4xcZnDkaZjvENIPmr3j/YB4Srtfd3I2Y=",
+        "owner": "CachyOS",
+        "repo": "kernel-patches",
+        "rev": "c8b990198baf3c34b64e4e5c5ffeb7c068eede1a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "CachyOS",
+        "repo": "kernel-patches",
+        "type": "github"
+      }
+    },
     "crane": {
       "locked": {
         "lastModified": 1754269165,
@@ -93,11 +125,27 @@
     "flake-compat_3": {
       "flake": false,
       "locked": {
-        "lastModified": 1765121682,
+        "lastModified": 1767039857,
-        "narHash": "sha256-4VBOP18BFeiPkyhy9o4ssBNQEvfvv1kXkasAYd0+rrA=",
+        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
+        "owner": "NixOS",
+        "repo": "flake-compat",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_4": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1767039857,
+        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "65f23138d8d09a92e30f1e5c87611b23ef451bf3",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
         "type": "github"
       },
       "original": {
@@ -106,7 +154,7 @@
         "type": "github"
       }
     },
-    "flake-compat_4": {
+    "flake-compat_5": {
       "flake": false,
       "locked": {
         "lastModified": 1650374568,
@@ -143,6 +191,24 @@
         "type": "github"
       }
     },
+    "flake-parts_2": {
+      "inputs": {
+        "nixpkgs-lib": "nixpkgs-lib"
+      },
+      "locked": {
+        "lastModified": 1768135262,
+        "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
     "flake-utils": {
       "inputs": {
         "systems": "systems"
@@ -247,11 +313,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1768434960,
+        "lastModified": 1769450270,
-        "narHash": "sha256-cJbFn17oyg6qAraLr+NVeNJrXsrzJdrudkzI4H2iTcg=",
+        "narHash": "sha256-pdVm/zJazDUAasTyHFX/Pbrlk9Upjxi0yzgn7GjGe4g=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "b4d88c9ac42ae1a745283f6547701da43b6e9f9b",
+        "rev": "a10c1e8f5ad2589414407f4851c221cb66270257",
         "type": "github"
       },
       "original": {
@@ -268,11 +334,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1767104570,
+        "lastModified": 1768434960,
-        "narHash": "sha256-GKgwu5//R+cLdKysZjGqvUEEOGXXLdt93sNXeb2M/Lk=",
+        "narHash": "sha256-cJbFn17oyg6qAraLr+NVeNJrXsrzJdrudkzI4H2iTcg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e4e78a2cbeaddd07ab7238971b16468cc1d14daf",
+        "rev": "b4d88c9ac42ae1a745283f6547701da43b6e9f9b",
         "type": "github"
       },
       "original": {
@@ -328,19 +394,42 @@
         "type": "github"
       }
     },
+    "nix-cachyos-kernel": {
+      "inputs": {
+        "cachyos-kernel": "cachyos-kernel",
+        "cachyos-kernel-patches": "cachyos-kernel-patches",
+        "flake-compat": "flake-compat_3",
+        "flake-parts": "flake-parts_2",
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "lastModified": 1769363279,
+        "narHash": "sha256-XJCuB8GWkFLRFBR6GQoxRB9/lobB45ERp0JN0Lo2nvs=",
+        "owner": "xddxdd",
+        "repo": "nix-cachyos-kernel",
+        "rev": "4aa98db78c1d663c3dad59775e95ad93fe58a844",
+        "type": "github"
+      },
+      "original": {
+        "owner": "xddxdd",
+        "ref": "release",
+        "repo": "nix-cachyos-kernel",
+        "type": "github"
+      }
+    },
     "nixos-wsl": {
       "inputs": {
-        "flake-compat": "flake-compat_3",
+        "flake-compat": "flake-compat_4",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1768404695,
+        "lastModified": 1769217863,
-        "narHash": "sha256-eT3dNE2CQYcPDHaeRZAEFrZ0BmMq2wLxMp7hCmzOZBA=",
+        "narHash": "sha256-RY9kJDXD6+2Td/59LkZ0PFSereCXHdBX9wIkbYjRKCY=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "d0d3636b9d174c4558e3bbb18e194d970505fed8",
+        "rev": "38a5250e57f583662eac3b944830e4b9e169e965",
         "type": "github"
       },
       "original": {
@@ -366,13 +455,44 @@
         "type": "github"
       }
     },
+    "nixpkgs-lib": {
+      "locked": {
+        "lastModified": 1765674936,
+        "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1768305791,
+        "lastModified": 1769300497,
-        "narHash": "sha256-AIdl6WAn9aymeaH/NvBj0H9qM+XuAuYbGMZaP0zcXAQ=",
+        "narHash": "sha256-W7NbQnQGqUPRnpHOlLXk3g52TSQDkFVzhax9YNv9K+U=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1412caf7bf9e660f2f962917c14b1ea1c3bc695e",
+        "rev": "60f9d776547020ff3be5a2cfbd0a457fddd88ecc",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable-small",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1769170682,
+        "narHash": "sha256-oMmN1lVQU0F0W2k6OI3bgdzp2YOHWYUAw79qzDSjenU=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "c5296fdd05cfa2c187990dd909864da9658df755",
         "type": "github"
       },
       "original": {
@@ -416,8 +536,9 @@
         "home-manager": "home-manager",
         "kwin-effects-forceblur": "kwin-effects-forceblur",
         "lanzaboote": "lanzaboote",
+        "nix-cachyos-kernel": "nix-cachyos-kernel",
         "nixos-wsl": "nixos-wsl",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs_3",
         "snowfall-lib": "snowfall-lib",
         "sops-nix": "sops-nix",
         "trilium-next-pr": "trilium-next-pr",
@@ -465,7 +586,7 @@
     },
     "snowfall-lib": {
       "inputs": {
-        "flake-compat": "flake-compat_4",
+        "flake-compat": "flake-compat_5",
         "flake-utils-plus": "flake-utils-plus",
         "nixpkgs": [
           "nixpkgs"
@@ -492,11 +613,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1768481291,
+        "lastModified": 1769469829,
-        "narHash": "sha256-NjKtkJraCZEnLHAJxLTI+BfdU//9coAz9p5TqveZwPU=",
+        "narHash": "sha256-wFcr32ZqspCxk4+FvIxIL0AZktRs6DuF8oOsLt59YBU=",
         "owner": "mic92",
         "repo": "sops-nix",
-        "rev": "e085e303dfcce21adcb5fec535d65aacb066f101",
+        "rev": "c5eebd4eb2e3372fe12a8d70a248a6ee9dd02eff",
         "type": "github"
       },
       "original": {
@@ -592,11 +713,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1768379550,
+        "lastModified": 1769431876,
-        "narHash": "sha256-z94S29l5V86h11LZbPIMbHTJyksDG63aqISsZkTTuJY=",
+        "narHash": "sha256-FnOW+ulwocxfYGVKV2H/7MlSbn52+hfX9oaRR6FClZ4=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "06f61b4e4f4f6ba8027c96a5611c63dc0db12b90",
+        "rev": "d5ef79d18dca7617aefe511db8267d47f7cf953f",
         "type": "github"
       },
       "original": {

flake.nix

@@ -50,6 +50,7 @@
       url = "github:ezKEa/aagl-gtk-on-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel/release";
   };
 
   outputs = inputs:
@@ -89,7 +90,20 @@
       inherit inputs;
       src = ./.;
       
+      overlays = with inputs; [
+        # Use the exact kernel versions as defined in this repo.
+        # Guarantees you have binary cache.
+        nix-cachyos-kernel.overlays.pinned
+
+        # Alternatively, build the kernels on top of nixpkgs version in your flake.
+        # This might cause version mismatch/build failures!
+        # nix-cachyos-kernel.overlays.default
+
+        # Only use one of the two overlays!
+      ];
+      
       nixos = with inputs; [
+        
         # disko.nixosModules.disko
         # impermanence.nixosModules.impermanence
         home-manager.nixosModules.home-manager

homes/x86_64-linux/andreas@drivebystation-nix/default.nix

@@ -40,7 +40,7 @@ in
     [Desktop Entry]
     Type=Application
     Name=Wallpaper Engine
-    Exec=${pkgs.my-namespace.linux-wallpaperengine}/bin/linux-wallpaperengine --screen-root DP-1 --bg 2935872330 --screen-root DP-2 --bg 2935872330
+    Exec=${pkgs.my-namespace.linux-wallpaperengine}/bin/linux-wallpaperengine --screen-root DP-1 --bg 2935872330 -f 12 --screen-root DP-2 --bg 2935872330 -f 12
     X-KDE-autostart-after=panel
     X-KDE-StartupNotify=false
   '';

modules/home/vesktop-appimage/default.nix

@@ -2,12 +2,12 @@
 let
   inherit (lib) mkEnableOption mkIf;
   cfg = config.my-namespace.home.vesktop-appimage;
-  vesktopVersion = "1.6.1";
+  vesktopVersion = "1.6.4";
 
   vesktopAppImage = pkgs.runCommand "vesktop-appimage" { } ''
     cp ${pkgs.fetchurl {
       url = "https://github.com/Vencord/Vesktop/releases/download/v${vesktopVersion}/Vesktop-${vesktopVersion}.AppImage";
-      sha256 = "sha256-zK098H7iiOEe5y5YhgsUCPYVQQPcsnZw6/6q6Nx7h+w=";      
+      sha256 = "sha256-o7A8DBQyutONeLp5rstq9hQko2xxbvYZvGGM8/YOQ8s=";      
     }} $out
     chmod +x $out
   '';

modules/nixos/desktop-environment/default.nix

@@ -31,10 +31,10 @@ in {
         };
       };
       environment.systemPackages = with pkgs; [
-        xfce.xfce4-pulseaudio-plugin
+        xfce4-pulseaudio-plugin
-        xfce.xfce4-clipman-plugin
+        xfce4-clipman-plugin
-        xfce.xfce4-screenshooter
+        xfce4-screenshooter
-        xfce.xfce4-whiskermenu-plugin
+        xfce4-whiskermenu-plugin
         thunar-archive-plugin
         thunar-volman
         gvfs
@@ -46,8 +46,8 @@ in {
     (lib.mkIf cfg.gnome.enable {
       services.xserver = {
         enable = true;
-        desktopManager.gnome.enable = true;
       };
+      services.desktopManager.gnome.enable = true;
       environment.systemPackages = with pkgs; [
         gnome-tweaks
         gnome-software

modules/nixos/performance-tuning/default.nix

@@ -0,0 +1,23 @@
+{ config, lib, pkgs, namespace, ... }:
+
+let
+  cfg = config.${namespace}.performance-tuning;
+in {
+  options.${namespace}.performance-tuning.enable = lib.mkEnableOption "XFCE desktop environment";
+  config = lib.mkIf cfg.enable {
+    boot.kernelParams = [
+      "nvme_core.default_ps_max_latency_us=0"
+    ];
+
+    boot.kernel.sysctl = {
+      "vm.swappiness" = 10;
+      "vm.dirty_ratio" = 10;
+      "vm.dirty_background_ratio" = 5;
+    };
+
+    services.pipewire.extraConfig.pipewire."context.properties" = {
+      "default.clock.quantum" = 256;
+      "default.clock.min-quantum" = 128;
+    };
+  };
+}

modules/nixos/steam/default.nix

@@ -45,6 +45,9 @@
         extraPkgs = pkgs: with pkgs; [
           gamemode
         ];
+        extraEnv = {
+          SDL_VIDEODRIVER = "wayland";
+        };
       };
       remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
       dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server

systems/x86_64-linux/drivebystation-nix/default.nix

@@ -46,6 +46,7 @@ in
       my-namespace.desktop-environment.gnome.enable = true;
       my-namespace.desktop-environment.kde.enable = true;
       my-namespace.desktop-environment.cosmic.enable = true;
+      my-namespace.performance-tuning.enable = true;
       # GNOME-keyring
       my-namespace.gnome-keyring.enable = true;
 

systems/x86_64-linux/drivebystation-nix/hardware/hardware-configuration.nix

@@ -12,11 +12,11 @@
       ./acer-monitor-edid.nix
     ];
   # boot.kernelPackages = pkgs.linuxPackages_latest;
-  boot.kernelPackages = pkgs.linuxPackages_zen;
+  boot.kernelPackages = pkgs.cachyosKernels.linuxPackages-cachyos-latest;
   hardware.enableRedistributableFirmware = true;
   # boot.kernelPackages = pkgs.linuxKernel.packages.linux_xanmod_latest;
   # boot.kernelPackages = pkgs.linuxPackages;
-  
+  boot.loader.efi.canTouchEfiVariables = true;  
   boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
   boot.kernelModules = [ "kvm-amd" "r8125" "4vl2loopback" ];
   boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback r8125 ];
@@ -28,11 +28,33 @@
   };
 
   fileSystems."/boot" = { 
-    device = "/dev/disk/by-uuid/E846-D998";
+    #device = "/dev/disk/by-uuid/E846-D998";
+    device = "/dev/disk/by-uuid/19BE-8BAA";
     fsType = "vfat";
     options = [ "fmask=0077" "dmask=0077" ];
   };
 
+  # Mount ntfs partition
+  # fileSystems."/run/media/627C3BDF7C3BAD23" = {
+  #   device = "/dev/disk/by-uuid/627C3BDF7C3BAD23";
+  #   fsType = "ntfs-3g";
+  #   options = [ "rw" "uid=1000"];
+  # };
+
+  # # Mount ntfs oldfiles drive partition
+  # fileSystems."/run/media/oldfiles" = {
+  #   device = "/dev/disk/by-uuid/E2E26FFFE26FD677";
+  #   fsType = "ntfs-3g";
+  #   options = [ "rw" "uid=1000"];
+  # };
+
+  # # Mount The Vault
+  # fileSystems."/run/media/vault" = {
+  #   device = "/dev/disk/by-uuid/3470646370642DB4";
+  #   fsType = "ntfs-3g";
+  #   options = [ "rw" "uid=1000"];
+  # };
+
 
 
   # Try to fix hibernation