From 63f3c1f2d18c9c0babf10bd672c248444d26a415 Mon Sep 17 00:00:00 2001
From: Alexander <alexander0derevianko@gmail.com>
Date: Fri, 8 Aug 2025 01:35:01 +0200
Subject: [PATCH] Fix boot, add java+node, fix backlight

---
 hm-modules/development/default.nix            | 36 +++++++++++++++++--
 hm-modules/development/jetbrains/default.nix  | 16 +++++++++
 machines/fujin/hardware-configuration.nix     |  6 +++-
 machines/fujin/main/default.nix               | 12 ++++++-
 .../dotfiles/.config/Code/User/settings.json  |  4 ++-
 machines/fujin/main/home.nix                  |  5 ++-
 modules/window-manager/hypr/default.nix       |  1 +
 7 files changed, 74 insertions(+), 6 deletions(-)
 create mode 100644 hm-modules/development/jetbrains/default.nix

diff --git a/hm-modules/development/default.nix b/hm-modules/development/default.nix
index 045cf71..2b5f2d6 100644
--- a/hm-modules/development/default.nix
+++ b/hm-modules/development/default.nix
@@ -1,7 +1,39 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, username, ... }:
 
-{
+let
+  aliases = {
+    java23 = "export JAVA_HOME='/home/${username}/jdk/openjdk23' && mvn -v";
+    java21 = "export JAVA_HOME='/home/${username}/jdk/openjdk21' && mvn -v";
+    java17 = "export JAVA_HOME='/home/${username}/jdk/openjdk17' && mvn -v";
+    java11 = "export JAVA_HOME='/home/${username}/jdk/openjdk11' && mvn -v";
+  };
+in {
   imports = [
     ./vscode
+    ./jetbrains
   ];
+
+  config = {
+    home.packages = with pkgs; [
+      maven
+      nodejs_22
+    ];
+
+    home.file."jdk/openjdk11".source = pkgs.jdk11;
+    home.file."jdk/openjdk17".source = pkgs.jdk17;
+    home.file."jdk/openjdk21".source = pkgs.jdk21;
+    home.file."jdk/openjdk23".source = pkgs.jdk23;
+    home.file."nodejs/nodejs_22".source = pkgs.nodejs_22;
+    home.file."python/python3".source = pkgs.python3;
+
+    dov.shell = {
+      zsh = {
+        shellAliases = aliases;
+      };
+
+      nu = {
+        shellAliases = aliases;
+      };
+    };
+  };
 }
diff --git a/hm-modules/development/jetbrains/default.nix b/hm-modules/development/jetbrains/default.nix
new file mode 100644
index 0000000..2824feb
--- /dev/null
+++ b/hm-modules/development/jetbrains/default.nix
@@ -0,0 +1,16 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.dov.development.jetbrains;
+in {
+  options.dov.development.jetbrains = {
+    toolbox.enable = mkEnableOption "toolbox config";
+  };
+
+  config = {
+    home.packages = [] ++ optionals cfg.toolbox.enable [ pkgs.jetbrains-toolbox ];
+  };
+
+}
diff --git a/machines/fujin/hardware-configuration.nix b/machines/fujin/hardware-configuration.nix
index 8679628..e6206da 100644
--- a/machines/fujin/hardware-configuration.nix
+++ b/machines/fujin/hardware-configuration.nix
@@ -4,7 +4,11 @@
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
   boot = {
-    loader.systemd-boot.enable = true;
+    loader = {
+      systemd-boot.enable = true;
+      efi.canTouchEfiVariables = true;
+    };
+
     initrd = {
       availableKernelModules =
         [ "nvme" "xhci_pci" "usb_storage" "sd_mod" "sdhci_pci" ];
diff --git a/machines/fujin/main/default.nix b/machines/fujin/main/default.nix
index 3c93c8e..ef13a34 100644
--- a/machines/fujin/main/default.nix
+++ b/machines/fujin/main/default.nix
@@ -35,7 +35,17 @@
     };
   };
 
-  networking.networkmanager.enable = true;
+  networking = {
+    nameservers = [
+      "192.168.1.2" # PyHole
+      "192.168.1.1" # Router
+      "1.1.1.1"
+    ];
+    dhcpcd.extraConfig = ''
+      nohook resolv.conf
+    '';
+    networkmanager.enable = true;
+  };
 
   ###
   # Thunar configurations
diff --git a/machines/fujin/main/dotfiles/.config/Code/User/settings.json b/machines/fujin/main/dotfiles/.config/Code/User/settings.json
index 313f0e7..46633e0 100644
--- a/machines/fujin/main/dotfiles/.config/Code/User/settings.json
+++ b/machines/fujin/main/dotfiles/.config/Code/User/settings.json
@@ -15,5 +15,7 @@
   "screencastMode.fontSize": 64.0,
   "terminal.integrated.fontSize": 16.0,
   "workbench.colorTheme": "Stylix",
-  "redhat.telemetry.enabled": true
+  "redhat.telemetry.enabled": true,
+  "database-client.autoSync": true,
+  "git.confirmSync": false
 }
diff --git a/machines/fujin/main/home.nix b/machines/fujin/main/home.nix
index f5a5531..60f123b 100644
--- a/machines/fujin/main/home.nix
+++ b/machines/fujin/main/home.nix
@@ -57,7 +57,10 @@
       };
     };
 
-    development.vscode.enable = true;
+    development = {
+      vscode.enable = true;
+      jetbrains.toolbox.enable = true;
+    };
   };
 
   programs = {
diff --git a/modules/window-manager/hypr/default.nix b/modules/window-manager/hypr/default.nix
index fcbd369..a629ed4 100644
--- a/modules/window-manager/hypr/default.nix
+++ b/modules/window-manager/hypr/default.nix
@@ -54,6 +54,7 @@ in {
         wayland-protocols
         playerctl
         alsa-utils
+        brightnessctl
 
         #hyprland extensions
         hyprlock