From f7bcd89aa2457858ba7d6b8c590afdb5f10b4922 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leon=20Schwarz=C3=A4ugl?= Date: Fri, 21 Mar 2025 19:42:16 +0100 Subject: [PATCH] feat: add vbc-nix input --- SwarselSystems.org | 15 ++++++++ checks/default.nix | 1 + flake.lock | 46 +++++++++++++++++++++--- flake.nix | 4 +++ overlays/default.nix | 1 + profiles/home/common/custom-packages.nix | 2 ++ profiles/home/common/desktop.nix | 8 +++++ 7 files changed, 73 insertions(+), 4 deletions(-) diff --git a/SwarselSystems.org b/SwarselSystems.org index 2ac4b80..92b4d9b 100644 --- a/SwarselSystems.org +++ b/SwarselSystems.org @@ -296,6 +296,10 @@ When setting this option normally, the password would normally be written world- flake = false; inputs = { }; }; + vbc-nix = { + url = "git+ssh://git@github.com/vbc-it/vbc-nix.git?ref=main"; + inputs.nixpkgs.follows = "nixpkgs"; + }; nix-topology.url = "github:oddlama/nix-topology"; #+end_src ** let @@ -3815,6 +3819,7 @@ When adding a new entry here, do not forget to add it in the default output of t // (modifications final prev) // (nixpkgs-stable final prev) // (zjstatus final prev) + // (inputs.vbc-nix.overlays.default final prev) // (inputs.nur.overlays.default final prev) // (inputs.emacs-overlay.overlay final prev) // (inputs.nix-topology.overlays.default final prev) @@ -8755,6 +8760,8 @@ This is just a separate container for derivations defined in [[#h:64a5cc16-6b16- swarsel-bootstrap swarsel-displaypower swarselzellij + + rustdesk-vbc ]; } #+end_src @@ -8890,6 +8897,14 @@ TODO: Non-NixOS machines (=sp3) should not use these by default, but instead the categories = [ "Application" ]; }; + rustdesk-vbc = { + name = "Rustdesk VBC"; + genericName = "rustdesk-vbc"; + exec = "rustdesk-vbc"; + terminal = false; + categories = [ "Application" ]; + }; + anki = { name = "Anki Flashcards"; genericName = "Anki"; diff --git a/checks/default.nix b/checks/default.nix index daf6bad..4830423 100644 --- a/checks/default.nix +++ b/checks/default.nix @@ -3,6 +3,7 @@ pre-commit-check = inputs.pre-commit-hooks.lib.${system}.run { src = "${self}"; hooks = { + check-added-large-files.enable = true; check-case-conflicts.enable = true; check-executables-have-shebangs.enable = true; check-shebang-scripts-are-executable.enable = false; diff --git a/flake.lock b/flake.lock index 36978f3..4548294 100644 --- a/flake.lock +++ b/flake.lock @@ -406,7 +406,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1731533236, @@ -823,10 +823,10 @@ "nix-secrets": { "flake": false, "locked": { - "lastModified": 1734448649, - "narHash": "sha256-rSopBWNyQpUj9FQZRhEerBhLt8jQpgVL+VSzcUElwpo=", + "lastModified": 1742580675, + "narHash": "sha256-f96bJitJyayT7gDDNJu6AAGYvRkFXMqAaoRdcHLHyAM=", "ref": "main", - "rev": "46da385a1dee7a6f640559caf16147a882dc2465", + "rev": "441b5342995cabd6ef65fa4bffef973cab0ffdce", "shallow": true, "type": "git", "url": "ssh://git@github.com/Swarsel/nix-secrets.git" @@ -1381,6 +1381,7 @@ "sops-nix": "sops-nix", "stylix": "stylix", "systems": "systems_3", + "vbc-nix": "vbc-nix", "zjstatus": "zjstatus" } }, @@ -1541,6 +1542,21 @@ } }, "systems_4": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_5": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1680,6 +1696,28 @@ "type": "github" } }, + "vbc-nix": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems_4" + }, + "locked": { + "lastModified": 1742477270, + "narHash": "sha256-u78SeVemHqEkN6J+PieL1Kymu+n7LWiTPrUXNd+uePA=", + "ref": "main", + "rev": "0525ad64e2729077ed2cf313d2022e8b8c51153f", + "revCount": 2, + "type": "git", + "url": "ssh://git@github.com/vbc-it/vbc-nix.git" + }, + "original": { + "ref": "main", + "type": "git", + "url": "ssh://git@github.com/vbc-it/vbc-nix.git" + } + }, "zjstatus": { "inputs": { "crane": "crane_2", diff --git a/flake.nix b/flake.nix index 5b0deef..0ebe7b8 100644 --- a/flake.nix +++ b/flake.nix @@ -75,6 +75,10 @@ flake = false; inputs = { }; }; + vbc-nix = { + url = "git+ssh://git@github.com/vbc-it/vbc-nix.git?ref=main"; + inputs.nixpkgs.follows = "nixpkgs"; + }; nix-topology.url = "github:oddlama/nix-topology"; }; outputs = diff --git a/overlays/default.nix b/overlays/default.nix index ab7a586..f86d025 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -54,6 +54,7 @@ in // (modifications final prev) // (nixpkgs-stable final prev) // (zjstatus final prev) + // (inputs.vbc-nix.overlays.default final prev) // (inputs.nur.overlays.default final prev) // (inputs.emacs-overlay.overlay final prev) // (inputs.nix-topology.overlays.default final prev) diff --git a/profiles/home/common/custom-packages.nix b/profiles/home/common/custom-packages.nix index bdadabd..b413b0e 100644 --- a/profiles/home/common/custom-packages.nix +++ b/profiles/home/common/custom-packages.nix @@ -26,5 +26,7 @@ swarsel-bootstrap swarsel-displaypower swarselzellij + + rustdesk-vbc ]; } diff --git a/profiles/home/common/desktop.nix b/profiles/home/common/desktop.nix index a51c74f..4af7039 100644 --- a/profiles/home/common/desktop.nix +++ b/profiles/home/common/desktop.nix @@ -10,6 +10,14 @@ _: categories = [ "Application" ]; }; + rustdesk-vbc = { + name = "Rustdesk VBC"; + genericName = "rustdesk-vbc"; + exec = "rustdesk-vbc"; + terminal = false; + categories = [ "Application" ]; + }; + anki = { name = "Anki Flashcards"; genericName = "Anki";