flake.nix

@@ -280,7 +280,7 @@
         specialArgs = mkSpecialArgs system;
 
         modules = linuxOfflineGuiModules [
-          ./nixos/hosts/valere
+          ./nixos/hosts/valere.nix
           ./nixos/configs/steam.nix
           ./nixos/configs/vmware.nix
           ./nixos/configs/power-saving.nix

nixos/configs/ccache.nix

@@ -1,38 +0,0 @@
-#
-# Support for using Ccache.
-#
-{ config, ... }:
-{
-  programs.ccache.enable = true;
-  nix.settings.extra-sandbox-paths = [ config.programs.ccache.cacheDir ];
-
-  nixpkgs.overlays = [
-  (self: super: {
-    ccacheWrapper = super.ccacheWrapper.override {
-      extraConfig = ''
-        export CCACHE_COMPRESS=1
-        export CCACHE_DIR="${config.programs.ccache.cacheDir}"
-        export CCACHE_UMASK=007
-        if [ ! -d "$CCACHE_DIR" ]; then
-          echo "====="
-          echo "Directory '$CCACHE_DIR' does not exist"
-          echo "Please create it with:"
-          echo "  sudo mkdir -m0770 '$CCACHE_DIR'"
-          echo "  sudo chown root:nixbld '$CCACHE_DIR'"
-          echo "====="
-          exit 1
-        fi
-        if [ ! -w "$CCACHE_DIR" ]; then
-          echo "====="
-          echo "Directory '$CCACHE_DIR' is not accessible for user $(whoami)"
-          echo "Please verify its access permissions"
-          echo "====="
-          exit 1
-        fi
-      '';
-    };
-  })
-
-  # Use this for kernel packages.
-];
-}

nixos/configs/dotfiles/git.hm.nix

@@ -1,7 +1,4 @@
 { deprekages, pkgs, ... }:
-let
-	difft = "${pkgs.difftastic}/bin/difft";
-in
 {
 
   #
@@ -14,22 +11,13 @@ in
     # Note: we no longer set a name, here, forcing us to choose our e-mail and username
     # on a per-project basis.
 
+    # Proide the difftastic command.
+    difftastic.enable = true;
+
     extraConfig = {
       # Use main as our branch names.
       init.defaultBranch = "main";
 
-      #
-      # Use difftastic.
-      #
-      alias = {
-        dlog = "-c diff.external=${difft} log --ext-diff";
-        dshow = "-c diff.external=${difft} show --ext-diff";
-        ddiff = "-c diff.external=${difft} diff";
-        dl = "-c diff.external=${difft} log -p --ext-diff";
-        ds = "-c diff.external=${difft} show --ext-diff";
-        dd = "-c diff.external=${difft} diff";
-      };
-
       #
       # Use mergiraf.
       #

nixos/configs/gui/niri.nix

@@ -228,7 +228,6 @@ in
               "XF86Launch6".action = sh "wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 0.1-";
               "XF86Tools".action = sh "wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 0.1+";
               "XF86AudioMute".action = sh "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
-              "XF86AudioMicMute".action = sh "wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle";
 
               "XF86MonBrightnessDown".action = sh "brightnessctl set 10%-";
               "XF86MonBrightnessUp".action = sh "brightnessctl set 10%+";

nixos/configs/nix.nix

@@ -32,8 +32,7 @@
             system = "x86_64-linux";
             protocol = "ssh";
 
-            #hostName = "trailblazer.kate.tailnet.polytheon.org";
-            hostName = "100.64.0.12";
+            hostName = "trailblazer.kate.tailnet.polytheon.org";
 
             sshUser = "deprekated";
             sshKey = "/home/deprekated/.ssh/id_ed25519";

nixos/hosts/valere.nix

@@ -53,8 +53,7 @@
   services.xserver.videoDrivers = ["nvidia"];
 
 	# Set up the NVIDIA half of the GPU setup.
-	# These are used only in the "enabled" configuration.
-  system.nixos.tags = ["Intel"];
+  system.nixos.tags = ["NVIDIA" "Intel"];
   hardware.nvidia = {
     modesetting.enable = true;
 
@@ -75,15 +74,18 @@
 
   };
 
-	# Disable the NVIDIA GPU unless we explicitly request it.
-	hardware.nvidiaOptimus.disable = true;
+	# Provide a way to disable the NVIDIA GPU entirely,
+	# for points when traveling where we don't want to burn power.
+  specialisation.lowpower.configuration = {
+		system.nixos.tags = lib.mkForce ["Intel"];
 
-	# Provide a configuration that uses the full GPU power of the system.
-  specialisation.optimus.configuration = {
-		system.nixos.tags = lib.mkForce ["NVIDIA"];
+		# Disable the NVIDIA GPU.
+		hardware.nvidiaOptimus.disable = true;
 
-		# Don't disable optimus on this config.
-  	hardware.nvidiaOptimus.disable = lib.mkForce false;
+		# These don't actually do anything, but they make introspecting
+		# the configuration a bit nicer.
+		hardware.nvidia.modesetting.enable = lib.mkForce false;
+		hardware.nvidia.prime.sync.enable = lib.mkForce false;
   };
 
 	# Provide memtest86, since that's nice.
@@ -115,17 +117,6 @@
   ];
   boot.extraModulePackages = [ config.boot.kernelPackages.acpi_call ];
 
-  # Support the Dell Privacy Driver.
-  boot.kernelPatches = [ {
-		name = "enable-dell-privacy";
-		patch = ./00-support-dell-smbios.patch;
-
-		extraStructuredConfig = with lib.kernel; {
-				DELL_WMI_PRIVACY = yes;
-		};
-
-   } ];
-
   # Support thunderbolt.
   services.hardware.bolt.enable = true;
 

nixos/hosts/valere/00-support-dell-smbios.patch

@@ -1,21 +0,0 @@
----
-v2:
- - Commit message reflects Alienware devices may not necessarily support
-   the SMBIOS interface
- - Commit message now has "Tested on"
----
- drivers/platform/x86/dell/dell-smbios-base.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/platform/x86/dell/dell-smbios-base.c b/drivers/platform/x86/dell/dell-smbios-base.c
-index 73e41eb69..01c72b91a 100644
---- a/drivers/platform/x86/dell/dell-smbios-base.c
-+++ b/drivers/platform/x86/dell/dell-smbios-base.c
-@@ -576,6 +576,7 @@ static int __init dell_smbios_init(void)
- 	int ret, wmi, smm;
-
- 	if (!dmi_find_device(DMI_DEV_TYPE_OEM_STRING, "Dell System", NULL) &&
-+	    !dmi_find_device(DMI_DEV_TYPE_OEM_STRING, "Alienware", NULL) &&
- 	    !dmi_find_device(DMI_DEV_TYPE_OEM_STRING, "www.dell.com", NULL)) {
- 		pr_err("Unable to run on non-Dell system\n");
- 		return -ENODEV;