From 6bdba199c19426d3d1b16efff8afec723144a13b Mon Sep 17 00:00:00 2001
From: Chris Toph <toph@ryot.foo>
Date: Wed, 12 Mar 2025 13:36:59 -0400
Subject: [PATCH] Remove JetBrains Toolbox from development packages, add
 (non-functional) Fleet configuration, and introduce Vial for keyboard setup

---
 .../common/optional/development/default.nix   |  1 -
 .../common/optional/development/fleet.nix     | 37 +++++++++++++++++++
 .../common/optional/development/vscode.nix    | 10 -----
 home/toph/rune/default.nix                    | 35 ++++++++++--------
 hosts/common/optional/vial.nix                |  7 ++++
 hosts/nixos/rune/default.nix                  |  2 +
 6 files changed, 66 insertions(+), 26 deletions(-)
 create mode 100644 home/toph/common/optional/development/fleet.nix
 delete mode 100644 home/toph/common/optional/development/vscode.nix
 create mode 100644 hosts/common/optional/vial.nix

diff --git a/home/toph/common/optional/development/default.nix b/home/toph/common/optional/development/default.nix
index e644920..97465cf 100644
--- a/home/toph/common/optional/development/default.nix
+++ b/home/toph/common/optional/development/default.nix
@@ -18,7 +18,6 @@
         logisim-evolution
         mcaselector
         prettierd
-        jetbrains-toolbox
         vscode-fhs
 
         # nix
diff --git a/home/toph/common/optional/development/fleet.nix b/home/toph/common/optional/development/fleet.nix
new file mode 100644
index 0000000..8732bc2
--- /dev/null
+++ b/home/toph/common/optional/development/fleet.nix
@@ -0,0 +1,37 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+
+# Same idea as package itself, not working might remove
+
+let
+  fleet = pkgs.callPackage ../../../../../pkgs/common/fleet/package.nix { };
+in
+{
+  home.packages = [
+    fleet
+  ];
+
+  xdg.desktopEntries = {
+    fleet = {
+      name = "Fleet";
+      comment = "Jetbrains Fleet";
+      exec = "fleet %u";
+      icon = "${config.home.homeDirectory}/.local/share/JetBrains/Toolbox/apps/fleet/lib/Fleet.png";
+      type = "Application";
+      terminal = false;
+      mimeType = [
+        "text/plain"
+        "inode/directory"
+        "x-scheme-handler/fleet"
+      ];
+      categories = [
+        "Development"
+        "IDE"
+      ];
+    };
+  };
+}
diff --git a/home/toph/common/optional/development/vscode.nix b/home/toph/common/optional/development/vscode.nix
deleted file mode 100644
index f1e201d..0000000
--- a/home/toph/common/optional/development/vscode.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ pkgs, ... }:
-{
-  programs.vscode = {
-    enable = true;
-    # extensions = with pkgs.vscode-extensions; [
-    #   # bbenoist.Nix
-    #   # brettm12345.nixfmt-vscode
-    # ];
-  };
-}
diff --git a/home/toph/rune/default.nix b/home/toph/rune/default.nix
index 09cc53a..d289a26 100644
--- a/home/toph/rune/default.nix
+++ b/home/toph/rune/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, config, ... }:
 {
   imports = [
     ## Required Configs ##
@@ -28,6 +28,7 @@
       bitwarden-desktop
       inspector
       wezterm
+      vial # KB setup
 
       ## Productivity ##
       gimp
@@ -35,24 +36,28 @@
       ;
   };
 
-  dconf.settings = {
-    "org/virt-manager/virt-manager/connections" = {
-      autoconnect = [
-        "qemu:///session"
-        "qemu:///system"
-      ];
-      uris = [
-        "qemu:///session"
-        "qemu:///system"
-      ];
-    };
-  };
-
   xdg.desktopEntries = {
+    # fleet = {
+    #   name = "Fleet";
+    #   comment = "Jetbrains Fleet";
+    #   exec = "fleet %u";
+    #   icon = "${config.home.homeDirectory}/.local/share/JetBrains/Toolbox/apps/fleet/lib/Fleet.png";
+    #   type = "Application";
+    #   terminal = false;
+    #   mimeType = [
+    #     "text/plain"
+    #     "inode/directory"
+    #   ];
+    #   categories = [
+    #     "Development"
+    #     "IDE"
+    #   ];
+    # };
+
     win11 = {
       name = "Windows 11";
       comment = "Windows 11 VM";
-      exec = "virt-manager --connect qemu:///system --show-domain-console win11-sys";
+      exec = "virt-manager --connect qemu:///session --show-domain-console win11";
       icon = "windows95";
       type = "Application";
       terminal = false;
diff --git a/hosts/common/optional/vial.nix b/hosts/common/optional/vial.nix
new file mode 100644
index 0000000..3b45b3b
--- /dev/null
+++ b/hosts/common/optional/vial.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+{
+  # allows vial to identify the keyboard
+  services.udev.packages = with pkgs; [
+    via
+  ];
+}
diff --git a/hosts/nixos/rune/default.nix b/hosts/nixos/rune/default.nix
index a6dac10..18221dc 100644
--- a/hosts/nixos/rune/default.nix
+++ b/hosts/nixos/rune/default.nix
@@ -36,6 +36,7 @@ in
       "hosts/common/optional/libvirt.nix" # vm tools
       "hosts/common/optional/nvtop.nix" # GPU monitor (not available in home-manager)
       "hosts/common/optional/plymouth.nix" # fancy boot screen
+      "hosts/common/optional/vial.nix" # KB setup
 
       ## Misc Inputs ##
 
@@ -61,6 +62,7 @@ in
   };
 
   ## System-wide packages ##
+  programs.nix-ld.enable = true;
   environment.systemPackages = with pkgs; [
     asdf-vm
     openssh