This commit is contained in:
bug
2026-08-18 21:11:15 -05:00
parent c4220bc621
commit 1dffa3a0a2
23 changed files with 583 additions and 540 deletions
Generated
+274 -391
View File
File diff suppressed because it is too large Load Diff
+8 -2
View File
@@ -2,7 +2,9 @@
outputs = inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } (inputs.import-tree ./modules); outputs = inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } (inputs.import-tree ./modules);
inputs = { inputs = {
den.url = "github:vic/den/v0.10.0"; den = {
url = "github:denful/den/";
};
flake-aspects.url = "github:vic/flake-aspects/v0.5.0"; flake-aspects.url = "github:vic/flake-aspects/v0.5.0";
@@ -53,13 +55,15 @@
nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel/release"; nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel/release";
/*
omnisearch = { omnisearch = {
url = "git+https://git.bwaaa.monster/omnisearch"; url = "git+https://git.bwaaa.monster/omnisearch";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
*/
minecraft = { minecraft = {
url = "github:Ninlives/minecraft.nix"; url = "github:4DBug/minecraft.nix";
inputs.metadata.follows = "minecraft-metadata"; inputs.metadata.follows = "minecraft-metadata";
}; };
@@ -71,5 +75,7 @@
}; };
nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver"; nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver";
millennium.url = "github:SteamClientHomebrew/Millennium?dir=packages/nix";
}; };
} }
+1 -1
View File
@@ -33,7 +33,7 @@
nvidiaSettings = true; nvidiaSettings = true;
package = config.boot.kernelPackages.nvidiaPackages.beta; package = config.boot.kernelPackages.nvidiaPackages.stable;
}; };
nixpkgs.config = { nixpkgs.config = {
+9
View File
@@ -0,0 +1,9 @@
{
den.aspects.tailscale = {
nixos = {
services.tailscale = {
enable = true;
};
};
};
}
+3 -3
View File
@@ -3,10 +3,10 @@
nixos = { pkgs, ... }: { nixos = { pkgs, ... }: {
nixpkgs.overlays = [ inputs.nix-cachyos-kernel.overlays.pinned ]; nixpkgs.overlays = [ inputs.nix-cachyos-kernel.overlays.pinned ];
# boot.kernelPackages = pkgs.cachyosKernels.linuxPackages-cachyos-latest; #boot.kernelPackages = pkgs.cachyosKernels.linuxPackages-cachyos-latest;
nix.settings.substituters = [ "https://attic.xuyh0120.win/lantian" ]; #nix.settings.substituters = [ "https://attic.xuyh0120.win/lantian" ];
nix.settings.trusted-public-keys = [ "lantian:EeAUQ+W+6r7EtwnmYjeVwx5kOGEBpjlBfPlzGlTNvHc=" ]; #nix.settings.trusted-public-keys = [ "lantian:EeAUQ+W+6r7EtwnmYjeVwx5kOGEBpjlBfPlzGlTNvHc=" ];
}; };
}; };
} }
+4 -2
View File
@@ -5,12 +5,14 @@ let
extraGroups = [ "networkmanager" "wheel" "audio" "video" "libvirtd" "ydotool" "dialout" ]; extraGroups = [ "networkmanager" "wheel" "audio" "video" "libvirtd" "ydotool" "dialout" ];
classes = [ "homeManager" ]; classes = [ "homeManager" ];
}; };
in { in { lib, ... }: {
den.hosts.x86_64-linux = { den.hosts.x86_64-linux = {
nix.users.bug = bug; nix.users.bug = bug;
styx.users.bug = bug; styx.users.bug = bug;
box.users.bug = bug; box.users.bug = bug;
}; };
den.homes.x86_64-linux.bug = { aspect = "bug"; }; den.homes.x86_64-linux.bug = { };
den.schema.user.classes = lib.mkDefault [ "homeManager" ];
} }
+1
View File
@@ -17,6 +17,7 @@
vscode-server vscode-server
gitea gitea
# omnisearch # omnisearch
tailscale
catppuccin catppuccin
+2 -2
View File
@@ -11,11 +11,11 @@
janitor janitor
ollama llama
alc897 alc897
cad #cad
]; ];
nixos = { nixos = {
+48 -4
View File
@@ -1,4 +1,5 @@
{ inputs, ... }: { { inputs, ... }:
{
den.aspects.mailserver = { den.aspects.mailserver = {
nixos = { nixos = {
imports = [ inputs.nixos-mailserver.nixosModules.default ]; imports = [ inputs.nixos-mailserver.nixosModules.default ];
@@ -7,7 +8,7 @@
acceptTerms = true; acceptTerms = true;
defaults.email = "security@bug.tools"; defaults.email = "security@bug.tools";
certs."mail.bug.tools" = { certs."mx.bug.tools" = {
listenHTTP = "1360"; listenHTTP = "1360";
}; };
}; };
@@ -17,10 +18,10 @@
stateVersion = 4; stateVersion = 4;
fqdn = "mail.bug.tools"; fqdn = "mx.bug.tools";
domains = [ "bug.tools" ]; domains = [ "bug.tools" ];
x509.useACMEHost = "mail.bug.tools"; x509.useACMEHost = "mx.bug.tools";
fullTextSearch = { fullTextSearch = {
enable = true; enable = true;
@@ -33,6 +34,7 @@
hashedPasswordFile = "/home/bug/mailserver/bug.passwd"; hashedPasswordFile = "/home/bug/mailserver/bug.passwd";
aliases = [ aliases = [
"admin@bug.tools" "admin@bug.tools"
"security@bug.tools"
"google@bug.tools" "google@bug.tools"
"apple@bug.tools" "apple@bug.tools"
"roblox@bug.tools" "roblox@bug.tools"
@@ -44,6 +46,11 @@
"contact@bug.tools" "contact@bug.tools"
"claude@bug.tools" "claude@bug.tools"
"rumble@bug.tools" "rumble@bug.tools"
"bambu@bug.tools"
"soulframe@bug.tools"
"vortex@bug.tools"
"codex@bug.tools"
"tailscale@bug.tools"
]; ];
}; };
@@ -56,6 +63,43 @@
}; };
}; };
}; };
den.tunnels = [
"mail"
"email"
];
services.roundcube = {
enable = true;
hostName = "mail.bug.tools";
extraConfig = ''
$config['imap_host'] = 'ssl://localhost:993';
$config['imap_conn_options'] = [
'ssl' => ['verify_peer' => false, 'verify_peer_name' => false]
];
$config['smtp_host'] = 'ssl://localhost:465';
$config['smtp_conn_options'] = [
'ssl' => ['verify_peer' => false, 'verify_peer_name' => false]
];
$config['smtp_user'] = "%u";
$config['smtp_pass'] = "%p";
$config['username_domain'] = 'bug.tools';
'';
};
services.nginx.enable = true;
services.nginx.virtualHosts."mail.bug.tools" = {
forceSSL = false;
enableACME = false;
listen = [
{
addr = "0.0.0.0";
port = 8088;
}
];
};
}; };
}; };
} }
+2
View File
@@ -16,6 +16,8 @@
monitor = 61208; monitor = 61208;
matrix = 8008; matrix = 8008;
omnisearch = 8087; omnisearch = 8087;
mail = 8088;
email = 8088;
}; };
}; };
} }
+18 -3
View File
@@ -1,10 +1,15 @@
{ ... }: { { ... }:
{
den.aspects.nix-ld = { den.aspects.nix-ld = {
nixos = { pkgs, options, ... }: { nixos =
{ pkgs, options, ... }:
{
programs.nix-ld = { programs.nix-ld = {
enable = true; enable = true;
libraries = options.programs.nix-ld.libraries.default ++ (with pkgs; [ libraries =
options.programs.nix-ld.libraries.default
++ (with pkgs; [
libxml2 libxml2
udev udev
gcc gcc
@@ -17,6 +22,16 @@
libXrandr libXrandr
libXi libXi
libxcb libxcb
glibc
vulkan-loader
alsa-lib
pipewire
libpulseaudio
libz
libGL
glib
]); ]);
}; };
}; };
+4 -1
View File
@@ -3,7 +3,10 @@
nixos = { pkgs, ... }: { nixos = { pkgs, ... }: {
users.users.bug.packages = with pkgs; [ users.users.bug.packages = with pkgs; [
zed-editor zed-editor
arduino-ide #arduino-ide
# add to languages later
python314Packages.pyside6
]; ];
}; };
}; };
+11 -4
View File
@@ -1,7 +1,14 @@
{ den, ... }: { { den, ... }:
{
den.aspects.gaming = { den.aspects.gaming = {
includes = with den.aspects; [ steam roblox polytoria game-tools emulators includes = with den.aspects; [
#star-citizen steam
minecraft ]; roblox
polytoria
game-tools
emulators
star-citizen
minecraft
];
}; };
} }
+46 -8
View File
@@ -1,9 +1,16 @@
{ inputs, ... }: { { inputs, ... }:
{
den.aspects.minecraft = { den.aspects.minecraft = {
nixos = { pkgs, ... }: let nixos =
{ pkgs, ... }:
let
inherit (pkgs) fetchurl symlinkJoin makeWrapper; inherit (pkgs) fetchurl symlinkJoin makeWrapper;
base = (inputs.minecraft.legacyPackages.${pkgs.stdenv.hostPlatform.system}.v1_21_11.fabric.client.withConfig [{ base =
(
inputs.minecraft.legacyPackages.${pkgs.stdenv.hostPlatform.system}.v1_21_11.fabric.client.withConfig
[
{
mods = [ mods = [
(fetchurl { (fetchurl {
name = "fabric-api.jar"; name = "fabric-api.jar";
@@ -11,17 +18,19 @@
sha256 = "sha256:1xgfpy6zj1nwwfrhr346firm8zw6lw63pl4parvjwrirc6l57i46"; sha256 = "sha256:1xgfpy6zj1nwwfrhr346firm8zw6lw63pl4parvjwrirc6l57i46";
}) })
/*
(fetchurl { (fetchurl {
name = "meteor-client.jar"; name = "meteor-client.jar";
url = "https://meteorclient.com/api/download"; url = "https://meteorclient.com/api/download";
sha256 = "sha256:0d5l2c41b3d1nadzaavdx8pjciskj6i3h65k4pmhvhz3mg6njwvl"; sha256 = "sha256:190vghnfg3invfy7qpizppxf29qyf5zz1iv5c8bfcq2q5r9mljqq";
}) })
(fetchurl { (fetchurl {
name = "baritone.jar"; name = "baritone.jar";
url = "https://www.meteorclient.com/api/downloadBaritone"; url = "https://www.meteorclient.com/api/downloadBaritone";
sha256 = "sha256:0g5xl90xphqy2c7xwlvjm71dn4l7c35yg8hwf7w4h0bwdfw7m31y"; sha256 = "sha256:0izys47kvqzhnds63kbxiifn8fsd8i9slzkhv91whwxp0183pf80";
}) })
*/
(fetchurl { (fetchurl {
name = "modmenu.jar"; name = "modmenu.jar";
@@ -29,11 +38,27 @@
sha256 = "sha256:0a2i5hl77bcw33m1h51y1dxrk7bbkj8fv0rp8w6y78d43ibwkwlm"; sha256 = "sha256:0a2i5hl77bcw33m1h51y1dxrk7bbkj8fv0rp8w6y78d43ibwkwlm";
}) })
/*
(fetchurl { (fetchurl {
name = "distant-horizons.jar"; name = "distant-horizons.jar";
url = "https://cdn.modrinth.com/data/uCdwusMi/versions/GT3Bm3GN/DistantHorizons-2.4.5-b-1.21.11-fabric-neoforge.jar"; url = "https://cdn.modrinth.com/data/uCdwusMi/versions/GT3Bm3GN/DistantHorizons-2.4.5-b-1.21.11-fabric-neoforge.jar";
sha256 = "sha256:0gxwhvji4k0xnzidwrvlndh81r64n6i24v253grbxxamgshwg53n"; sha256 = "sha256:0gxwhvji4k0xnzidwrvlndh81r64n6i24v253grbxxamgshwg53n";
}) })
*/
(fetchurl {
name = "voxy.jar";
url = "https://cdn.modrinth.com/data/fxxUqruK/versions/H3w2nVdU/voxy-0.2.16-beta%2B1.21.11.jar";
sha256 = "sha256:02z1cr7ccdss2ckgha7v89gsq65p2ibrcx8h9q3drxd4ck7jd0kz";
})
/*
(fetchurl {
name = "nvidium.jar";
url = "https://cdn.modrinth.com/data/SfMw2IZN/versions/4x9ci9sF/nvidium-0.4.3-beta13-1.21.11.jar";
sha256 = "sha256:0kdhz92lms2ghmcpzn1gj9rblh958bhic641jpvpkgn0rs70w54r";
})
*/
(fetchurl { (fetchurl {
name = "iris.jar"; name = "iris.jar";
@@ -83,13 +108,22 @@
# sha256 = "sha256:16dkj8baa6xn47n9alzy4104wz6z4zp719dxwv5wm96g2wkp1z57"; # sha256 = "sha256:16dkj8baa6xn47n9alzy4104wz6z4zp719dxwv5wm96g2wkp1z57";
# }) # })
]; ];
}]).withConfig { }
]
).withConfig
{
resourcePacks = [ resourcePacks = [
(fetchurl { (fetchurl {
name = "unique-dark.zip"; name = "unique-dark.zip";
url = "https://cdn.modrinth.com/data/BaY1UdGV/versions/UjQJb5zE/Unique%20Dark%20-%20Lite%20-%201.20.2-26.x.zip"; url = "https://cdn.modrinth.com/data/BaY1UdGV/versions/UjQJb5zE/Unique%20Dark%20-%20Lite%20-%201.20.2-26.x.zip";
sha256 = "sha256:19cv5q8pnvxkf96lazg8angbfqwkxag8qsxk31cv487jq99kl621"; sha256 = "sha256:19cv5q8pnvxkf96lazg8angbfqwkxag8qsxk31cv487jq99kl621";
}) })
(fetchurl {
name = "catppuccin.zip";
url = "https://cdn.modrinth.com/data/S3nUv9ws/versions/znzS3kCV/Catppuccin%20Mocha%20Blue.zip";
sha256 = "sha256:0w56gkyavz0gpffxs1gbp9676bwgvl845h56wc1x3qjba1nm8a5n";
})
]; ];
shaderPacks = [ shaderPacks = [
@@ -100,7 +134,10 @@
}) })
]; ];
appArgs = [ "--gameDir" "/home/bug/.local/share/minecraft" ]; appArgs = [
"--gameDir"
"/home/bug/.local/share/minecraft"
];
}; };
minecraft = symlinkJoin { minecraft = symlinkJoin {
@@ -112,7 +149,8 @@
--set XDG_DATA_HOME "/home/bug/.local/share/minecraft" --set XDG_DATA_HOME "/home/bug/.local/share/minecraft"
''; '';
}; };
in { in
{
users.users.bug.packages = [ minecraft ]; users.users.bug.packages = [ minecraft ];
}; };
}; };
+5
View File
@@ -6,6 +6,11 @@
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
inputs.nix-citizen.packages.${system}.rsi-launcher inputs.nix-citizen.packages.${system}.rsi-launcher
]; ];
nix.settings = {
substituters = [ "https://nix-citizen.cachix.org" ];
trusted-public-keys = [ "nix-citizen.cachix.org-1:lPMkWc2X8XD4/7YPEEwXKKBg+SVbYTVrAaLA2wQTKCo=" ];
};
}; };
}; };
} }
+4 -1
View File
@@ -1,9 +1,12 @@
{ ... }: { { inputs, ... }: {
den.aspects.steam = { den.aspects.steam = {
nixos = { pkgs, ... }: { nixos = { pkgs, ... }: {
nixpkgs.overlays = [ inputs.millennium.overlays.default ];
programs = { programs = {
steam = { steam = {
enable = true; enable = true;
package = pkgs.millennium-steam;
remotePlay.openFirewall = true; remotePlay.openFirewall = true;
dedicatedServer.openFirewall = false; dedicatedServer.openFirewall = false;
+21 -4
View File
@@ -1,10 +1,27 @@
{ ... }: { { ... }: {
den.aspects.ollama = { den.aspects.llama = {
nixos = { nixos = { pkgs, ... }: {
services.ollama = { services.llama-cpp = {
enable = true; enable = true;
package = pkgs.llama-cpp.override { cudaSupport = true; };
settings = {
host = "0.0.0.0";
port = 8080;
ctx-size = 65536;
loadModels = [ "llama3.2:3b" "deepseek-r1:1.5b" "deepseek-r1:8b" "qwen2.5-coder:7b" "qwen3.5:9b" "aratan/qwen3.5-agent-multimodal:9b" "qwen3-coder:30b" ]; models-preset = (pkgs.formats.ini { }).generate "llama-cpp-models-preset.ini" {
"Qwen3.6-35B-A3B" = {
hf-repo = "unsloth/Qwen3.6-35B-A3B-GGUF";
hf-file = "Qwen3.6-35B-A3B-UD-Q4_K_XL.gguf";
alias = "qwen3.6-35b-a3b";
temp = "1.0";
top-p = "0.95";
top-k = "20";
n-gpu-layers = 80;
ctx-size = 65536;
};
};
};
}; };
}; };
}; };
+3 -2
View File
@@ -1,10 +1,11 @@
{ inputs, ... }: { { inputs, ... }: {
den.aspects.nixcord = { den.aspects.nixcord = {
homeManager = { nixos = {
imports = [ inputs.nixcord.homeModules.nixcord ]; imports = [ inputs.nixcord.nixosModules.nixcord ];
programs.nixcord = { programs.nixcord = {
enable = true; enable = true;
user = "bug";
discord.enable = false; discord.enable = false;
vesktop.enable = true; vesktop.enable = true;
+1 -1
View File
@@ -4,7 +4,7 @@
users.users.bug.packages = with pkgs; [ users.users.bug.packages = with pkgs; [
blender blender
plasticity plasticity
orca-slicer #orca-slicer
]; ];
}; };
}; };
+1 -1
View File
@@ -1,5 +1,5 @@
{ den, ... }: { { den, ... }: {
den.aspects.utilities = { den.aspects.utilities = {
includes = with den.aspects; [ system-utils desktop-utils fonts sshuttle torrent ]; includes = with den.aspects; [ system-utils desktop-utils fonts sshuttle torrent cad ];
}; };
} }
+7
View File
@@ -3,9 +3,16 @@
includes = [ includes = [
den.provides.primary-user den.provides.primary-user
(den.provides.user-shell "fish") (den.provides.user-shell "fish")
den.aspects.stylix
den.aspects.librewolf
den.aspects.catppuccin
#den.provides.home-manager #den.provides.home-manager
]; ];
homeManager = {
programs.home-manager.enable = true;
};
user.extraGroups = [ "networkmanager" "wheel" "input" "audio" "video" "libvirtd" "ydotool" "dialout" ]; user.extraGroups = [ "networkmanager" "wheel" "input" "audio" "video" "libvirtd" "ydotool" "dialout" ];
}; };
} }
Executable → Regular
View File