Merge remote-tracking branch 'forge/main'

crywl module

.gitignore

@@ -1,6 +1,5 @@
 ISSUES/
 secrets/
-nib/
 
 result
 rebuild*.log

homes/me/default.nix

@@ -24,7 +24,6 @@
     #../modules/wm/hypr/hypridle.nix
     ../modules/wm/hypr/hyprlock.nix
     ../modules/kanshi.nix
-    # ../modules/ags
     ../modules/mako.nix
   ];
 

hosts/hyrule/default.nix

@@ -7,7 +7,7 @@
 }: let
   home-manager = builtins.fetchTarball {
     url = "https://github.com/nix-community/home-manager/archive/release-25.05.tar.gz";
-    sha256 = "0d41gr0c89a4y4lllzdgmbm54h9kn9fjnmavwpgw0w9xwqwnzpax";
+    sha256 = "07pk5m6mxi666dclaxdwf7xrinifv01vvgxn49bjr8rsbh31syaq";
   };
 in {
   imports = [
@@ -87,6 +87,56 @@ in {
         # 8222 (INTERNAL) vaultwarden
         45000 # minecaft server
       ];
+      allowedUDPPorts = [
+        54231 # Wireguard
+      ];
+    };
+
+    # wireguard.interfaces = {
+    #   wg0 = {
+    #     ips = ["10.10.10.4/24"]; # my IP and the subnet (keyword: "AND")
+    #     listenPort = 54231;
+    #
+    #     privateKeyFile = "/root/wg_agrivpn_hyrule";
+    #
+    #     peers = [
+    #       {
+    #         # peer's public key
+    #         publicKey = "iZ4aqYjbT8O8tfUHEuV+yWLtdoQbdBb6Nt0M4usMSiY=";
+    #
+    #         # choose which traffic to forward
+    #         allowedIPs = ["10.0.51.0/24" "10.10.10.0/24"];
+    #
+    #         # TODO: route to endpoint not automatically configured https://wiki.archlinux.org/index.php/WireGuard#Loop_routing https://discourse.nixos.org/t/solved-minimal-firewall-setup-for-wireguard-client/7577
+    #         endpoint = "150.242.34.33:54231";
+    #
+    #         # send keepalives every 25 seconds. Important to keep NAT tables alive.
+    #         persistentKeepalive = 25;
+    #       }
+    #     ];
+    #   };
+    # };
+    wg-quick.interfaces = {
+      wg0 = {
+        address = [
+          "10.10.10.4/24"
+        ];
+        dns = ["10.10.10.1"];
+        privateKeyFile = "/root/wg_agrivpn_hyrule";
+        peers = [
+          {
+            # peer's public key
+            publicKey = "iZ4aqYjbT8O8tfUHEuV+yWLtdoQbdBb6Nt0M4usMSiY=";
+
+            # choose which traffic to forward
+            allowedIPs = [
+              "10.0.51.0/24"
+              "10.10.10.0/24"
+            ];
+            endpoint = "150.242.34.33:54231";
+          }
+        ];
+      };
     };
   };
 
