hosts/gAluminum/default.nix

@@ -1,16 +1,8 @@
-{ config, pkgs, lib, ... }:
+{ config, pkgs, ... }:
 
-let
-  hostname = "gAluminum";
-  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 -a "$0" "$@"
-  '';
+let hostname = "gAluminum";
 in {
-  imports = [ ./hardware.nix ./wireguard.nix ./sound.nix ];
+  imports = [ ./hardware.nix ./wireguard.nix ];
 
   boot = {
     supportedFilesystems = [ "ntfs" ];
@@ -20,8 +12,6 @@ in {
       systemd-boot.enable = true;
     };
 
-    kernelPackages = pkgs.linuxPackages_latest;
-
     initrd.luks.devices = {
       root = {
         device = "/dev/disk/by-uuid/c2bac3a6-0999-4e1d-a676-bf4bcafee2d4";
@@ -40,35 +30,20 @@ in {
   };
 
   time.timeZone = "Europe/London";
-  virtualisation.virtualbox.host = {
-    enable = true;
-    enableExtensionPack = true;
-  };
+  virtualisation.virtualbox.host.enable = true;
+  virtualisation.virtualbox.host.enableExtensionPack = true;
+  users.extraGroups.vboxusers.members = [ "giulio" ];
 
-  users.extraGroups = {
-    vboxusers.members = [ "giulio" ];
-    video.members = [ "giulio" ];
-  };
-
-  services = {
-    printing.enable = true;
-    xserver.videoDrivers = [ "nvidia" ];
-    teamviewer.enable = true;
-    davfs2.enable = true;
-  };
+  services.printing.enable = true;
+  sound.enable = true;
 
   hardware = {
+    pulseaudio.enable = true;
     ledger.enable = true;
-    nvidia = {
-      prime = {
-        offload.enable = true;
-        intelBusId = "PCI:0:2:0";
-        nvidiaBusId = "PCI:1:0:0";
-      };
-    };
   };
 
+  services.teamviewer.enable = true;
   programs.steam.enable = true;
-  environment.systemPackages = with pkgs; [ efibootmgr nvidia-offload ];
+  environment.systemPackages = with pkgs; [ efibootmgr ];
   system.stateVersion = "21.05"; # Did you read the comment?
 }

hosts/gAluminum/hardware.nix

@@ -23,4 +23,6 @@
   };
 
   swapDevices = [ ];
+
+  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
 }

hosts/gAluminum/sound.nix

@@ -1,36 +0,0 @@
-{
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-    media-session.config.bluez-monitor.rules = [
-      {
-        # Matches all cards
-        matches = [{ "device.name" = "~bluez_card.*"; }];
-        actions = {
-          "update-props" = {
-            "bluez5.reconnect-profiles" = [ "hfp_hf" "hsp_hs" "a2dp_sink" ];
-            # mSBC is not expected to work on all headset + adapter combinations.
-            "bluez5.msbc-support" = true;
-            # SBC-XQ is not expected to work on all headset + adapter combinations.
-            "bluez5.sbc-xq-support" = true;
-          };
-        };
-      }
-      {
-        matches = [
-          # Matches all sources
-          {
-            "node.name" = "~bluez_input.*";
-          }
-          # Matches all outputs
-          { "node.name" = "~bluez_output.*"; }
-        ];
-        actions = { "node.pause-on-idle" = false; };
-      }
-    ];
-  };
-  security.rtkit.enable = true;
-  hardware.pulseaudio.enable = false;
-}

roles/common.nix

@@ -26,8 +26,7 @@
 
   nixpkgs = { config = { allowUnfree = true; }; };
 
-  fonts.fontconfig.enable = true;
-  fonts.fonts = with pkgs; [ cascadia-code victor-mono ];
+  fonts.fonts = with pkgs; [ cascadia-code ];
 
   environment.systemPackages = with pkgs; [
     file

roles/gnome.nix

@@ -4,10 +4,7 @@
   services = {
     xserver = {
       enable = true;
-      displayManager.gdm = {
-        enable = true;
-        wayland = false;
-      };
+      displayManager.gdm.enable = true;
       desktopManager.gnome.enable = true;
       libinput.enable = true;
       layout = "us";
@@ -16,13 +13,8 @@
 
     dbus.packages = with pkgs; [ gnome3.dconf ];
     udev.packages = with pkgs; [ gnome3.gnome-settings-daemon ];
-    gvfs.enable = true;
   };
 
-  environment.systemPackages = with pkgs; [
-    gnomeExtensions.appindicator
-    gnomeExtensions.sound-output-device-chooser
-    pkgs.unstable.gnomeExtensions.pop-shell
-  ];
+  environment.systemPackages = with pkgs; [ gnomeExtensions.appindicator ];
   security.pam.services.gdm.enableGnomeKeyring = true;
 }

roles/home/common.nix

@@ -10,7 +10,7 @@
       VISUAL = "nvim";
     };
 
-    packages = with pkgs; [ rizin sshfs nixfmt victor-mono ];
+    packages = with pkgs; [ rizin sshfs nixfmt ];
   };
 
   programs.neovim = {