push

hosts/desktop-nixos-workstation/configuration.nix

@@ -1,31 +1,31 @@
 { config, pkgs, lib, ... }:
 
 let
-  user = "johron";
-  storageRoot = "/storage";
+  #user = "johron";
+  #storageRoot = "/storage";
 
-  folders = [
-    "Applications"
-    "Documents"
-    "Downloads"
-    "Games"
-    "Machines"
-    "Music"
-    "Pictures"
-    "Projects"
-    "Scripts"
-    "Videos"
-    "Wineprefixes"
-  ];
+  #folders = [
+  #  "Applications"
+  #  "Documents"
+  #  "Downloads"
+  #  "Games"
+  #  "Machines"
+  #  "Music"
+  #  "Pictures"
+  #  "Projects"
+  #  "Scripts"
+  #  "Videos"
+  #  "Wineprefixes"
+  #];
 
-  mkBindMount = folder: {
-    name = "/home/${user}/${folder}";
-    value = {
-      device = "${storageRoot}/${folder}";
-      options = [ "bind" "nofail" "x-systemd.automount" ];
-      depends = [ storageRoot ];
-    };
-  };
+  #mkBindMount = folder: {
+  #  name = "/home/${user}/${folder}";
+  #  value = {
+  #    device = "${storageRoot}/${folder}";
+  #    options = [ "bind" "nofail" "x-systemd.automount" ];
+  #    depends = [ storageRoot ];
+  #  };
+  #};
 in
 {
   imports = [
@@ -46,11 +46,11 @@ in
   nixpkgs.config.allowUnfree = true;
 
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
-  fileSystems = lib.mkMerge [
-    (builtins.listToAttrs (map mkBindMount folders))
-  ];
+  #fileSystems = lib.mkMerge [
+  #  (builtins.listToAttrs (map mkBindMount folders))
+  #];
 
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
   system.stateVersion = "25.11";
-}
+}

hosts/desktop-nixos-workstation/hardware-configuration.nix

@@ -14,45 +14,25 @@
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/40f01d77-f742-494a-bd9d-05c691619578";
+    { device = "/dev/disk/by-uuid/b00d21c1-7c72-4478-8a78-e5204e24d27c";
       fsType = "btrfs";
       options = [ "subvol=@" ];
     };
 
   fileSystems."/home" =
-    { device = "/dev/disk/by-uuid/40f01d77-f742-494a-bd9d-05c691619578";
+    { device = "/dev/disk/by-uuid/b00d21c1-7c72-4478-8a78-e5204e24d27c";
       fsType = "btrfs";
       options = [ "subvol=@home" ];
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/DC2D-30C4";
+    { device = "/dev/disk/by-uuid/C90B-4ED2";
       fsType = "vfat";
       options = [ "fmask=0077" "dmask=0077" ];
     };
 
-  fileSystems."/hdd" =
-    { device = "/dev/disk/by-uuid/995f3a39-f893-497d-bc2a-c0cb1f4c913c";
-      fsType = "ext4";
-    };
-
-  fileSystems."/nix" =
-    { device = "/dev/disk/by-uuid/08162bfa-f48f-4b7c-8bf0-2a38e92810de";
-      fsType = "btrfs";
-    };
-
-  fileSystems."/nvme" =
-    { device = "/dev/disk/by-uuid/aa535a01-d005-4fd2-9e95-3787ce33b6f3";
-      fsType = "btrfs";
-    };
-
-  fileSystems."/storage" =
-    { device = "/dev/disk/by-uuid/6f208e9e-ec40-4107-803d-d8f381a31e40";
-      fsType = "btrfs";
-    };
-
   swapDevices = [ ];
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}
+}

hosts/desktop-nixos-workstation/hardware-configuration.nix.bak

@@ -0,0 +1,58 @@
+# 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, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-amd" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/40f01d77-f742-494a-bd9d-05c691619578";
+      fsType = "btrfs";
+      options = [ "subvol=@" ];
+    };
+
+  fileSystems."/home" =
+    { device = "/dev/disk/by-uuid/40f01d77-f742-494a-bd9d-05c691619578";
+      fsType = "btrfs";
+      options = [ "subvol=@home" ];
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/DC2D-30C4";
+      fsType = "vfat";
+      options = [ "fmask=0077" "dmask=0077" ];
+    };
+
+  fileSystems."/hdd" =
+    { device = "/dev/disk/by-uuid/995f3a39-f893-497d-bc2a-c0cb1f4c913c";
+      fsType = "ext4";
+    };
+
+  fileSystems."/nix" =
+    { device = "/dev/disk/by-uuid/08162bfa-f48f-4b7c-8bf0-2a38e92810de";
+      fsType = "btrfs";
+    };
+
+  fileSystems."/nvme" =
+    { device = "/dev/disk/by-uuid/aa535a01-d005-4fd2-9e95-3787ce33b6f3";
+      fsType = "btrfs";
+    };
+
+  fileSystems."/storage" =
+    { device = "/dev/disk/by-uuid/6f208e9e-ec40-4107-803d-d8f381a31e40";
+      fsType = "btrfs";
+    };
+
+  swapDevices = [ ];
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}

nixos/features/system/gaming.nix

@@ -13,6 +13,7 @@
     enable = true;
     packages = [
       "org.vinegarhq.Sober"
+      "org.vinegarhq.Vinegar"
     ];
   };