From fddae3ba366288324c1fd0cabb8513f778e99439 Mon Sep 17 00:00:00 2001
From: mitchell <m@mjfs.us>
Date: Mon, 13 Apr 2026 14:19:52 -0400
Subject: [PATCH] feat: update niri config for VM, add cachyos repo script

- Update niri output config for Virtual-1 display
- Add cachyos repository installation script
- Fix btrfs device path from vda2 to vda1
- Configure sudo-rs with symbolic links
- Comment out polkit agent and swayidle spawns
---
 .config/niri/config.kdl |  9 ++++-----
 cachyos_repo            |  9 +++++++++
 format_btrfs            |  4 ++--
 greetd_niri.kdl         |  6 ++++++
 install_arch            | 10 ++++++++--
 5 files changed, 29 insertions(+), 9 deletions(-)
 create mode 100755 cachyos_repo

diff --git a/.config/niri/config.kdl b/.config/niri/config.kdl
index f7c43e3..c01ef11 100644
--- a/.config/niri/config.kdl
+++ b/.config/niri/config.kdl
@@ -29,11 +29,11 @@ input {
     }
 }
 
-output "ASUSTek COMPUTER INC VG27WQ L1LMDW002255" {
-    mode "2560x1440@164.998"
+output "Virtual-1" {
+    mode "1920x1200"
     scale 1
     transform "normal"
-    position x=2560 y=0
+    position x=1920 y=0
 }
 
 layout {
@@ -77,8 +77,7 @@ layout {
     }
 }
 
-spawn-at-startup "/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1"
-spawn-sh-at-startup "swayidle -w timeout 1800 'niri msg action power-off-monitors' timeout 1860 'qs -c noctalia-shell ipc call lockScreen lock'"
+//spawn-at-startup "/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1"
 
 hotkey-overlay {
     skip-at-startup
diff --git a/cachyos_repo b/cachyos_repo
new file mode 100755
index 0000000..b14fced
--- /dev/null
+++ b/cachyos_repo
@@ -0,0 +1,9 @@
+#!/usr/bin/env fish
+curl https://mirror.cachyos.org/cachyos-repo.tar.xz -o cachyos-repo.tar.xz
+and tar xvf cachyos-repo.tar.xz
+and cd cachyos-repo/
+and sudo ./cachyos-repo.sh
+and sudo pacman -S --noconfirm cachyos-rate-mirrors
+and sudo cachyos-rate-mirrors
+and sudo pacman -Syuu --noconfirm
+and sudo pacman -S linux-cachyos linux-cachyos-headers
diff --git a/format_btrfs b/format_btrfs
index efb06b8..dfd70c5 100755
--- a/format_btrfs
+++ b/format_btrfs
@@ -2,10 +2,10 @@
 
 lsblk
 echo
-read -P 'Device (/dev/vda2):' -l device
+read -P 'Device (/dev/vda1): ' -l device
 
 if test -z "$device"
-    set device /dev/vda2
+    set device /dev/vda1
 end
 
 mkfs.btrfs $device
diff --git a/greetd_niri.kdl b/greetd_niri.kdl
index ed0b496..4f143f7 100644
--- a/greetd_niri.kdl
+++ b/greetd_niri.kdl
@@ -13,3 +13,9 @@ input {
 hotkey-overlay {
     skip-at-startup
 }
+output "Virtual-1" {
+    mode "1920x1200"
+    scale 1
+    transform "normal"
+    position x=1920 y=0
+}
diff --git a/install_arch b/install_arch
index feef591..3e7f484 100755
--- a/install_arch
+++ b/install_arch
@@ -147,9 +147,15 @@ function add_lvm2_mkinitcpio_hook -a is_encrypt
 end
 
 function configure_sudo
-    log 'Adding and configuring wheel group'
-    install sudo
+    log 'Installing and configuring sudo'
+    install sudo sudo-rs
+
+    ln -s /usr/bin/su-rs /usr/local/bin/su
+    ln -s /usr/bin/sudo-rs /usr/local/bin/sudo
+    ln -s /usr/bin/sudoedit-rs /usr/local/bin/sudoedit
+    ln -s /usr/bin/visudo-rs /usr/local/bin/visudo
     sed -i 's/# %wheel ALL=(ALL:ALL) ALL/%wheel ALL=(ALL:ALL) ALL/' /etc/sudoers
+    sed -i 's/Defaults!\/usr\/bin\/visudo/Defaults!\/usr\/local\/bin\/visudo/' /etc/sudoers
 end
 
 function create_admin_user -a username pass