From f00ab5b5ae38216e535706d98bd8dad3cbf605cd Mon Sep 17 00:00:00 2001
From: Nettika <git@nettika.cat>
Date: Sun, 12 Oct 2025 01:01:00 -0700
Subject: [PATCH] Update apps on marauder

---
 flake.lock                 | 37 +++++++++++++++++++++++++-
 flake.nix                  |  1 +
 hosts/default.nix          |  4 +--
 hosts/marauder/default.nix | 54 +++++++++++++++++++-------------------
 4 files changed, 66 insertions(+), 30 deletions(-)

diff --git a/flake.lock b/flake.lock
index dc58554..c14689d 100755
--- a/flake.lock
+++ b/flake.lock
@@ -98,6 +98,22 @@
         "type": "github"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1758690382,
+        "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "e643668fd71b949c53f8626614b21ff71a07379d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "phps": {
       "inputs": {
         "flake-compat": "flake-compat",
@@ -124,7 +140,8 @@
       "inputs": {
         "agenix": "agenix",
         "nixpkgs": "nixpkgs",
-        "phps": "phps"
+        "phps": "phps",
+        "winboat": "winboat"
       }
     },
     "systems": {
@@ -174,6 +191,24 @@
         "repo": "flake-utils",
         "type": "github"
       }
+    },
+    "winboat": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "lastModified": 1760183562,
+        "narHash": "sha256-lauscAI61WXjLTuGiRDMUAEeTqvOTSWhRoHDaor5sfE=",
+        "owner": "TibixDev",
+        "repo": "winboat",
+        "rev": "ae60de6c2cba7a2001fef1027d5c2e06614e6904",
+        "type": "github"
+      },
+      "original": {
+        "owner": "TibixDev",
+        "repo": "winboat",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index f8c151e..19932c2 100755
--- a/flake.nix
+++ b/flake.nix
@@ -11,6 +11,7 @@
       url = "github:ryantm/agenix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    winboat.url = "github:TibixDev/winboat";
   };
 
   outputs = inputs: {
diff --git a/hosts/default.nix b/hosts/default.nix
index 2c19793..02b0866 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -1,4 +1,4 @@
-{ self, nixpkgs, phps, agenix, ... }:
+{ self, nixpkgs, phps, agenix, winboat }:
 let
   baseSpecialArgs = {
     inherit (self) nixosModules;
@@ -11,7 +11,7 @@ in {
   marauder = nixosSystem {
     system = "x86_64-linux";
     modules = [ ./marauder ];
-    specialArgs = { inherit phps; };
+    specialArgs = { inherit phps winboat; };
   };
   astral = nixosSystem {
     system = "x86_64-linux";
diff --git a/hosts/marauder/default.nix b/hosts/marauder/default.nix
index 944c470..cf47dd2 100755
--- a/hosts/marauder/default.nix
+++ b/hosts/marauder/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, nixosModules, phps, agenix, ... }:
+{ pkgs, nixosModules, phps, agenix, winboat, ... }:
 let
   fortune = pkgs.writeShellScript "cgi" ''
     echo "Content-type: text/html"
@@ -102,69 +102,69 @@ in {
   environment.systemPackages = with pkgs; [
     # Chat clients
     discord
-    slack
     element-desktop
-    telegram-desktop
     signal-desktop
+    slack
+    telegram-desktop
 
     # Browsers
-    firefox
     filezilla
+    firefox
 
     # Creative
-    inkscape
+    bambu-studio
+    blender
     gimp
+    inkscape
     krita
     openscad-unstable
-    bambu-studio
     orca-slicer
 
     # Multimedia
-    vlc
-    ffmpeg
     ffcheck
-    aonsoku
+    ffmpeg
+    vlc
 
-    # Code Editors
+    # Editors
+    abiword
+    obsidian
     vscode
-    arduino-ide
 
     # Dev Tools
+    fossil
     nixd
     nixfmt-classic
     nixpkgs-fmt
     pyenv
     rustup
-    electron
-    uv
-    ruff
-    fossil
-    just
-    dioxus-cli
 
     # Languages
-    gcc
     kotlin
     nodejs
     php
 
     # Command line
+    agenix.packages.x86_64-linux.default
+    backblaze-b2
+    dig
     htop
     jq
-    backblaze-b2
+    just
+    unzip
+    zip
 
-    # Misc
-    obsidian
-    intiface-central
-    prismlauncher
-    blender
+    # Network
     mullvad-vpn
     qbittorrent
-    system-config-printer
+
+    # Misc
+    gcc
+    intiface-central
     openssl
     pkg-config
-    agenix.packages.x86_64-linux.default
-    abiword
+    prismlauncher
+    system-config-printer
+    winboat.packages.x86_64-linux.winboat
   ];
 
   programs.git = {