From 8c65fb700de6fb862077bf7e10e86a19cbb64aab Mon Sep 17 00:00:00 2001 From: Kopatz <7265381+Kropatz@users.noreply.github.com> Date: Mon, 14 Apr 2025 17:42:21 +0200 Subject: [PATCH] cleanup and update mesa --- flake.lock | 57 +--------------------------- flake.nix | 30 ++------------- home-manager/nixvim/lsp.nix | 2 +- modules/hardware/amd-gpu.nix | 24 ++++++++++-- modules/kernel-testing.nix | 44 ++++++++++++++-------- overlays.nix | 70 +++++++---------------------------- pkgs/lact/default.nix | 12 +++--- systems/pc/configuration.nix | 8 ++-- systems/wsl/configuration.nix | 50 ------------------------- 9 files changed, 78 insertions(+), 219 deletions(-) delete mode 100644 systems/wsl/configuration.nix diff --git a/flake.lock b/flake.lock index 86e077c..4df4551 100644 --- a/flake.lock +++ b/flake.lock @@ -216,22 +216,6 @@ } }, "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { "locked": { "lastModified": 1733328505, "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", @@ -874,27 +858,6 @@ "type": "github" } }, - "nixos-wsl": { - "inputs": { - "flake-compat": "flake-compat_2", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1743125458, - "narHash": "sha256-0z+5AMacL2Eqo92fAd0eCWeKVecWrxPJwd5/BIfcdJ8=", - "owner": "nix-community", - "repo": "NixOS-WSL", - "rev": "394c77f61ac76399290bfc2ef9d47b1fba31b215", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "NixOS-WSL", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1743367904, @@ -942,22 +905,6 @@ "type": "github" } }, - "nixpkgs-mesa-git": { - "locked": { - "lastModified": 1742289590, - "narHash": "sha256-q8/3YGv7LLReXOiiAH2S39YWeiM2fi0jlLA0hqdlacY=", - "owner": "kropatz", - "repo": "nixpkgs", - "rev": "ea362816984b10d5e3714cce63525888db07dda8", - "type": "github" - }, - "original": { - "owner": "kropatz", - "ref": "mesa-git", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-unstable": { "locked": { "lastModified": 1743315132, @@ -1126,10 +1073,8 @@ "nix-colors": "nix-colors", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", - "nixos-wsl": "nixos-wsl", "nixpkgs": "nixpkgs", "nixpkgs-gimp3": "nixpkgs-gimp3", - "nixpkgs-mesa-git": "nixpkgs-mesa-git", "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", "nur": "nur", @@ -1143,7 +1088,7 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "flake-utils": "flake-utils_3", "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", diff --git a/flake.nix b/flake.nix index 4f1378b..5efbbe2 100644 --- a/flake.nix +++ b/flake.nix @@ -21,15 +21,10 @@ inputs.nixpkgs.follows = "nixpkgs"; inputs.home-manager.follows = "home-manager"; }; - nixos-wsl = { - url = "github:nix-community/NixOS-WSL"; - inputs.nixpkgs.follows = "nixpkgs"; - }; nix-colors.url = "github:misterio77/nix-colors"; ## unstable nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-gimp3.url = "github:jtojnar/nixpkgs/gimp-meson"; - nixpkgs-mesa-git.url = "github:kropatz/nixpkgs/mesa-git"; home-manager-unstable = { url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "nixpkgs-unstable"; @@ -66,13 +61,12 @@ , nur , nixpkgs , nixos-hardware - , nixos-wsl , nixpkgs-unstable , agenix , home-manager , home-manager-unstable , nix-colors - #, nixos-cosmic + #, nixos-cosmic , nixvim , nixos-generators , stylix @@ -82,21 +76,15 @@ }@inputs: let inherit (self) outputs; - system = "x86_64-linux"; overlays = { outputs, ... }: { nixpkgs.overlays = with outputs.overlays; [ + #unstable-packages additions modifications - unstable-packages - stable-packages - mesa-git nur.overlays.default ]; }; defaultModules = [ ./modules agenix.nixosModules.default overlays ]; - merge = list: - builtins.foldl' (acc: elem: nixpkgs.lib.recursiveUpdate acc elem) { } - list; # helper function to create a machine mkHost = { modules @@ -117,8 +105,8 @@ ./modules/graphical stylix.nixosModules.stylix ./modules/graphical/stylix.nix - #nixos-cosmic.nixosModules.default - #./modules/graphical/cosmic.nix + #nixos-cosmic.nixosModules.default + #./modules/graphical/cosmic.nix ({ outputs, ... }: { stylix.image = ./tsukasa.jpg; }) ]; specialArgs = specialArgs // { inherit inputs outputs; }; @@ -148,7 +136,6 @@ "server-vm" = nixos-generators.nixosGenerate { format = "vmware"; inherit system; - #pkgs = nixpkgs-unstable.legacyPackages.x86_64-linux; specialArgs = { pkgsVersion = nixpkgs-unstable; } // { @@ -198,15 +185,6 @@ modules = [ ./users/anon ./systems/mini-pc-proxmox/configuration.nix ]; }; - "wsl" = mkHost { - modules = [ - #"${nixpkgs}/nixos/modules/profiles/minimal.nix" - ./users/anon - ./modules/nix/settings.nix - ./systems/wsl/configuration.nix - nixos-wsl.nixosModules.wsl - ]; - }; #initial install done with nix run github:nix-community/nixos-anywhere/73a6d3fef4c5b4ab9e4ac868f468ec8f9436afa7 -- --flake .#adam-site root@ #update with nixos-rebuild switch --flake .#adam-site --target-host "root@" "adam-site" = mkStableServer { diff --git a/home-manager/nixvim/lsp.nix b/home-manager/nixvim/lsp.nix index 37b8e1c..4f39369 100644 --- a/home-manager/nixvim/lsp.nix +++ b/home-manager/nixvim/lsp.nix @@ -30,7 +30,7 @@ lua_ls.enable = true; csharp_ls = { enable = true; - package = pkgs.stable.csharp-ls; + package = pkgs.csharp-ls; }; #typst-lsp.enable = true; }; diff --git a/modules/hardware/amd-gpu.nix b/modules/hardware/amd-gpu.nix index 0e2f2df..2ac950b 100644 --- a/modules/hardware/amd-gpu.nix +++ b/modules/hardware/amd-gpu.nix @@ -7,13 +7,13 @@ in { config = let - mesa-new = pkgs.mesa-git.mesa.overrideAttrs (oldAttrs: { + mesa-new = pkgs.mesa.overrideAttrs (oldAttrs: { src = pkgs.fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mesa"; repo = "mesa"; - rev = "0f8753ffb83a635f47cb0c79e8a8f86c5343d1cf"; - hash = "sha256-3Si9bTGO1nUmiJN1X/tIR4vo0EH8Zi2JNUBs2oyuVYM="; + rev = "f23b376e847602d4fe7976f3bbb877dfd9d8b417"; + hash = "sha256-prPhezquh63OFkFdYNCRN1OkdwA+CTu88hUoHQD5kCw="; }; }); @@ -35,7 +35,8 @@ in { enable = true; enable32Bit = true; package = lib.mkForce mesa-new.drivers; - #extraPackages = with pkgs; [ mesa-git.amdvlk ]; + #extraPackages = with pkgs; [ mesa-git.amdvlk ]; + #extraPackages = with pkgs; [ rocmPackages.clr.icd ]; }; hardware.amdgpu.initrd.enable = lib.mkDefault true; @@ -48,5 +49,20 @@ in { ]; systemd.packages = with pkgs; [ lact ]; systemd.services.lactd.wantedBy = [ "multi-user.target" ]; + #rocm + #systemd.tmpfiles.rules = + # let + # rocmEnv = pkgs.symlinkJoin { + # name = "rocm-combined"; + # paths = with pkgs.rocmPackages; [ + # rocblas + # hipblas + # clr + # ]; + # }; + # in + # [ + # "L+ /opt/rocm - - - - ${rocmEnv}" + # ]; }; } diff --git a/modules/kernel-testing.nix b/modules/kernel-testing.nix index e2ebdf1..e5d7f8c 100644 --- a/modules/kernel-testing.nix +++ b/modules/kernel-testing.nix @@ -49,26 +49,36 @@ let amd_drm_next_pkg = { fetchurl, buildLinux, ... }@args: buildLinux (args // rec { - version = "6.14.0-rc4"; + version = "6.14.0-rc6"; modDirVersion = version; src = fetchurl { url = - "https://gitlab.freedesktop.org/agd5f/linux/-/archive/amd-drm-next-6.15-2025-03-21/linux-amd-drm-next-6.15-2025-03-21.tar.gz"; - hash = "sha256-sLS6uFo2KPbDdz8BhB1X10wQiiYdtT/Ny0Ii19F6feY="; + "https://gitlab.freedesktop.org/agd5f/linux/-/archive/amd-drm-fixes-6.15-2025-04-09/linux-amd-drm-fixes-6.15-2025-04-09.tar.gz"; + #"https://gitlab.freedesktop.org/agd5f/linux/-/archive/amd-drm-next-6.15-2025-03-21/linux-amd-drm-next-6.15-2025-03-21.tar.gz"; + hash = "sha256-AhyDuV9KufqDJEJ+Fp+jnAta3OM/a9OcMNG9UV+OgR0="; }; kernelPatches = [ ]; - extraMeta.branch = "6.14.0-rc4"; + extraMeta.branch = "6.14.0-rc6"; } // (args.argsOverride or { })); linux_amd_drm_next = pkgs.callPackage amd_drm_next_pkg { }; + linux_6_14 = pkgs.buildLinux { + version = "6.14.2"; + extraMeta.branch = "6.14"; + src = pkgs.fetchzip { + url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.14.2.tar.xz"; + hash = "sha256-RytIKSDT9BMRBZvJER19QAShIqfnpwk59CMFKKgipAU="; + }; + }; + linux_6_15 = pkgs.buildLinux { - version = "6.15.0-rc1"; + version = "6.15.0-rc2"; extraMeta.branch = "6.15"; src = pkgs.fetchzip { - url = "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/snapshot/linux-6.15-rc1.tar.gz"; - hash = "sha256-6TIBhh9ZuAcu0nHMeS1goGM43dU/OOOLtBNGaRAu404="; + url = "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/snapshot/linux-6.15-rc2.tar.gz"; + hash = "sha256-3/GGVyGoLCv4EfG6e+EBM1NO3/FpKthLb8jp6FSVuFE="; }; }; in @@ -87,14 +97,16 @@ in # }; #}); - nixpkgs.overlays = [ - (final: prev: { - linuxPackages_latest = pkgs.linuxPackagesFor linux_6_15; - }) - ]; - 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_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/overlays.nix b/overlays.nix index f46c5c7..d981803 100644 --- a/overlays.nix +++ b/overlays.nix @@ -21,68 +21,26 @@ in discord = prev.discord.override { withVencord = true; }; tetrio-desktop = prev.tetrio-desktop.override { withTetrioPlus = true; }; lact = prev.rdna4-lact; - #mesa = mesa-git.pkgs.mesa; - #wayland-protocols = mesa-git.pkgs.wayland-protocols; - #hyprland = prev.hyprland.overrideAttrs (oldAttrs: { - # version = "0.45.0"; - # src = prev.fetchFromGitHub { - # owner = "hyprwm"; - # repo = "hyprland"; - # fetchSubmodules = true; - # rev = "refs/tags/v0.45.0"; - # hash = "sha256-//Ib7gXCA8jq8c+QGTTIO0oH0rUYYBXGp8sqpI1jlhA="; - # }; - #}); - - # mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ]; - #}); hyprland = inputs.hyprland.packages.${prev.stdenv.hostPlatform.system}.hyprland; xdg-desktop-portal-hyprland = inputs.hyprland.packages.${prev.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland; - #delta = prev.delta.overrideAttrs (oldAttrs: rec { - # version = "0.17.0-unstable-2024-08-12"; - # src = prev.fetchFromGitHub { - # owner = "dandavison"; - # repo = "delta"; - # rev = "a01141b72001f4c630d77cf5274267d7638851e4"; - # hash = "sha256-My51pQw5a2Y2VTu39MmnjGfmCavg8pFqOmOntUildS0="; - # }; - # cargoDeps = oldAttrs.cargoDeps.overrideAttrs { - # inherit src; - # outputHash = "sha256-TJ/yLt53hKElylycUfGV8JGt7GzqSnIO3ImhZvhVQu0="; - # }; - #}); - - # .png doesnt work :( - #fastfetch = prev.fastfetch.overrideAttrs (oldAttrs: { - # cmakeFlags = [ (prev.lib.cmakeBool "ENABLE_IMAGEMAGICK6" true) (prev.lib.cmakeBool "ENABLE_IMAGEMAGICK7" true) (prev.lib.cmakeBool "ENABLE_CHAFA" true) ]; - #}); - # example = prev.example.overrideAttrs (oldAttrs: rec { - # ... - # }); + #rocmPackages = prev.rocm-update.rocmPackages; }; # When applied, the unstable nixpkgs set (declared in the flake inputs) will # be accessible through 'pkgs.unstable' - unstable-packages = final: _prev: { - unstable = import inputs.nixpkgs-unstable { - system = final.system; - config.allowUnfree = true; - config.permittedInsecurePackages = [ "electron-27.3.11" ]; - }; - }; - stable-packages = final: _prev: { - stable = import inputs.nixpkgs { - system = final.system; - config.allowUnfree = true; - }; - }; - - mesa-git = final: _prev: { - mesa-git = import inputs.nixpkgs-mesa-git { - system = final.system; - config.allowUnfree = true; - }; - }; + #unstable-packages = final: _prev: { + # unstable = import inputs.nixpkgs-unstable { + # system = final.system; + # config.allowUnfree = true; + # config.permittedInsecurePackages = [ "electron-27.3.11" ]; + # }; + #}; + #stable-packages = final: _prev: { + # stable = import inputs.nixpkgs { + # system = final.system; + # config.allowUnfree = true; + # }; + #}; } diff --git a/pkgs/lact/default.nix b/pkgs/lact/default.nix index 1b10170..b2e1f30 100644 --- a/pkgs/lact/default.nix +++ b/pkgs/lact/default.nix @@ -17,19 +17,19 @@ rustPlatform.buildRustPackage rec { pname = "lact"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "ilya-zlobintsev"; repo = "LACT"; rev = "v${version}"; - hash = "sha256-6nNt/EnJKHdldjpCW2pLPBkU5TLGEaqtnUUBraeRa3I="; + hash = "sha256-R8VEAk+CzJCxPzJohsbL/XXH1GMzGI2W92sVJ2evqXs="; #rev = "e472dec45682f96a272b77d368791121e10ba7da"; #hash = "sha256-d081f49ojJzz0N28lIu3NZ8SSvSuoz2HfjQl5Zu8PpU="; }; useFetchCargoVendor = true; - cargoHash = "sha256-NoWngD0LJ+cteoQIJ0iye0MZgmLuuxN2YHHyMqeEABc="; + cargoHash = "sha256-SH7jmXDvGYO9S5ogYEYB8dYCF3iz9GWDYGcZUaKpWDQ="; nativeBuildInputs = [ blueprint-compiler pkg-config wrapGAppsHook4 rustPlatform.bindgenHook ]; @@ -57,7 +57,7 @@ rustPlatform.buildRustPackage rec { substituteInPlace res/lactd.service \ --replace-fail ExecStart={lact,$out/bin/lact} - substituteInPlace res/io.github.lact-linux.desktop \ + substituteInPlace res/io.github.ilya_zlobintsev.LACT.desktop \ --replace-fail Exec={lact,$out/bin/lact} # read() looks for the database in /usr/share so we use read_from_file() instead @@ -67,8 +67,8 @@ rustPlatform.buildRustPackage rec { postInstall = '' install -Dm444 res/lactd.service -t $out/lib/systemd/system - install -Dm444 res/io.github.lact-linux.desktop -t $out/share/applications - install -Dm444 res/io.github.lact-linux.png -t $out/share/pixmaps + install -Dm444 res/io.github.ilya_zlobintsev.LACT.desktop -t $out/share/applications + install -Dm444 res/io.github.ilya_zlobintsev.LACT.png -t $out/share/pixmaps ''; postFixup = lib.optionalString stdenv.targetPlatform.isElf '' diff --git a/systems/pc/configuration.nix b/systems/pc/configuration.nix index af12f49..9f5bec8 100644 --- a/systems/pc/configuration.nix +++ b/systems/pc/configuration.nix @@ -105,11 +105,11 @@ ]; # apple shit - services.usbmuxd.enable = true; + #services.usbmuxd.enable = true; environment.systemPackages = with pkgs; [ - libimobiledevice - ifuse # optional, to mount using 'ifuse' - mesa-git.gimp + #libimobiledevice + #ifuse # optional, to mount using 'ifuse' + openai-whisper ]; nixpkgs.config.permittedInsecurePackages = [ diff --git a/systems/wsl/configuration.nix b/systems/wsl/configuration.nix deleted file mode 100644 index c0feeb3..0000000 --- a/systems/wsl/configuration.nix +++ /dev/null @@ -1,50 +0,0 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page, on -# https://search.nixos.org/options and in the NixOS manual (`nixos-help`). - -# NixOS-WSL specific options are documented on the NixOS-WSL repository: -# https://github.com/nix-community/NixOS-WSL - -{ config, lib, pkgs, inputs, ... }: #nixos-wsl, ... }: - -{ - imports = [ - # include NixOS-WSL modules - # - ]; - - wsl = { - enable = true; - nativeSystemd = true; - startMenuLaunchers = true; - wslConf = { - automount.root = "/mnt"; - user.default = lib.mkForce "anon"; - interop = { enabled = false; appendWindowsPath = false; }; - }; - }; - - nix.optimise.automatic = true; - nix.gc = { - automatic = true; - dates = "weekly"; - options = "--delete-older-than 30d"; - }; - nix.settings.trusted-substituters = [ "https://ai.cachix.org" ]; - nix.settings.trusted-public-keys = [ "ai.cachix.org-1:N9dzRK+alWwoKXQlnn0H6aUx0lU/mspIoz8hMvGvbbc=" ]; - nix.settings.experimental-features = [ "nix-command" "flakes" ]; - - environment.systemPackages = with pkgs; [ - openssh - ]; - - networking.hostName = "wsl"; - - # This value determines the NixOS release from which the default - # settings for stateful data, like file locations and database versions - # on your system were taken. It's perfectly fine and recommended to leave - # this value at the release version of the first install of this system. - # Before changing this value read the documentation for this option - # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "23.05"; # Did you read the comment? -}