From 2306935b0d563ab3c668ca66d82c550d5e5ac85a Mon Sep 17 00:00:00 2001
From: Zynh Ludwig <Zynh0722@gmail.com>
Date: Tue, 11 Mar 2025 18:30:00 -0700
Subject: [PATCH] llynx: frc-nix
---
builders.nix | 2 ++
flake.lock | 79 +++++++++++++++++++++++++++++++++++++++++++-
flake.nix | 2 ++
hosts/llynx/home.nix | 16 +++++++++
4 files changed, 98 insertions(+), 1 deletion(-)
diff --git a/builders.nix b/builders.nix
index 23186ff..5a81c99 100644
--- a/builders.nix
+++ b/builders.nix
@@ -12,6 +12,8 @@ let
inputs.zdwl.overlays.default
+ inputs.frc-nix.overlays.default
+
(final: prev: ({
star-citizen = inputs.nix-gaming.packages.${prev.system}.star-citizen;
}))
diff --git a/flake.lock b/flake.lock
index a3e4290..849a86b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -278,6 +278,24 @@
"inputs": {
"systems": "systems_2"
},
+ "locked": {
+ "lastModified": 1731533236,
+ "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+ "type": "github"
+ },
+ "original": {
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "type": "github"
+ }
+ },
+ "flake-utils_2": {
+ "inputs": {
+ "systems": "systems_3"
+ },
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
@@ -307,6 +325,28 @@
"type": "github"
}
},
+ "frc-nix": {
+ "inputs": {
+ "flake-utils": "flake-utils",
+ "nix-github-actions": "nix-github-actions_2",
+ "nixpkgs": [
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1741562597,
+ "narHash": "sha256-62+9CQz2aitdzgCuVTA7EUutRlPZV3XPhpEc+/7N5lA=",
+ "owner": "frc4451",
+ "repo": "frc-nix",
+ "rev": "5ce88da5ca15cbce6b11cb7e28ebeea2500356bb",
+ "type": "github"
+ },
+ "original": {
+ "owner": "frc4451",
+ "repo": "frc-nix",
+ "type": "github"
+ }
+ },
"git-hooks": {
"inputs": {
"flake-compat": "flake-compat_3",
@@ -453,7 +493,7 @@
},
"lix-module": {
"inputs": {
- "flake-utils": "flake-utils",
+ "flake-utils": "flake-utils_2",
"flakey-profile": "flakey-profile",
"lix": "lix",
"nixpkgs": [
@@ -654,6 +694,27 @@
"type": "github"
}
},
+ "nix-github-actions_2": {
+ "inputs": {
+ "nixpkgs": [
+ "frc-nix",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1731952509,
+ "narHash": "sha256-p4gB3Rhw8R6Ak4eMl8pqjCPOLCZRqaehZxdZ/mbFClM=",
+ "owner": "nix-community",
+ "repo": "nix-github-actions",
+ "rev": "7b5f051df789b6b20d259924d349a9ba3319b226",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-community",
+ "repo": "nix-github-actions",
+ "type": "github"
+ }
+ },
"nixos-apple-silicon": {
"inputs": {
"flake-compat": "flake-compat_4",
@@ -800,6 +861,7 @@
"deploy-rs": "deploy-rs",
"dunst-theme": "dunst-theme",
"fish_theme": "fish_theme",
+ "frc-nix": "frc-nix",
"home-manager": "home-manager_2",
"lix-module": "lix-module",
"neovim-overlay": "neovim-overlay",
@@ -899,6 +961,21 @@
"type": "github"
}
},
+ "systems_3": {
+ "locked": {
+ "lastModified": 1681028828,
+ "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+ "owner": "nix-systems",
+ "repo": "default",
+ "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-systems",
+ "repo": "default",
+ "type": "github"
+ }
+ },
"treefmt-nix": {
"inputs": {
"nixpkgs": [
diff --git a/flake.nix b/flake.nix
index ec20ae3..67e1881 100644
--- a/flake.nix
+++ b/flake.nix
@@ -16,6 +16,8 @@
nix-darwin = { url = "github:LnL7/nix-darwin"; inputs.nixpkgs.follows = "nixpkgs"; };
+ frc-nix = { url = "github:frc4451/frc-nix"; inputs.nixpkgs.follows = "nixpkgs"; };
+
repo-clone.url = "git+https://git.zynh.me/Zynh0722/repo-clone";
zdwm = { url = "git+https://git.zynh.me/Zynh0722/dwm?ref=preanybar-systray"; flake = false; };
zdwl = { url = "git+https://git.zynh.me/Zynh0722/dwl?ref=0.7"; inputs.nixpkgs.follows = "nixpkgs"; };
diff --git a/hosts/llynx/home.nix b/hosts/llynx/home.nix
index 19973ce..5fac7ea 100644
--- a/hosts/llynx/home.nix
+++ b/hosts/llynx/home.nix
@@ -48,6 +48,22 @@
duf
pcmanfm
jq
+
+ jdt-language-server
+
+ openjdk17-bootstrap
+ (vscode-with-extensions.override {
+ vscodeExtensions = with vscode-extensions; [
+ wpilibsuite.vscode-wpilib
+ vscjava.vscode-java-debug
+ vscjava.vscode-java-dependency
+ redhat.java
+
+ vscodevim.vim
+ mvllow.rose-pine
+ eamodio.gitlens
+ ];
+ })
];
programs.nix-index.enable = true;