From 5153b1d54b97c5bf2d951908f4fb344f61828a7e Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Tue, 20 Jan 2026 09:20:25 +1000 Subject: [PATCH 1/7] ignore nib --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 81b47aa..31f728a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,5 @@ ISSUES/ secrets/ -nib/ result rebuild*.log From c4464eeba2b3b2b75767917eeaf602dc2ce5e8c4 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Tue, 20 Jan 2026 09:20:55 +1000 Subject: [PATCH 2/7] remove ags --- homes/me/default.nix | 1 - hosts/lolcathost/default.nix | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/homes/me/default.nix b/homes/me/default.nix index 6998e63..a6e5745 100755 --- a/homes/me/default.nix +++ b/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 ]; diff --git a/hosts/lolcathost/default.nix b/hosts/lolcathost/default.nix index dbf965d..be32da0 100755 --- a/hosts/lolcathost/default.nix +++ b/hosts/lolcathost/default.nix @@ -231,9 +231,7 @@ in { home-manager = { users.me = import ../../homes/me; extraSpecialArgs = {inherit inputs pkgs pkgs-unstable;}; - sharedModules = [ - inputs.ags.homeManagerModules.default - ]; + sharedModules = []; }; # ---- ENVIRONMENT VARIABLES ---- From 5bae1d546a25d42f92d3fc23fac163c7ab8f8b3d Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Tue, 20 Jan 2026 09:23:02 +1000 Subject: [PATCH 3/7] progress home-manager (hyrule) --- hosts/hyrule/default.nix | 53 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/hosts/hyrule/default.nix b/hosts/hyrule/default.nix index 325e467..72cf59f 100755 --- a/hosts/hyrule/default.nix +++ b/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 From 9bbb8fa58534c62a94c092b7c702067d1bb021ec Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Tue, 20 Jan 2026 09:23:16 +1000 Subject: [PATCH 4/7] add dotnet module --- hosts/modules/langs/dotnet.nix | 61 ++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 hosts/modules/langs/dotnet.nix diff --git a/hosts/modules/langs/dotnet.nix b/hosts/modules/langs/dotnet.nix new file mode 100644 index 0000000..d9c3177 --- /dev/null +++ b/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 + ]; +} From aa17215adf210eae4e83ceb58d88f51d42543d45 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Tue, 20 Jan 2026 09:23:50 +1000 Subject: [PATCH 5/7] prefer final: prev: convention crywl module --- hosts/modules/wm/crywl.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hosts/modules/wm/crywl.nix b/hosts/modules/wm/crywl.nix index 1454af2..ed719a6 100644 --- a/hosts/modules/wm/crywl.nix +++ b/hosts/modules/wm/crywl.nix @@ -37,8 +37,8 @@ in { ]; nixpkgs.overlays = [ - (self: super: { - crywl = super.dwl.overrideAttrs (oldAttrs: rec { + (final: prev: { + 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"; From 2ef679f30f7a755b6ce23957e1e95d7d758fbff8 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Tue, 20 Jan 2026 09:24:12 +1000 Subject: [PATCH 6/7] use dotnet module in rider module --- hosts/modules/apps/rider.nix | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/hosts/modules/apps/rider.nix b/hosts/modules/apps/rider.nix index adf8885..5a4edce 100644 --- a/hosts/modules/apps/rider.nix +++ b/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 = { From 676b3d367cae54b22316817978d160197cd04cb0 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Tue, 20 Jan 2026 09:24:19 +1000 Subject: [PATCH 7/7] support pipe-operators --- hosts/myputer/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/hosts/myputer/default.nix b/hosts/myputer/default.nix index 6986a31..47e8169 100755 --- a/hosts/myputer/default.nix +++ b/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 = [ - inputs.ags.homeManagerModules.default - ]; + sharedModules = []; }; # ---- 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?