Compare commits

..

No commits in common. "8c0f6606fa821611667f1768dbfd798968557367" and "bde48193073a8023ccc212b3c86d95c85862a605" have entirely different histories.

8 changed files with 26 additions and 128 deletions

1
.gitignore vendored
View file

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

View file

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

View file

@ -7,7 +7,7 @@
}: let }: let
home-manager = builtins.fetchTarball { home-manager = builtins.fetchTarball {
url = "https://github.com/nix-community/home-manager/archive/release-25.05.tar.gz"; url = "https://github.com/nix-community/home-manager/archive/release-25.05.tar.gz";
sha256 = "07pk5m6mxi666dclaxdwf7xrinifv01vvgxn49bjr8rsbh31syaq"; sha256 = "0d41gr0c89a4y4lllzdgmbm54h9kn9fjnmavwpgw0w9xwqwnzpax";
}; };
in { in {
imports = [ imports = [
@ -87,56 +87,6 @@ in {
# 8222 (INTERNAL) vaultwarden # 8222 (INTERNAL) vaultwarden
45000 # minecaft server 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";
}
];
};
}; };
}; };
@ -501,7 +451,6 @@ in {
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
eza
git git
vim vim
helix helix

View file

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

View file

@ -1,19 +1,30 @@
{ {
pkgs, pkgs,
pkgs-unstable, pkgs-unstable,
dotnetVersions ? [8 9 10],
... ...
}: { }: {
imports = [
../langs/dotnet.nix
];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# Ensure latest stable Rider version (not necessarily stable on NixOS) # Ensure latest stable Rider version (not necessarily stable on NixOS)
pkgs-unstable.jetbrains.rider pkgs-unstable.jetbrains.rider
# NOTE: Blazor requires a Chromium-based browser # NOTE: Blazor requires a Chromium-based browser
chromium 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 = { programs.nix-ld = {

View file

@ -1,61 +0,0 @@
{
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
];
}

View file

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

View file

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