machines/sabo/hardware-configuration.nix

@@ -1,101 +1,49 @@
 # 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,
-  ...
-}:
 
 {
-  imports = [
+  imports =
-    (modulesPath + "/installer/scan/not-detected.nix")
+    [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "uas" "sd_mod" ];
-    "xhci_pci"
-    "ahci"
-    "uas"
-    "sd_mod"
-  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
-  boot.kernelParams = [ "pcie_port_pm=off" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
+  fileSystems."/" =
-    device = "/dev/disk/by-uuid/62a9eb3b-801e-4a1d-b945-39e71d036973";
+    { device = "/dev/disk/by-uuid/62a9eb3b-801e-4a1d-b945-39e71d036973";
       fsType = "btrfs";
       options = [ "subvol=@" ];
     };
 
-  boot.initrd.luks.devices."nixos-root".device =
+  boot.initrd.luks.devices."nixos-root".device = "/dev/disk/by-uuid/7d512c0d-d47f-488e-ac15-6b91410b1e0b";
-    "/dev/disk/by-uuid/7d512c0d-d47f-488e-ac15-6b91410b1e0b";
 
-  fileSystems."/boot" = {
+  fileSystems."/boot" =
-    device = "/dev/disk/by-uuid/5767-963F";
+    { device = "/dev/disk/by-uuid/5767-963F";
       fsType = "vfat";
-    options = [
+      options = [ "fmask=0022" "dmask=0022" ];
-      "fmask=0022"
-      "dmask=0022"
-    ];
     };
 
-  fileSystems."/home" = {
+  fileSystems."/home" =
-    device = "/dev/disk/by-uuid/62a9eb3b-801e-4a1d-b945-39e71d036973";
+    { device = "/dev/disk/by-uuid/62a9eb3b-801e-4a1d-b945-39e71d036973";
       fsType = "btrfs";
       options = [ "subvol=@home" ];
     };
 
-  fileSystems."/nix" = {
+  fileSystems."/nix" =
-    device = "/dev/disk/by-uuid/62a9eb3b-801e-4a1d-b945-39e71d036973";
+    { device = "/dev/disk/by-uuid/62a9eb3b-801e-4a1d-b945-39e71d036973";
       fsType = "btrfs";
       options = [ "subvol=@nix" ];
     };
 
-  fileSystems."/var/log" = {
+  fileSystems."/var/log" =
-    device = "/dev/disk/by-uuid/62a9eb3b-801e-4a1d-b945-39e71d036973";
+    { device = "/dev/disk/by-uuid/62a9eb3b-801e-4a1d-b945-39e71d036973";
       fsType = "btrfs";
       options = [ "subvol=@log" ];
     };
-  fileSystems."/mnt/nas/music" = {
-    device = "192.168.1.2:/volume1/music";
-    options = [
-      "nfsvers=4.2"
-      "x-systemd.automount"
-      "noauto"
-      "rw"
-      "relatime"
-      "user"
-      "acl"
-      "defaults"
-    ];
-    fsType = "nfs";
-  };
-
-  services.rpcbind.enable = true; # needed for NFS
-  systemd.mounts = [
-    {
-      type = "nfs";
-      mountConfig = {
-        Options = "defaults,acl,user,noauto,relatime,rw";
-      };
-      what = "192.168.1.2:/volume1/music";
-      where = "/mnt/nas/music";
-    }
-  ];
-
-  systemd.automounts = [
-    {
-      wantedBy = [ "multi-user.target" ];
-      automountConfig = {
-        TimeoutIdleSec = "600";
-      };
-      where = "/mnt/nas/music";
-    }
-  ];
 
   swapDevices = [ ];
 

modules/desktop.nix

@@ -80,7 +80,7 @@
 
   xdg.portal = {
     enable = true;
-    extraPortals = [ pkgs.kdePackages.xdg-desktop-portal-kde ];
+    extraPortals = [ pkgs.xdg-desktop-portal-kde ];
     xdgOpenUsePortal = true;
   };
 

modules/home-config.nix

@@ -230,29 +230,7 @@ in
             core.fileMode = false;
           };
         };
-        mpv = {
-          enable = true;
-          package = (
-            pkgs.mpv-unwrapped.wrapper {
-              scripts = with pkgs.mpvScripts; [
-                mpris
-                sponsorblock
-                thumbfast
-                uosc
-                visualizer
-              ];
 
-              mpv = pkgs.mpv-unwrapped.override {
-                waylandSupport = true;
-              };
-            }
-          );
-
-          config = {
-            profile = "high-quality";
-            ytdl-format = "bestvideo+bestaudio";
-          };
-        };
         neovim = {
           defaultEditor = true;
           viAlias = true;