diff --git a/flake.lock b/flake.lock index 344f50e..9b3b191 100644 --- a/flake.lock +++ b/flake.lock @@ -102,11 +102,11 @@ "blocklist-hosts": { "flake": false, "locked": { - "lastModified": 1728682327, - "narHash": "sha256-lTYUdo00JzPLJgtvv2dETHKyZ67vSY6Vd+fOin4L2z4=", + "lastModified": 1729258669, + "narHash": "sha256-e1t7Uqegsa14IIa880xx174Zsx1cSmg+nGx3xdfe8GY=", "owner": "StevenBlack", "repo": "hosts", - "rev": "ebcd90663f670627612d86de564eb504e7e63b35", + "rev": "3eb62cf79953401fab84826491d2468bd8519487", "type": "github" }, "original": { @@ -511,11 +511,11 @@ ] }, "locked": { - "lastModified": 1728685293, - "narHash": "sha256-1WowL96pksT/XCi+ZXHgqiQ9NiU5oxWuNIQYWqOoEYc=", + "lastModified": 1729260213, + "narHash": "sha256-jAvHoU/1y/yCuXzr2fNF+q6uKmr8Jj2xgAisK4QB9to=", "owner": "nix-community", "repo": "home-manager", - "rev": "2b13611eaed8326789f76f70d21d06fbb14e3e47", + "rev": "09a0c0c02953318bf94425738c7061ffdc4cba75", "type": "github" }, "original": { @@ -1019,11 +1019,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728492678, - "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", + "lastModified": 1729070438, + "narHash": "sha256-KOTTUfPkugH52avUvXGxvWy8ibKKj4genodIYUED+Kc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", + "rev": "5785b6bb5eaae44e627d541023034e1601455827", "type": "github" }, "original": { @@ -1066,11 +1066,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1728500571, - "narHash": "sha256-dOymOQ3AfNI4Z337yEwHGohrVQb4yPODCW9MDUyAc4w=", + "lastModified": 1729044727, + "narHash": "sha256-GKJjtPY+SXfLF/yTN7M2cAnQB6RERFKnQhD8UvPSf3M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d51c28603def282a24fa034bcb007e2bcb5b5dd0", + "rev": "dc2e0028d274394f73653c7c90cc63edbb696be1", "type": "github" }, "original": { @@ -1081,11 +1081,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1718428119, - "narHash": "sha256-WdWDpNaq6u1IPtxtYHHWpl5BmabtpmLnMAx0RdJ/vo8=", + "lastModified": 1728538411, + "narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e6cea36f83499eb4e9cd184c8a8e823296b50ad5", + "rev": "b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221", "type": "github" }, "original": { @@ -1476,11 +1476,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1728613723, - "narHash": "sha256-zVVj0PKguM8ZMdLE43YW7dzer3tl9e6i5Qs1fr878+c=", + "lastModified": 1729218602, + "narHash": "sha256-KDmYxpkFWa0Go0WnOpkgQOypVaQxbwgpEutET5ey1VQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ca93f28abd2147dd9997261dcaeacc5a30dba463", + "rev": "9051466c82b9b3a6ba9e06be99621ad25423ec94", "type": "github" }, "original": { @@ -1538,11 +1538,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1728640680, - "narHash": "sha256-JH2+RXJNooFtZIN6ZhaGZWn2KChMrso4H7Fkp1Ujrdo=", + "lastModified": 1728900372, + "narHash": "sha256-hmG/u7qZEm7CTh1XPDi+pg4Oi0nNrv7sL8PgZDRe6wg=", "owner": "danth", "repo": "stylix", - "rev": "f95022bb6e74f726a87975aec982a5aa9fad8691", + "rev": "33a2eff15181e557bb6dd9d2073b90f7d218975d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index a788c9a..6fbf7c2 100644 --- a/flake.nix +++ b/flake.nix @@ -56,7 +56,9 @@ (import inputs.nixpkgs { system = systemSettings.system; rocmSupport = (if systemSettings.gpu == "amd" then true else false); }).applyPatches { name = "nixpkgs-patched"; src = inputs.nixpkgs; - patches = [ ./patches/emacs-no-version-check.patch ]; + patches = [ ./patches/emacs-no-version-check.patch + ./patches/nixpkgs-348697.patch + ]; }; # configure pkgs diff --git a/patches/nixpkgs-348697.patch b/patches/nixpkgs-348697.patch new file mode 100644 index 0000000..b0494ac --- /dev/null +++ b/patches/nixpkgs-348697.patch @@ -0,0 +1,76 @@ +diff --git a/pkgs/development/python-modules/pyqt/6.x.nix b/pkgs/development/python-modules/pyqt/6.x.nix +index 9f031347d354e..6356eeb9637f0 100644 +--- a/pkgs/development/python-modules/pyqt/6.x.nix ++++ b/pkgs/development/python-modules/pyqt/6.x.nix +@@ -25,17 +25,15 @@ + + buildPythonPackage rec { + pname = "pyqt6"; +- version = "6.7.0.dev2404081550"; ++ version = "6.8.0.dev2410141303"; + format = "pyproject"; + + disabled = pythonOlder "3.6"; + ++ # This is dangerous, how can we get web archive to archive the URL? + src = fetchurl { +- urls = [ +- "https://riverbankcomputing.com/pypi/packages/PyQt6/PyQt6-${version}.tar.gz" +- "http://web.archive.org/web/20240411124842if_/https://riverbankcomputing.com/pypi/packages/PyQt6/PyQt6-${version}.tar.gz" +- ]; +- hash = "sha256-H5qZ/rnruGh+UVSXLZyTSvjagmmli/iYq+7BaIzl1YQ="; ++ url = "https://riverbankcomputing.com/pypi/packages/PyQt6/PyQt6-${version}.tar.gz"; ++ hash = "sha256-eHYqj22us07uFkErJD2d0y0wueZxtQTwTFW9cI7yoK4="; + }; + + patches = [ +@@ -55,8 +53,11 @@ buildPythonPackage rec { + verbose = true + EOF + ++ # pythonRelaxDeps doesn't work and the wanted versions are not released AFAIK + substituteInPlace pyproject.toml \ +- --replace-fail 'version = "${version}"' 'version = "${lib.versions.pad 3 version}"' ++ --replace-fail 'version = "${version}"' 'version = "${lib.versions.pad 3 version}"' \ ++ --replace-fail "sip >=6.9, <7" "sip >=6.8.6, <7" \ ++ --replace-fail 'PyQt-builder >=1.17, <2' "PyQt-builder >=1.16, <2" + ''; + + enableParallelBuilding = true; +diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix +index 8a398654b08ce..8fd6240e4a512 100644 +--- a/pkgs/development/python-modules/sip/default.nix ++++ b/pkgs/development/python-modules/sip/default.nix +@@ -4,6 +4,7 @@ + fetchPypi, + pythonOlder, + setuptools, ++ setuptools-scm, + packaging, + tomli, + +@@ -15,17 +16,20 @@ + + buildPythonPackage rec { + pname = "sip"; +- version = "6.8.3"; ++ version = "6.8.6"; + pyproject = true; + + src = fetchPypi { + inherit pname version; +- hash = "sha256-iIVHsBi7JMNq3tUZ6T0+UT1MaqC6VbfMGv+9Rc8Qdiw="; ++ hash = "sha256-f8lZ5I5uxdWvi9Am9p9eJNCLPLirs0IXb1q4AwzAfXo="; + }; + +- nativeBuildInputs = [ setuptools ]; ++ build-system = [ ++ setuptools ++ setuptools-scm ++ ]; + +- propagatedBuildInputs = [ ++ dependencies = [ + packaging + setuptools + ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; diff --git a/profiles/work/home.nix b/profiles/work/home.nix index 5c066fe..1ecd8d9 100644 --- a/profiles/work/home.nix +++ b/profiles/work/home.nix @@ -12,7 +12,7 @@ (./. + "../../../user/wm"+("/"+userSettings.wm+"/"+userSettings.wm)+".nix") # My window manager selected from flake ../../user/shell/sh.nix # My zsh and bash config ../../user/shell/cli-collection.nix # Useful CLI apps - ../../user/app/doom-emacs/doom.nix # My doom emacs config + #../../user/app/doom-emacs/doom.nix # My doom emacs config ../../user/app/nvim/nvim.nix # My doom emacs config #../../user/app/emacsng # Me experimenting with emacsng and a vanilla config ../../user/app/ranger/ranger.nix # My ranger file manager config diff --git a/system/hardware-configuration.nix b/system/hardware-configuration.nix index 34005b9..268b152 100644 --- a/system/hardware-configuration.nix +++ b/system/hardware-configuration.nix @@ -1,7 +1,7 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: +{ config, lib, pkgs, modulesPath, inputs, ... }: { imports = @@ -10,10 +10,21 @@ boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usbhid" "usb_storage" "sd_mod" "radeon" ]; boot.initrd.kernelModules = [ "radeon" ]; - boot.kernelModules = [ "kvm-amd" "radeon" ]; - boot.extraModulePackages = with config.boot.kernelPackages; [ zenpower ]; - hardware.opengl.extraPackages = [ pkgs.amdvlk pkgs.rocmPackages.clr.icd ]; - hardware.opengl.extraPackages32 = [ pkgs.driversi686Linux.amdvlk ]; + boot.kernelModules = [ "kvm-amd" "radeon" "zenpower" "8812au" ]; + boot.blacklistedKernelModules = [ "k10temp" ]; + boot.kernelParams = [ "amd_pstate=active" ]; + boot.extraModulePackages = with config.boot.kernelPackages; [ zenpower rtl8812au ]; + hardware.opengl.extraPackages = [ pkgs.rocmPackages.clr.icd ]; + hardware.opengl.extraPackages32 = [ ]; + + services.xserver.videoDrivers = lib.mkDefault [ "modesetting" ]; + + hardware.graphics = { + enable = lib.mkDefault true; + enable32Bit = lib.mkDefault true; + }; + + hardware.amdgpu.initrd.enable = lib.mkDefault true; systemd.tmpfiles.rules = [ "L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}" diff --git a/user/app/doom-emacs/doom.org b/user/app/doom-emacs/doom.org index 1aef482..3f9087f 100644 --- a/user/app/doom-emacs/doom.org +++ b/user/app/doom-emacs/doom.org @@ -1,6 +1,6 @@ #+TITLE: Doom Emacs Literate Config #+AUTHOR: Emmet - +# FIXME doom emacs config * Table of Contents :TOC:QUOTE: #+BEGIN_QUOTE - [[#what-is-doom-emacs][What is Doom Emacs?]]