home/alex/programs/emacs/default.nix

@@ -15,7 +15,6 @@ in
 
   programs.emacs = {
     enable = true;
-    package = pkgs.emacs-pgtk;
     extraPackages =
       epkgs: with epkgs; [
         vterm

home/alex/programs/emacs/doom/config.el

@@ -163,10 +163,6 @@
    )
   )
 
-(use-package! jj-mode
-  :config
-  (evil-make-overriding-map jj-mode-map 'normal))
-
 (when ak/at-work?
   (after! forge
     (add-to-list 'forge-alist '("gitlab.atlas.de" "gitlab.atlas.de/api/v4" "gitlab.atlas.de" forge-gitlab-repository)))

home/alex/programs/emacs/doom/packages.el

@@ -91,4 +91,3 @@
 (package! modus-themes)
 (package! consult-denote)
 (package! casual-suite)
-(package! jj-mode :recipe (:host github :repo "bolivier/jj-mode.el"))

hosts/dregil/configuration.nix

@@ -9,6 +9,15 @@
   lib,
   ...
 }:
+let
+  nvidia-offload = pkgs.writeShellScriptBin "nvidia-offload" ''
+    export __NV_PRIME_RENDER_OFFLOAD=1
+    export __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0
+    export __GLX_VENDOR_LIBRARY_NAME=nvidia
+    export __VK_LAYER_NV_optimus=NVIDIA_only
+    exec "$@"
+  '';
+in
 {
   imports = [
     # Include the results of the hardware scan.
@@ -81,6 +90,7 @@
     wget
     ripgrep
     git
+    nvidia-offload
     pinentry-qt
   ];
 

hosts/dregil/hardware-configuration.nix

@@ -10,10 +10,7 @@
 }:
 
 {
-  imports = [
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
-    (modulesPath + "/installer/scan/not-detected.nix")
-    ../../modules/wm/nvidia.nix
-  ];
 
   boot.initrd.availableKernelModules = [
     "xhci_pci"
@@ -95,22 +92,22 @@
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 
-  # hardware.nvidia = {
+  hardware.nvidia = {
-  #   nvidiaSettings = true;
+    nvidiaSettings = true;
-  #   nvidiaPersistenced = true;
+    nvidiaPersistenced = true;
-  #   open = true;
+    open = true;
 
-  #   #    modesetting.enable = true;
+    #    modesetting.enable = true;
-  #   # package = config.boot.kernelPackages.nvidiaPackages.beta;
+    package = config.boot.kernelPackages.nvidiaPackages.beta;
-  #   #    prime = {
+    #    prime = {
-  #   #      offload.enable = true;
+    #      offload.enable = true;
-  #   #
+    #
-  #   #      intelBusId = "PCI:1:0:0";
+    #      intelBusId = "PCI:1:0:0";
-  #   #      nvidiaBusId = "PCI:1:0:0";
+    #      nvidiaBusId = "PCI:1:0:0";
-  #   #      intelBusId = "0@0:2:0";
+    #      intelBusId = "0@0:2:0";
-  #   #      nvidiaBusId = "1@1:0:0";
+    #      nvidiaBusId = "1@1:0:0";
-  #   #    };
     #    };
+  };
 
   hardware.graphics = {
     enable = true;

modules/wm/nvidia.nix

@@ -1,25 +0,0 @@
-{
-  config,
-  ...
-}:
-
-{
-  hardware.graphics.enable = true;
-
-  services.xserver.videoDrivers = [ "nvidia" ];
-
-  hardware.nvidia = {
-    modesetting.enable = true;
-    nvidiaPersistenced = true;
-    powerManagement.enable = true;
-    powerManagement.finegrained = false;
-    open = false;
-    nvidiaSettings = true;
-    package = config.boot.kernelPackages.nvidiaPackages.latest;
-  };
-
-  boot.kernelParams = [
-    "nvidia-drm.fbdev=1"
-    "nvidia-drm.modeset=1"
-  ];
-}

modules/wm/x.nix

@@ -6,7 +6,6 @@
 }:
 
 {
-  imports = [ ./nvidia.nix ];
   # Enable the X11 windowing system.
   services = {
     dbus = {