diff --git a/flake.lock b/flake.lock
index d3bb65b..261104f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -663,16 +663,16 @@
},
"nixpkgs-RoryNix": {
"locked": {
- "lastModified": 1704290814,
- "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=",
+ "lastModified": 1737480160,
+ "narHash": "sha256-UeyAoX342brQVPzFCdA9lE+puF1PUoVGmuxT5LnKnMI=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421",
+ "rev": "c9f4347b141187f45edf31031d902932ce3143d2",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "nixos-23.05",
+ "ref": "master",
"repo": "nixpkgs",
"type": "github"
}
diff --git a/flake.nix b/flake.nix
index 27a6392..ae888e3 100755
--- a/flake.nix
+++ b/flake.nix
@@ -22,7 +22,8 @@
};
nixpkgs-RoryNix = {
- url = "github:NixOS/nixpkgs/nixos-23.05";
+ #url = "github:NixOS/nixpkgs/nixos-23.05";
+ url = "github:NixOS/nixpkgs/master";
};
# Draupnir module/package
@@ -300,6 +301,8 @@
(
{ ... }:
{
+ nixpkgs.hostPlatform = "i686-linux";
+ nixpkgs.buildPlatform = "x86_64-linux";
nix.registry.nixpkgs.flake = nixpkgs-RoryNix;
}
)
diff --git a/host/Rory-nginx/configuration.nix b/host/Rory-nginx/configuration.nix
index f6375a9..9096c4a 100755
--- a/host/Rory-nginx/configuration.nix
+++ b/host/Rory-nginx/configuration.nix
@@ -22,7 +22,8 @@
./services/nginx/nginx.nix
#./services/jitsi.nix
./services/cgit.nix
- #./services/ollama.nix
+ ./services/ollama.nix
+ ./services/deluge.nix
./services/prometheus.nix
./services/redpanda/root.nix
diff --git a/host/Rory-nginx/services/containers/matrixunittests/services/conduit.nix b/host/Rory-nginx/services/containers/matrixunittests/services/conduit.nix
index e066557..cd5776f 100755
--- a/host/Rory-nginx/services/containers/matrixunittests/services/conduit.nix
+++ b/host/Rory-nginx/services/containers/matrixunittests/services/conduit.nix
@@ -15,6 +15,7 @@
port = 6167;
}
];
+ federation.enable = false;
server_discovery.client.base_url = "https://matrixunittests.rory.gay"; # This is required for some reason
database = {
diff --git a/host/Rory-nginx/services/deluge.nix b/host/Rory-nginx/services/deluge.nix
new file mode 100755
index 0000000..4a499ed
--- /dev/null
+++ b/host/Rory-nginx/services/deluge.nix
@@ -0,0 +1,14 @@
+{ ... }:
+
+{
+ # systemd.tmpfiles.rules = [ "d /data/ollama 0750 ostgres postgres" ];
+
+ services.deluge = {
+ enable = true;
+ web.enable = true;
+ #dataDir = "/mnt/torrent/deluge";
+ declarative = false;
+ user = "Rory";
+ group = "users";
+ };
+}
diff --git a/host/Rory-nginx/services/nginx/nginx.nix b/host/Rory-nginx/services/nginx/nginx.nix
index e08bcc0..01eaac6 100755
--- a/host/Rory-nginx/services/nginx/nginx.nix
+++ b/host/Rory-nginx/services/nginx/nginx.nix
@@ -38,7 +38,7 @@ in
'';
additionalModules = with pkgs.nginxModules; [ moreheaders ];
virtualHosts = {
- "boorunav.com" = serveDir { path = "/data/nginx/html_boorunav"; };
+ #"boorunav.com" = serveDir { path = "/data/nginx/html_boorunav"; };
"catgirlsaresexy.com" = serveDir { path = "/data/nginx/html_catgirlsaresexy"; };
"sugarcanemc.org" = serveDir { path = "/data/nginx/html_sugarcanemc"; };
@@ -49,7 +49,6 @@ in
"spigotav.thearcanebrony.net" = serveDir { path = "/data/nginx/html_spigotav"; };
"terra.thearcanebrony.net" = serveDir { path = "/data/nginx/html_terrarchive"; };
"vives.thearcanebrony.net" = serveDir { path = "/data/nginx/html_vives"; };
- "ec.rory.gay" = serveDir { path = "/data/nginx/html_ec"; };
"git.rory.gay" = serveDir { path = "/data/nginx/html_git"; };
"wad.rory.gay" = serveDir { path = "/data/nginx/html_wad"; } // {
@@ -75,6 +74,7 @@ in
"matrixunittests.rory.gay" = import ./rory.gay/matrixunittests.nix;
"conduit.matrixunittests.rory.gay" = import ./rory.gay/conduit.matrixunittests.nix;
"mru.rory.gay" = import ./rory.gay/mru.nix;
+ "ec.rory.gay" = import ./rory.gay/ec.nix;
#bots...
"0bottests.bots.rory.gay" = import ./rory.gay/bots.nix;
diff --git a/host/Rory-nginx/services/nginx/rory.gay/ec.nix b/host/Rory-nginx/services/nginx/rory.gay/ec.nix
new file mode 100755
index 0000000..0985503
--- /dev/null
+++ b/host/Rory-nginx/services/nginx/rory.gay/ec.nix
@@ -0,0 +1,26 @@
+{
+ enableACME = true;
+ addSSL = true;
+ kTLS = true;
+ root = "/data/nginx/html_ec";
+ reuseport = true;
+ extraConfig = ''
+ brotli off;
+ brotli_static off;
+ '';
+ locations = {
+ "/" = {
+ index = "index.html";
+ extraConfig = ''
+ more_set_headers 'Access-Control-Allow-Origin: *';
+ more_set_headers 'Access-Control-Allow-Methods: *';
+ more_set_headers 'Access-Control-Allow-Headers: *';
+ more_set_headers 'Access-Control-Expose-Headers: *';
+ more_set_headers 'Access-Control-Max-Age' 1728000;
+
+ # default to /index.html if file not found
+ try_files $uri $uri/ /index.html;
+ '';
+ };
+ };
+}
diff --git a/host/Rory-nginx/services/nginx/rory.gay/mru.nix b/host/Rory-nginx/services/nginx/rory.gay/mru.nix
index dd59830..d1e1cd7 100755
--- a/host/Rory-nginx/services/nginx/rory.gay/mru.nix
+++ b/host/Rory-nginx/services/nginx/rory.gay/mru.nix
@@ -1,12 +1,12 @@
{
enableACME = true;
addSSL = true;
- quic = true;
+# quic = true;
http3 = true;
http3_hq = true;
kTLS = true;
root = "/data/nginx/html_mru";
- reuseport = true;
+# reuseport = true;
extraConfig = ''
brotli off;
brotli_static off;
diff --git a/host/Rory-nginx/services/ollama.nix b/host/Rory-nginx/services/ollama.nix
index b9ebe66..16f4e1c 100755
--- a/host/Rory-nginx/services/ollama.nix
+++ b/host/Rory-nginx/services/ollama.nix
@@ -12,5 +12,8 @@
};
#listenAddress = "0.0.0.0:11434";
host = "0.0.0.0";
+ port = 11434;
+ user = "ollama";
+ group = "ollama";
};
}
diff --git a/host/RoryNix/configuration.nix b/host/RoryNix/configuration.nix
index 4482849..891d3ad 100644
--- a/host/RoryNix/configuration.nix
+++ b/host/RoryNix/configuration.nix
@@ -43,22 +43,23 @@
services = {
xserver = {
enable = true;
- videoDrivers = [ "intel" ];
+ #videoDrivers = [ "intel" ];
+ videoDrivers = [ "nouveau" ];
desktopManager.gnome.enable = true;
xkb.layout = "us";
- modules = [ pkgs.xorg.xf86videointel ];
+ #modules = [ pkgs.xorg.xf86videointel ];
};
#libinput.enable = true;
gnome = {
core-developer-tools.enable = false;
core-utilities.enable = false;
- tracker-miners.enable = false;
- tracker.enable = false;
+ localsearch.enable = false;
+ tinysparql.enable = false;
sushi.enable = false;
rygel.enable = false;
gnome-user-share.enable = false;
gnome-remote-desktop.enable = false;
- gnome-online-miners.enable = lib.mkForce false;
+ # gnome-online-miners.enable = lib.mkForce false; # removed
gnome-online-accounts.enable = false;
gnome-initial-setup.enable = false;
gnome-browser-connector.enable = false;
@@ -83,8 +84,8 @@
};
};
- sound.enable = true;
- hardware.pulseaudio.enable = false;
+ # sound.enable = true; # removed
+ services.pulseaudio.enable = false;
users.users = {
Rory = {
@@ -146,7 +147,7 @@
zsh-completions
];
- fonts.packages = with pkgs; [ (nerdfonts.override { fonts = [ "JetBrainsMono" ]; }) ];
+ fonts.packages = with pkgs; [ nerd-fonts.jetbrains-mono noto-fonts-monochrome-emoji ];
nix = {
settings = {
experimental-features = [
|
