From 68b38ecb38667f56295f02fe3140af40f420ea7c Mon Sep 17 00:00:00 2001
From: Julia Lange <public@julialange.org>
Date: Sun, 16 Mar 2025 20:02:24 -0700
Subject: [PATCH] Onizuka, fix hypr and new hosts structure

---
 hosts/onizuka/host.nix           | 15 ++++++---------
 hosts/onizuka/users/pan/user.nix | 23 +++++++----------------
 2 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/hosts/onizuka/host.nix b/hosts/onizuka/host.nix
index 2fdaf05..619a462 100644
--- a/hosts/onizuka/host.nix
+++ b/hosts/onizuka/host.nix
@@ -9,21 +9,18 @@
   polkit.enable = true;
   tablet.enable = true;
 
-  user.name = "pan";
-  user.timezone = "America/Los_Angeles";
-  system.doAutoUpgrade = true;
+  system.timezone = "America/Los_Angeles";
+  system.users.bigWheels = [ "pan" ];
 
   tuigreet.enable = true;
   hyprland.enable = true;
 
-  librewolf.enable = true;
-  fish.enable = true;
-  fish.setDefault = true;
-  syncthing.enable = true;
-
   steam.enable = true;
-  steam.gamemode.enable = true;
+  steam.gamemode = true;
   aagl.enable = true;
   aagl.honkai-rail = true;
   input-remapper.enable = true;
+
+  shell.enabledShells = [ "fish" ];
+  shell.defaultShell = "fish";
 }
diff --git a/hosts/onizuka/users/pan/user.nix b/hosts/onizuka/users/pan/user.nix
index f59b05b..62ec37a 100644
--- a/hosts/onizuka/users/pan/user.nix
+++ b/hosts/onizuka/users/pan/user.nix
@@ -1,20 +1,12 @@
 { config, pkgs, ... }:
 
 {
-  home.username = "pan";
-  nixpkgs.config.allowUnfree = true;
-  home.stateVersion = "23.05";
-
   hypr.enable = true;
-  hypr.monitor = {
-    details = [
+  hypr.monitor.details = [
       "DP-2,2560x1440@144,0x0,1"
       "DP-1,2560x1440@144,-2560x0,1"
       "HDMI-A-1,disable"
     ];
-    primary = "DP-2";
-    secondary = "DP-1";
-  };
   hypr.workspace = {
     workspaces = {
       "DP-2" = [
@@ -29,13 +21,13 @@
     };
     scratchpad.enable = true;
     defaults = {
-      "name:web" = [ "librewolf" ];
-      "name:med" = [ "librewolf,title:Picture-in-Picture" ];
-      "name:chat" = [ "Beeper" ];
-      "name:game" = [ "lutris" "explorer.exe" ];
+      "name:web" = [ "class:(librewolf)" ];
+      "name:med" = [ "class:(librewolf),title:Picture-in-Picture" ];
+      "name:chat" = [ "class:(Beeper)" ];
+      "name:game" = [ "class:(lutris)" "class:(explorer.exe)" ];
     };
   };
-  windows.opaque = [
+  hypr.windows.opaque = [
     "initialTitle:^(Discord Popout)$"
     "class:^(firefox)$"
     "class:^(Gimp)$"
@@ -57,7 +49,6 @@
     master.mfact = 0.53;
     xwayland.videobridge.enable = true;
   };
-  ags.enable = true;
   rofi.enable = true;
 
   timer.enableHourly = true;
@@ -126,7 +117,7 @@
       lutgen # LUT generator
       prismlauncher # Minecraft launcher
       jdk8 # For playing older minecraft
-      gnucash # Personal Finance Manager
       zoom-us # Zoom
+      musescore
   ];
 }