WIP

nixos/hosts/Tibo-NixDesk/default.nix

@@ -78,9 +78,15 @@
 
   networking.hostName = "Tibo-NixDesk";
 
-  services.xserver.xkb = {
-    layout = "us";
-    variant = "altgr-intl";
+  services = {
+    xserver.xkb = {
+      layout = "us";
+      variant = "altgr-intl";
+    };
+
+    openvpn.servers = {
+      tryHackMeVPN = { config = '' config /root/nixos/openvpn/tryHackMeVPN-tdpeuter.conf ''; };
+    };
   };
 
   system.stateVersion = "24.05";

nixos/modules/desktop/hyprland/default.nix

@@ -1,7 +1,31 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, pkgs-unstable, system, ... }:
 
 let
   cfg = config.sisyphus.desktop.hyprland;
+
+  inherit (pkgs-unstable.hyprlandPlugins.hy3) version;
+
+  # Make hyprland package follow latest release of Hy3
+  hyprland = pkgs-unstable.hyprland.overrideAttrs (old: {
+    version = "0.52.0";
+    src = pkgs-unstable.fetchFromGitHub {
+      owner = "hyprwm";
+      repo = "Hyprland";
+      fetchSubmodules = true;
+      rev = "f56ec180d3a03a5aa978391249ff8f40f949fb73";
+      hash = "sha256-aZCTbfKkxsEinY5V7R0NYuuitKLYc8ig8T91+yDMGJ0=";
+    };
+  });
+
+  hy3 = pkgs-unstable.hyprlandPlugins.hy3.overrideAttrs (old: {
+    version = "hl0.52.0";
+    src = pkgs-unstable.fetchFromGitHub {
+      owner = "outfoxxed";
+      repo = "hy3";
+      rev = "16dae4d8f853b0d3e8434ee9941f9fc0155b8952";
+      hash = "sha256-UeMEUlQsil5DEtF/VQ//41vXJF9ff2xjoYVjhR6dqu4=";
+    };
+  });
 in {
   options.sisyphus.desktop.hyprland.enable = lib.mkEnableOption "Hyprland";
 
@@ -15,7 +39,7 @@ in {
         SCRIPT_DIR = ../../../../scripts;
       };
 
-      systemPackages = with pkgs; [
+      systemPackages = (with pkgs; [
         brightnessctl
         dunst
         libnotify
@@ -27,8 +51,6 @@ in {
         wl-mirror # Mirror an output
         wdisplays # Tool to configure displays
 
-        hyprlandPlugins.hy3 # i3/sway layout plugin
-
         swaylock
 
         glib
@@ -39,11 +61,14 @@ in {
         jq
         j4-dmenu-desktop
         rofi
+      ]) ++ [
+        hy3 # i3/sway layout plugin
       ];
     };
 
     programs.hyprland = {
       enable = true;
+      package = hyprland;
       xwayland.enable = true;
     };
 

nixos/modules/networking/networkmanager/default.nix

@@ -6,7 +6,13 @@ in {
   options.sisyphus.networking.networkmanager.enable = lib.mkEnableOption "NetworkManager";
 
   config = lib.mkIf cfg.enable {
-    networking.networkmanager.enable = true;
+    networking.networkmanager = {
+      enable = true;
+
+      plugins = with pkgs; [
+        networkmanager-openvpn
+      ];
+    };
 
     # Prevent slow boot times
     systemd.services.NetworkManager-wait-online.enable = false;