From 8064ba74ccd66f9276f7bc2cc39f393c972ffce3 Mon Sep 17 00:00:00 2001
From: Rouven Seifert <rouven@rfive.de>
Date: Mon, 24 Apr 2023 15:15:01 +0200
Subject: [PATCH] enable java lsp

---
 flake.lock                             | 55 +++++++++++++++++++++-----
 flake.nix                              |  4 ++
 hosts/thinkpad/default.nix             |  2 +-
 users/rouven/modules/helix/default.nix |  3 +-
 users/rouven/modules/tmux/default.nix  |  2 +-
 5 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/flake.lock b/flake.lock
index d333d77..eb0eb6b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -16,6 +16,21 @@
         "type": "github"
       }
     },
+    "flake-utils": {
+      "locked": {
+        "lastModified": 1656928814,
+        "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -23,11 +38,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1682273416,
-        "narHash": "sha256-YvRc5TOyf92Fcvt6cYfsqxfjqalAUME3Klv4IbdhkBE=",
+        "lastModified": 1682333170,
+        "narHash": "sha256-yrJIk5/ONaX0QVQoq67DzNPW7epOuiwAM9FY9xFrE8k=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "a5a294a622a7d3a837aaa145334e4d813c1bc5b1",
+        "rev": "6f9781b1b0cf3fedbe9d2d0a785aeec4d6085c10",
         "type": "github"
       },
       "original": {
@@ -121,6 +136,27 @@
         "type": "github"
       }
     },
+    "language-servers": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1673891911,
+        "narHash": "sha256-ayBHJQpJItWrUsTy/uFDFRkDuaGTkGn4Y7Xka35rFY0=",
+        "ref": "refs/heads/master",
+        "rev": "be9c9b24c0fce29baaaf6b0f5cb4dd3cacad83ad",
+        "revCount": 9,
+        "type": "git",
+        "url": "https://git.sr.ht/~bwolf/language-servers.nix"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.sr.ht/~bwolf/language-servers.nix"
+      }
+    },
     "nix-colors": {
       "inputs": {
         "base16-schemes": "base16-schemes",
@@ -224,11 +260,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1682181988,
-        "narHash": "sha256-CYWhlNi16cjGzMby9h57gpYE59quBcsHPXiFgX4Sw5k=",
+        "lastModified": 1682268651,
+        "narHash": "sha256-2eZriMhnD24Pmb8ideZWZDiXaAVe6LzJrHQiNPck+Lk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "6c43a3495a11e261e5f41e5d7eda2d71dae1b2fe",
+        "rev": "e78d25df6f1036b3fa76750ed4603dd9d5fe90fc",
         "type": "github"
       },
       "original": {
@@ -279,6 +315,7 @@
         "home-manager": "home-manager",
         "hyprland": "hyprland",
         "hyprpaper": "hyprpaper",
+        "language-servers": "language-servers",
         "nix-colors": "nix-colors",
         "nix-index-database": "nix-index-database",
         "nixos-hardware": "nixos-hardware",
@@ -297,11 +334,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1682218555,
-        "narHash": "sha256-kojMklCNBnPe8KtRvJvBtFGU/gPAqRKYpZEqyehHfn4=",
+        "lastModified": 1682338428,
+        "narHash": "sha256-T7AL/Us6ecxowjMAlO77GETTQO2SO+1XX2+Y/OSfHk8=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "8a95e6f8cd160a05c2b560e66f702432a53b59ac",
+        "rev": "7c8e9727a2ecf9994d4a63d577ad5327e933b6a4",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 7e3276b..7ed5c99 100644
--- a/flake.nix
+++ b/flake.nix
@@ -46,6 +46,9 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    language-servers.url = "git+https://git.sr.ht/~bwolf/language-servers.nix";
+    language-servers.inputs.nixpkgs.follows = "nixpkgs";
+
     purge = {
       url = "github:therealr5/purge";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -66,6 +69,7 @@
     , nixos-hardware
     , purge
     , trucksimulatorbot-images
+    , language-servers
     , ...
     }@attrs: {
       formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixpkgs-fmt;
diff --git a/hosts/thinkpad/default.nix b/hosts/thinkpad/default.nix
index 7d0d221..ad17370 100755
--- a/hosts/thinkpad/default.nix
+++ b/hosts/thinkpad/default.nix
@@ -137,7 +137,7 @@
     enable = true;
     settings = {
       START_CHARGE_THRESH_BAT0 = 70;
-      STOP_CHARGE_THRESH_BAT0 = 85;
+      STOP_CHARGE_THRESH_BAT0 = 90;
     };
   };
 
diff --git a/users/rouven/modules/helix/default.nix b/users/rouven/modules/helix/default.nix
index 71cd22b..063191e 100644
--- a/users/rouven/modules/helix/default.nix
+++ b/users/rouven/modules/helix/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, language-servers, ... }:
 {
   home.packages = with pkgs; [
     lldb
@@ -20,6 +20,7 @@
       pylint
     ]))
     clang-tools
+    language-servers.packages.x86_64-linux.jdt-language-server
   ];
   programs.helix = {
     enable = true;
diff --git a/users/rouven/modules/tmux/default.nix b/users/rouven/modules/tmux/default.nix
index 54a5d65..4f22071 100644
--- a/users/rouven/modules/tmux/default.nix
+++ b/users/rouven/modules/tmux/default.nix
@@ -14,7 +14,7 @@
       {
         plugin = dracula;
         extraConfig = ''
-          set -g @dracula-plugins "time"
+          set -g @dracula-plugins "git time"
           set -g @dracula-show-left-icon session
           set -g @dracula-show-powerline true
         '';