From d6ef606632cbdf45a49a665b3232b9112a42afb9 Mon Sep 17 00:00:00 2001 From: Nettika Date: Wed, 15 Oct 2025 22:05:17 -0700 Subject: [PATCH] Remove winboat from marauder --- flake.lock | 37 +------------------------------------ flake.nix | 1 - hosts/default.nix | 4 ++-- hosts/marauder/default.nix | 3 +-- 4 files changed, 4 insertions(+), 41 deletions(-) diff --git a/flake.lock b/flake.lock index c14689d..dc58554 100755 --- a/flake.lock +++ b/flake.lock @@ -98,22 +98,6 @@ "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", @@ -140,8 +124,7 @@ "inputs": { "agenix": "agenix", "nixpkgs": "nixpkgs", - "phps": "phps", - "winboat": "winboat" + "phps": "phps" } }, "systems": { @@ -191,24 +174,6 @@ "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 19932c2..f8c151e 100755 --- a/flake.nix +++ b/flake.nix @@ -11,7 +11,6 @@ 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 02b0866..1b52d15 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -1,4 +1,4 @@ -{ self, nixpkgs, phps, agenix, winboat }: +{ self, nixpkgs, phps, agenix }: let baseSpecialArgs = { inherit (self) nixosModules; @@ -11,7 +11,7 @@ in { marauder = nixosSystem { system = "x86_64-linux"; modules = [ ./marauder ]; - specialArgs = { inherit phps winboat; }; + specialArgs = { inherit phps; }; }; astral = nixosSystem { system = "x86_64-linux"; diff --git a/hosts/marauder/default.nix b/hosts/marauder/default.nix index cf47dd2..630416e 100755 --- a/hosts/marauder/default.nix +++ b/hosts/marauder/default.nix @@ -1,4 +1,4 @@ -{ pkgs, nixosModules, phps, agenix, winboat, ... }: +{ pkgs, nixosModules, phps, agenix, ... }: let fortune = pkgs.writeShellScript "cgi" '' echo "Content-type: text/html" @@ -164,7 +164,6 @@ in { pkg-config prismlauncher system-config-printer - winboat.packages.x86_64-linux.winboat ]; programs.git = {