From 5f1d042056d5926ca5f1e98920a2148aacc7adce Mon Sep 17 00:00:00 2001
From: Fish <77413091+JulianBarbera@users.noreply.github.com>
Date: Sun, 7 Sep 2025 22:45:11 -0700
Subject: [PATCH] Updates for OS reinstall

---
 users/fish/cattop/configuration.nix          |  6 ---
 users/fish/cattop/hardware-configuration.nix | 48 +++++++-------------
 users/fish/cattop/home.nix                   |  4 +-
 3 files changed, 18 insertions(+), 40 deletions(-)

diff --git a/users/fish/cattop/configuration.nix b/users/fish/cattop/configuration.nix
index b93180c6c3305e5f391db8139de7383536e597be..d455b262b7dd5253e88736b7c0d5f55cfb9a5e78 100644
--- a/users/fish/cattop/configuration.nix
+++ b/users/fish/cattop/configuration.nix
@@ -15,9 +15,6 @@
   networking.hostName = "cattop";
   # networking.networkmanager.enable = true;  # Easiest to use and most distros use this by default.
 
-  # Set your time zone.
-  Time.timeZone = "America/Los_Angeles";
-
   services.xserver.enable = true;
 
   services.displayManager.gdm.enable = true;
@@ -81,7 +78,6 @@
 
   users.users.fish = {
     isNormalUser = true;
-    shell = pkgs.fish;
     extraGroups = [
       "wheel"
       "dialout"
@@ -91,7 +87,6 @@
       git
       nh
       vim
-      fish
     ];
   };
   programs.git = {
@@ -113,7 +108,6 @@
     wget
   ];
 
-  programs.fish.enable = true;
   programs.mtr.enable = true;
   programs.gnupg.agent = {
     enable = true;
diff --git a/users/fish/cattop/hardware-configuration.nix b/users/fish/cattop/hardware-configuration.nix
index 7e98eeb8a81bcaa008732b48c6b2c13496ca1599..b16ddcb14f7da7960d16b1feb84affeece222af5 100644
--- a/users/fish/cattop/hardware-configuration.nix
+++ b/users/fish/cattop/hardware-configuration.nix
@@ -1,46 +1,32 @@
 # 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 = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
 
-  boot.initrd.availableKernelModules = [
-    "xhci_pci"
-    "thunderbolt"
-    "vmd"
-    "nvme"
-  ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "vmd" "nvme" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/8eb0d6a2-b8cf-4ef2-ba2a-e25a5555b0bc";
-    fsType = "ext4";
-  };
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/d434c90f-e135-426e-b237-ead2f44e37c6";
+      fsType = "ext4";
+    };
 
-  fileSystems."/boot/efi" = {
-    device = "/dev/disk/by-uuid/3B51-4A1C";
-    fsType = "vfat";
-    options = [
-      "fmask=0077"
-      "dmask=0077"
+  fileSystems."/boot/EFI" =
+    { device = "/dev/disk/by-uuid/473A-B8FD";
+      fsType = "vfat";
+      options = [ "fmask=0077" "dmask=0077" ];
+    };
+
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/e0cac471-0e32-4d5a-bf85-e8f93b304356"; }
     ];
-  };
-
-  swapDevices = [
-    { device = "/dev/disk/by-uuid/58ee9d19-292f-49b5-9979-341b42e8e09d"; }
-  ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
diff --git a/users/fish/cattop/home.nix b/users/fish/cattop/home.nix
index fee99c66087e20c50a769208497aad0e37d8c6ac..6cef84292dabfa59f7a19ca31c11d3c9628e4d73 100644
--- a/users/fish/cattop/home.nix
+++ b/users/fish/cattop/home.nix
@@ -8,12 +8,11 @@
       ghostty
       signal-desktop
       spotify
-      inputs.zen-browser.packages.x86_64-linux.default
       legcord
 
       # Gaming
       (prismlauncher.override { gamemodeSupport = true; })
-      bsdgames
+      #bsdgames
       space-cadet-pinball
 
       # System & desktop tools
@@ -41,7 +40,6 @@
 
   programs = {
     btop.enable = true;
-    fish.enable = true;
     hyfetch.enable = true;
 
     gh = {
-- 
2.54.0