Updated system and removed broken emacs :(

librephoenix · librephoenix · commit 3b9eea143e6f · 2024-10-18T20:34:52.000-05:00
diff --git a/flake.lock b/flake.lock
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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?]]
