From b808a79ab266c85d48e757406b89d06b29f51f03 Mon Sep 17 00:00:00 2001
From: Julia <fish@fishcat.fish>
Date: Sat, 5 Jul 2025 20:33:02 -0700
Subject: [PATCH] fixing things

---
 flake.nix                                     |  3 --
 modules/nixos/services.nix                    |  4 --
 switch                                        | 14 +++---
 users/julia/cattop/hardware-configuration.nix | 48 ++++++++++++-------
 users/natalie/desktop/configuration.nix       |  5 ++
 5 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/flake.nix b/flake.nix
index ee9f68037591d78c47f8552fe7ac88410b9c297e..1af0c7db92b6fe7d1fcca4e46535839a38f729d0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -150,9 +150,6 @@
         user = "julia";
         host = "cattop";
         system = "x86_64-linux";
-        extraModules = [
-          nixos-cosmic.nixosModules.default
-        ];
       };
 
       # generate checks for "nix flake check --all-systems --no-build"
diff --git a/modules/nixos/services.nix b/modules/nixos/services.nix
index c48ebc14495deeeb9ca4a37d50fff8adf226c4a4..ef9feae71a6c4a24e847da17779522d023138b74 100644
--- a/modules/nixos/services.nix
+++ b/modules/nixos/services.nix
@@ -22,10 +22,6 @@
       };
     };
 
-    desktopManager.cosmic.enable = true;
-    displayManager.cosmic-greeter.enable = true;
-    desktopManager.cosmic.xwayland.enable = true;
-
     # Auto mount devices
     udisks2 = {
       enable = true;
diff --git a/switch b/switch
index bd3388f8f4ffb43d94b54153ceb0893fdea2411c..3c267596a89ce1a79011f5431c6d73cc4e2a25ec 100755
--- a/switch
+++ b/switch
@@ -1,12 +1,12 @@
 #!/bin/sh
 nh_subcommand="os"
 fallback_command="nixos-rebuild"
-if [ "$(uname -o)" ]; then
-  nh_subcommand="darwin"
-  fallback_command="nix run .#darwin-rebuild"
-fi;
-if command -v nh > /dev/null; then
-  nh $nh_subcommand switch .
+if [ "$(uname -o)" = "darwin" ]; then
+        nh_subcommand="darwin"
+        fallback_command="nix run .#darwin-rebuild"
+fi
+if command -v nh >/dev/null; then
+        nh $nh_subcommand switch .
 else
-  $fallback_command -- switch --flake .
+        $fallback_command -- switch --flake .
 fi
diff --git a/users/julia/cattop/hardware-configuration.nix b/users/julia/cattop/hardware-configuration.nix
index 1c401e422996e717790f21cfb45b4d6b14e162e8..7e98eeb8a81bcaa008732b48c6b2c13496ca1599 100644
--- a/users/julia/cattop/hardware-configuration.nix
+++ b/users/julia/cattop/hardware-configuration.nix
@@ -1,32 +1,46 @@
 # 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/8eb0d6a2-b8cf-4ef2-ba2a-e25a5555b0bc";
+    fsType = "ext4";
+  };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/3B51-4A1C";
-      fsType = "vfat";
-      options = [ "fmask=0077" "dmask=0077" ];
-    };
-
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/58ee9d19-292f-49b5-9979-341b42e8e09d"; }
+  fileSystems."/boot/efi" = {
+    device = "/dev/disk/by-uuid/3B51-4A1C";
+    fsType = "vfat";
+    options = [
+      "fmask=0077"
+      "dmask=0077"
     ];
+  };
+
+  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/natalie/desktop/configuration.nix b/users/natalie/desktop/configuration.nix
index f4f95c269f5f535423f1b28ceccc8eca75333865..ade64ee3abc72adf0e5e2918d0dfeb9ff90c28e6 100644
--- a/users/natalie/desktop/configuration.nix
+++ b/users/natalie/desktop/configuration.nix
@@ -121,6 +121,11 @@
 
   # Enable sound with pipewire.
   security.rtkit.enable = true;
+  services = {
+    desktopManager.cosmic.enable = true;
+    displayManager.cosmic-greeter.enable = true;
+    desktopManager.cosmic.xwayland.enable = true;
+  };
 
   # Enable touchpad support (enabled default in most desktopManager).
   # services.xserver.libinput.enable = true;
-- 
2.54.0