kernel 6.15

This commit is contained in:
Kopatz
2025-05-26 12:14:10 +02:00
parent bc0481eb74
commit 53ca6c19b3
5 changed files with 43 additions and 11 deletions

21
flake.lock generated
View File

@@ -914,6 +914,26 @@
"type": "github" "type": "github"
} }
}, },
"quickshell": {
"inputs": {
"nixpkgs": [
"nixpkgs-unstable"
]
},
"locked": {
"lastModified": 1748203497,
"narHash": "sha256-p70TDN6Z1XtRM+TpdJyg9X8at85hyJGMVwFBMDcf5LA=",
"ref": "refs/heads/master",
"rev": "f672b897a7f10d47ac833d4a616ecb1cdb1aa11d",
"revCount": 544,
"type": "git",
"url": "https://git.outfoxxed.me/outfoxxed/quickshell"
},
"original": {
"type": "git",
"url": "https://git.outfoxxed.me/outfoxxed/quickshell"
}
},
"root": { "root": {
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
@@ -927,6 +947,7 @@
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"nixvim": "nixvim", "nixvim": "nixvim",
"nur": "nur", "nur": "nur",
"quickshell": "quickshell",
"stylix": "stylix" "stylix": "stylix"
} }
}, },

View File

@@ -51,6 +51,10 @@
url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
inputs.nixpkgs.follows = "nixpkgs-unstable"; inputs.nixpkgs.follows = "nixpkgs-unstable";
}; };
quickshell = {
url = "git+https://git.outfoxxed.me/outfoxxed/quickshell";
inputs.nixpkgs.follows = "nixpkgs-unstable";
};
}; };
outputs = outputs =
{ self { self

View File

@@ -15,6 +15,11 @@
clangd.enable = true; clangd.enable = true;
cssls.enable = true; cssls.enable = true;
gopls.enable = true; gopls.enable = true;
qmlls =
{
enable = true;
cmd = [ "qmlls" "-E" ];
};
nixd = { nixd = {
enable = true; enable = true;
settings = { settings = {

View File

@@ -74,11 +74,11 @@ let
}; };
linux_6_15 = pkgs.buildLinux { linux_6_15 = pkgs.buildLinux {
version = "6.15.0-rc4"; version = "6.15.0";
extraMeta.branch = "6.15"; extraMeta.branch = "6.15";
src = pkgs.fetchzip { src = pkgs.fetchzip {
url = "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/snapshot/linux-6.15-rc4.tar.gz"; url = "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/snapshot/linux-6.15.tar.gz";
hash = "sha256-snhFNqDZzlINbZWA8ywEKHcTd+z19SoZQPSuldYJ6H0="; hash = "sha256-PQjXBWJV+i2O0Xxbg76HqbHyzu7C0RWkvHJ8UywJSCw=";
}; };
}; };
in in
@@ -97,16 +97,16 @@ in
# }; # };
#}); #});
#boot.kernelPackages = pkgs.recurseIntoAttrs (pkgs.linuxPackagesFor (linux_6_15.override { boot.kernelPackages = pkgs.recurseIntoAttrs (pkgs.linuxPackagesFor (linux_6_15.override {
# structuredExtraConfig = with lib.kernel; {
# SCHED_DEBUG = lib.mkForce unset;
# };
#}));
boot.kernelPackages = pkgs.recurseIntoAttrs (pkgs.linuxPackagesFor (linux_amd_drm_next.override {
structuredExtraConfig = with lib.kernel; { structuredExtraConfig = with lib.kernel; {
SCHED_DEBUG = lib.mkForce unset; SCHED_DEBUG = lib.mkForce unset;
}; };
})); }));
#boot.kernelPackages = pkgs.recurseIntoAttrs (pkgs.linuxPackagesFor (linux_amd_drm_next.override {
# structuredExtraConfig = with lib.kernel; {
# SCHED_DEBUG = lib.mkForce unset;
# };
#}));
#boot.kernelPackages = pkgs.recurseIntoAttrs (pkgs.linuxPackagesFor linux_6_14); #boot.kernelPackages = pkgs.recurseIntoAttrs (pkgs.linuxPackagesFor linux_6_14);
} }

View File

@@ -10,7 +10,7 @@
../../modules/gpg.nix ../../modules/gpg.nix
#../../modules/xanmod-kernel.nix #../../modules/xanmod-kernel.nix
#../../modules/kernel-testing.nix #../../modules/kernel-testing.nix
../../modules/misc/kernel.nix ../../modules/misc/kernel-testing.nix
../../modules/services/syncthing.nix ../../modules/services/syncthing.nix
../../modules/support/ntfs.nix ../../modules/support/ntfs.nix
../../modules/fh/writing.nix ../../modules/fh/writing.nix
@@ -118,6 +118,8 @@
# apple shit # apple shit
#services.usbmuxd.enable = true; #services.usbmuxd.enable = true;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
inputs.quickshell.packages.x86_64-linux.default
kdePackages.qtdeclarative
#libimobiledevice #libimobiledevice
#ifuse # optional, to mount using 'ifuse' #ifuse # optional, to mount using 'ifuse'
]; ];