From 8cd8b47273ddc24c7e3695c0f5cbc75932d5eb12 Mon Sep 17 00:00:00 2001
From: unexplrd <unexplrd@linerds.us>
Date: Wed, 26 Mar 2025 16:33:45 +0200
Subject: [PATCH] cleanup, reorganise, syncthing

---
 hosts/eldrid/hardware.nix            | 12 +++++---
 hosts/eldrid/users/user/programs.nix | 43 +++++++++++++++++++++-------
 modules/home/programs/syncthing.nix  |  3 ++
 3 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/hosts/eldrid/hardware.nix b/hosts/eldrid/hardware.nix
index 8c27130..09921b4 100755
--- a/hosts/eldrid/hardware.nix
+++ b/hosts/eldrid/hardware.nix
@@ -21,10 +21,14 @@
     '';
   };
 in {
-  boot.initrd.availableKernelModules = ["ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" "xe" "i915"];
-  boot.initrd.kernelModules = [];
-  boot.kernelModules = ["kvm-intel"];
-  boot.extraModulePackages = [];
+  boot = {
+    initrd = {
+      availableKernelModules = ["ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" "xe" "i915"];
+      kernelModules = [];
+    };
+    kernelModules = ["kvm-intel"];
+    extraModulePackages = [];
+  };
 
   swapDevices = [
     {
diff --git a/hosts/eldrid/users/user/programs.nix b/hosts/eldrid/users/user/programs.nix
index a13d03a..a8e621b 100644
--- a/hosts/eldrid/users/user/programs.nix
+++ b/hosts/eldrid/users/user/programs.nix
@@ -1,13 +1,17 @@
 {pkgs, ...}: {
   shell = {
     fish.enable = true;
-    nushell.enable = false;
     oh-my-posh.enable = true;
   };
 
   console.yazi.enable = true;
 
   stylix.targets.fzf.enable = false;
+  services.ssh-agent.enable = true;
+  services.pueue.enable = true;
+
+  syncthing.enable = true;
+
   programs = {
     bat.enable = true;
     btop = {
@@ -34,6 +38,7 @@
         pom = "push origin main";
       };
     };
+    jujutsu.enable = true;
     ripgrep.enable = true;
   };
 
@@ -47,20 +52,36 @@
   };
 
   home.packages = with pkgs; [
-    alejandra # nix formatter
-    flatpak # flatpak cli
-    trashy # trash cli
-    procs # ps in rust
-    ouch # archive manager in runt
+    alejandra # nix formatter in rust
+    devenv # programming deps in rust
     dust # du in rust
     fend # calc in rust
-    moar # better pager
-    tree # tree util
-    rbw # bitwarden cli in rust
+    flatpak # flatpak cli
+    jj-fzf # fuzzy finder jujutsu tui
+    just # make in rust
+    ouch # archive manager in runt
+    overskride # bluetooth gui in rust
+    pika-backup # borg gui in rust
     pinentry-qt # pinentry for rbw
+    procs # ps in rust
+    rbw # bitwarden cli in rust
+    trashy # trash cli in rust
     vial # qmk keyboard configuring app
-    waycheck # check wayland protocols
     virt-manager # libvirt gui
+    waycheck # check wayland protocols
   ];
-  systemd.user.settings.Manager.DefaultEnvironment.PAGER = "moar";
+
+  xdg.desktopEntries = {
+    uni = {
+      actions."Copy".exec = "fish -c \"~/.local/bin/uni --copy\"";
+      categories = ["Utility" "X-Launch" "Network"];
+      comment = "Select and open or copy URLs from a list.";
+      exec = "fish -c \"~/.local/bin/uni\"";
+      icon = "web-browser";
+      name = "Uni URL Handler";
+      startupNotify = true;
+      terminal = false;
+      type = "Application";
+    };
+  };
 }
diff --git a/modules/home/programs/syncthing.nix b/modules/home/programs/syncthing.nix
index e647e61..3e28d9a 100644
--- a/modules/home/programs/syncthing.nix
+++ b/modules/home/programs/syncthing.nix
@@ -22,6 +22,7 @@ in {
         devices = {
           "dunamis".id = "72VRZFX-65SZUKP-2XL2WLG-75MMKLG-PQLDEZN-G5OI5U7-RLF4OHS-LNCXEQX";
           "sarien".id = "LUVZGFV-OV6FV5E-SDROWHZ-4BR5PFB-VP5Y326-AFEP6NL-ORUMJQQ-SSYCQQO";
+          "eldrid".id = "VTSBNN6-W6UUT66-NDEQBNJ-DJJM5YE-PWU63IW-Y6CTJNN-Q3RHEQB-POBLCQH";
           "phone".id = "XBZLA7Y-YOBZHLO-MSTRAGS-6SN5MEZ-FDKR76F-DIX2BKE-FMDNUYR-TMD6UAQ";
         };
         folders = {
@@ -30,6 +31,7 @@ in {
             devices = [
               "dunamis"
               "sarien"
+              "eldrid"
               "phone"
             ];
           };
@@ -38,6 +40,7 @@ in {
             devices = [
               "dunamis"
               "sarien"
+              "eldrid"
             ];
           };
         };