From 034796f526daa7ba9b49fb4b43e107b495c92514 Mon Sep 17 00:00:00 2001
From: Aria Nolan <tacocat@chytrid.xyz>
Date: Mon, 30 Oct 2023 15:20:14 -0400
Subject: [PATCH] setup JWST properly and fixed river

---
 hosts/JWST/configuration.nix             | 15 ++++-----------
 hosts/JWST/hardware-configuration.nix    | 14 +++++++-------
 users/tacocat/wayland/default.nix        |  4 ++--
 users/tacocat/wayland/river/init         |  6 +++---
 users/tacocat/wayland/waybar/default.nix |  5 +++++
 5 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/hosts/JWST/configuration.nix b/hosts/JWST/configuration.nix
index 67da7dc..0871f95 100644
--- a/hosts/JWST/configuration.nix
+++ b/hosts/JWST/configuration.nix
@@ -87,17 +87,10 @@
   };
 
   programs.river.enable = true;
-  # programs.river.extraPackages = with pkgs; [
-  #   swaylock
-  #   swayidle
-  #   dunst
-  #   wlsunset
-  #   nm-applet
-  #   grim
-  #   slurp
-  #   waybar
-  #   wbg
-  # ];
+  programs.river.extraPackages = with pkgs; [
+    swaylock
+    swayidle
+  ];
 
   environment = {
     systemPackages = with pkgs; [
diff --git a/hosts/JWST/hardware-configuration.nix b/hosts/JWST/hardware-configuration.nix
index 4b9819c..b6c6c55 100644
--- a/hosts/JWST/hardware-configuration.nix
+++ b/hosts/JWST/hardware-configuration.nix
@@ -8,16 +8,21 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "rtsx_pci_sdmmc" ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/488c7ef3-5ea1-4a16-a5f9-e241901c24ce";
+    { device = "/dev/disk/by-uuid/d05d358d-19d4-4629-b0bd-594a754ad76d";
       fsType = "ext4";
     };
 
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/6DD4-5A29";
+      fsType = "vfat";
+    };
+
   fileSystems."/mnt/void" =
     { device = "/dev/disk/by-uuid/987518fa-8ea0-49a6-b1e5-1fed4e4ae50f";
       fsType = "ext4";
@@ -28,11 +33,6 @@
       fsType = "ext4";
     };
 
-  fileSystems."/boot/efi" = 
-    { device = "/dev/disk/by-uuid/F54B-C04F";
-      fsType = "vfat";
-    };
-
   swapDevices =
     [ { device = "/dev/disk/by-uuid/802e89ce-52b8-41b9-85ea-b969ab08765f"; }
     ];
diff --git a/users/tacocat/wayland/default.nix b/users/tacocat/wayland/default.nix
index 14f6370..03e3889 100644
--- a/users/tacocat/wayland/default.nix
+++ b/users/tacocat/wayland/default.nix
@@ -14,8 +14,8 @@
 
   home.packages = with pkgs; [
     wl-clipboard
-    swaylock
-    swayidle
+    # swaylock
+    # swayidle
     wbg    
     dunst
     grim
diff --git a/users/tacocat/wayland/river/init b/users/tacocat/wayland/river/init
index a7e4edf..6b55ffb 100755
--- a/users/tacocat/wayland/river/init
+++ b/users/tacocat/wayland/river/init
@@ -1,11 +1,11 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # See the river(1), riverctl(1), and rivertile(1) man pages for complete
 # documentation.
 
 # Note: the "Super" modifier is also known as Logo, GUI, Windows, Mod4, etc.
 
-# riverctl spawn "dbus-update-activation-environment SEATD_SOCK DISPLAY WAYLAND _DISPLAY XDG_CURRENT_DESKTOP=river"
+riverctl spawn "dbus-update-activation-environment SEATD_SOCK DISPLAY WAYLAND _DISPLAY XDG_CURRENT_DESKTOP=river"
 
 riverctl map normal Super+Shift Return spawn 'kitty --single-instance'
 riverctl map normal Super D spawn 'rofi -show drun'
@@ -177,4 +177,4 @@ else
 fi
 
 # autostart apps
-# "$HOME/.config/river/process"
+"$HOME/.config/river/process"
diff --git a/users/tacocat/wayland/waybar/default.nix b/users/tacocat/wayland/waybar/default.nix
index 718f291..73ad968 100644
--- a/users/tacocat/wayland/waybar/default.nix
+++ b/users/tacocat/wayland/waybar/default.nix
@@ -112,6 +112,11 @@
           ];
           tooltip = false;
         };
+        "clock#date" = {
+          interval = 20;
+          format = "{:%e %b %Y}";
+          tooltip = false;
+        };
         "tray" = {
           icon-size = 18;
           spacing = 10;