diff --git a/flake.lock b/flake.lock index 18f3d3e..ebd427e 100644 --- a/flake.lock +++ b/flake.lock @@ -914,6 +914,26 @@ "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": { "inputs": { "agenix": "agenix", @@ -927,6 +947,7 @@ "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", "nur": "nur", + "quickshell": "quickshell", "stylix": "stylix" } }, diff --git a/flake.nix b/flake.nix index bf842ec..924d201 100644 --- a/flake.nix +++ b/flake.nix @@ -51,6 +51,10 @@ url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; inputs.nixpkgs.follows = "nixpkgs-unstable"; }; + quickshell = { + url = "git+https://git.outfoxxed.me/outfoxxed/quickshell"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; + }; }; outputs = { self diff --git a/home-manager/nixvim/lsp.nix b/home-manager/nixvim/lsp.nix index 4f39369..7164466 100644 --- a/home-manager/nixvim/lsp.nix +++ b/home-manager/nixvim/lsp.nix @@ -15,6 +15,11 @@ clangd.enable = true; cssls.enable = true; gopls.enable = true; + qmlls = + { + enable = true; + cmd = [ "qmlls" "-E" ]; + }; nixd = { enable = true; settings = { diff --git a/modules/kernel-testing.nix b/modules/misc/kernel-testing.nix similarity index 94% rename from modules/kernel-testing.nix rename to modules/misc/kernel-testing.nix index 187d59f..d08e215 100644 --- a/modules/kernel-testing.nix +++ b/modules/misc/kernel-testing.nix @@ -74,11 +74,11 @@ let }; linux_6_15 = pkgs.buildLinux { - version = "6.15.0-rc4"; + version = "6.15.0"; extraMeta.branch = "6.15"; src = pkgs.fetchzip { - url = "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/snapshot/linux-6.15-rc4.tar.gz"; - hash = "sha256-snhFNqDZzlINbZWA8ywEKHcTd+z19SoZQPSuldYJ6H0="; + url = "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/snapshot/linux-6.15.tar.gz"; + hash = "sha256-PQjXBWJV+i2O0Xxbg76HqbHyzu7C0RWkvHJ8UywJSCw="; }; }; in @@ -97,16 +97,16 @@ in # }; #}); - #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 { + 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; { + # SCHED_DEBUG = lib.mkForce unset; + # }; + #})); #boot.kernelPackages = pkgs.recurseIntoAttrs (pkgs.linuxPackagesFor linux_6_14); } diff --git a/systems/pc/configuration.nix b/systems/pc/configuration.nix index c9975d3..82cde2f 100644 --- a/systems/pc/configuration.nix +++ b/systems/pc/configuration.nix @@ -10,7 +10,7 @@ ../../modules/gpg.nix #../../modules/xanmod-kernel.nix #../../modules/kernel-testing.nix - ../../modules/misc/kernel.nix + ../../modules/misc/kernel-testing.nix ../../modules/services/syncthing.nix ../../modules/support/ntfs.nix ../../modules/fh/writing.nix @@ -118,6 +118,8 @@ # apple shit #services.usbmuxd.enable = true; environment.systemPackages = with pkgs; [ + inputs.quickshell.packages.x86_64-linux.default + kdePackages.qtdeclarative #libimobiledevice #ifuse # optional, to mount using 'ifuse' ];