@@ -451,6 +501,7 @@ in {
   };
 
   environment.systemPackages = with pkgs; [
+    eza
     git
     vim
     helix

hosts/lolcathost/default.nix

@@ -233,7 +233,7 @@ in {
   home-manager = {
     users.me = import ../../homes/me;
     extraSpecialArgs = {inherit inputs pkgs pkgs-unstable;};
-    # sharedModules = [ ];
+    sharedModules = [];
   };
 
   # ---- ENVIRONMENT VARIABLES ----

hosts/modules/apps/rider.nix

@@ -1,30 +1,19 @@
 {
   pkgs,
   pkgs-unstable,
+  dotnetVersions ? [8 9 10],
   ...
 }: {
+  imports = [
+    ../langs/dotnet.nix
+  ];
+
   environment.systemPackages = with pkgs; [
     # Ensure latest stable Rider version (not necessarily stable on NixOS)
     pkgs-unstable.jetbrains.rider
 
     # NOTE: Blazor requires a Chromium-based browser
     chromium
-    # arc-browser
-
-    # .NET
-    dotnetCorePackages.dotnet_9.sdk
-    dotnetCorePackages.dotnet_9.aspnetcore
-    dotnetCorePackages.dotnet_9.runtime
-
-    # Mono
-    mono
-    # NOTE: nixpkgs-unstable uses .NET8 SDK
-    # WARNING: nixpkgs-25.05 uses .NET6 SDK (now marked insecure)
-    pkgs-unstable.msbuild
-
-    # .NET Framework Tools/Services
-    omnisharp-roslyn
-    netcoredbg
   ];
 
   programs.nix-ld = {

hosts/modules/langs/dotnet.nix

@@ -0,0 +1,61 @@
+{
+  lib,
+  pkgs,
+  pkgs-unstable,
+  ...
+}: let
+  dotnetVersions = [8 9 10];
+
+  dotnetCombined =
+    pkgs.dotnetCorePackages.combinePackages
+    (builtins.concatMap
+      (v: let
+        # dotnet = pkgs.dotnetCorePackages."dotnet_${builtins.toString x}";
+      in [
+        # dotnet.sdk
+
+        # the runtime+aspnetcore packaged with the sdk
+        pkgs.dotnetCorePackages."sdk_${builtins.toString v}_0"
+      ])
+      dotnetVersions);
+
+  # Custom packaged tools
+  dotnetTools = with lib; {
+    uno-check = with pkgs.dotnetCorePackages;
+      buildDotnetGlobalTool {
+        pname = "Uno.Check";
+        version = "1.32.17";
+
+        nugetHash = "sha256-BfTVF5uHu9/nyLXqdDEOHCxq6BVQWhsnDBbARzdLDAE=";
+
+        executables = "uno-check";
+
+        dotnet-sdk = dotnet_9.sdk;
+        dotnet-runtime = dotnet_9.runtime;
+
+        meta = {
+          homepage = "https://github.com/unoplatform/uno.check";
+          license = licenses.mit;
+          maintainers = [maintainers.emileclarkb];
+        };
+      };
+  };
+in {
+  environment.systemPackages = with pkgs; [
+    # .NET
+    dotnetCombined
+
+    # .NET Tools
+    dotnetTools.uno-check
+
+    # Mono
+    mono
+    # NOTE: nixpkgs-unstable uses .NET8 SDK
+    # WARNING: nixpkgs-25.05 uses .NET6 SDK (now marked insecure)
+    pkgs-unstable.msbuild
+
+    # .NET Framework Tools/Services
+    omnisharp-roslyn
+    netcoredbg
+  ];
+}

hosts/modules/wm/crywl.nix

@@ -37,8 +37,8 @@ in {
     ];
 
     nixpkgs.overlays = [
-      (self: super: {
+      (final: prev: {
-        crywl = super.dwl.overrideAttrs (oldAttrs: rec {
+        crywl = prev.dwl.overrideAttrs (oldAttrs: rec {
           pname = "crywl";
           version = "0.1-unstable";
 
@@ -101,6 +101,7 @@ in {
               command = "crywl -v 2>&1; return 0";
             };
           };
+
           meta = {
             homepage = "https://forge.imbored.dev/emileclarkb/crywl";
             description = "Personal fork of DWL";

hosts/myputer/default.nix

@@ -31,8 +31,9 @@ in {
 
   nix.settings = {
     experimental-features = [
-      "nix-command"
       "flakes"
+      "nix-command"
+      "pipe-operators"
     ];
     download-buffer-size = 524288000; # 500 MiB
   };
@@ -226,9 +227,7 @@ in {
   home-manager = {
     users.me = import ../../homes/me;
     extraSpecialArgs = {inherit inputs pkgs pkgs-unstable;};
-    sharedModules = [
+    sharedModules = [];
-      inputs.ags.homeManagerModules.default
-    ];
   };
 
   # ---- ENVIRONMENT VARIABLES ----
@@ -354,6 +353,8 @@ in {
     viddy # modern `watch` command
     thefuck
 
+    deploy-rs
+
     tesseract # for my work with Agribit
 
     # TODO: once upgraded past Nix-24.07 this line won't be necessary (I think)
@@ -389,6 +390,7 @@ in {
 
     # Games
     prismlauncher # minecraft
+    pkgs-unstable.olympus
   ];
 
   # DEBUG: configuring xdg portal here instead?