Compare commits

..

No commits in common. "6c6af12ef6905ee7b968b664f0bc3dd5a6ec780f" and "a9a6518deea030301932a6442824ef3ec7a80293" have entirely different histories.

5 changed files with 19 additions and 52 deletions

View File

@ -97,6 +97,7 @@
thermald.enable = true; thermald.enable = true;
}; };
stylix = { stylix = {
enable = true; enable = true;
autoEnable = true; autoEnable = true;

View File

@ -13,8 +13,8 @@
gc.automatic = true; gc.automatic = true;
settings = { settings = {
experimental-features = ["nix-command" "flakes"]; experimental-features = ["nix-command" "flakes"];
#substituters = ["http://nix.dhilton.xyz/" "https://cache.nixos.org/"]; substituters = ["http://nix.dhilton.xyz/" "https://cache.nixos.org/"];
#trusted-public-keys = ["nix.dhilton.xyz:MOW060dF1A0/UXmPZBue9KMxCO13PHYFwx1X9hcdYZ4="]; trusted-public-keys = ["nix.dhilton.xyz:MOW060dF1A0/UXmPZBue9KMxCO13PHYFwx1X9hcdYZ4="];
}; };
}; };
@ -50,15 +50,7 @@
home-manager = {users = {"k" = import ./home.nix;};}; home-manager = {users = {"k" = import ./home.nix;};};
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [microcodeIntel];
microcodeIntel
firefox
(pkgs.kodi.withPackages (kodiPkgs:
with kodiPkgs; [
jellyfin
youtube
]))
];
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;
hardware.bluetooth.powerOnBoot = true; hardware.bluetooth.powerOnBoot = true;

View File

@ -5,8 +5,5 @@
... ...
}: { }: {
imports = [../home/home_common.nix]; imports = [../home/home_common.nix];
home = {packages = with pkgs; [docker docker-compose neovim waypipe];}; home = {packages = with pkgs; [docker docker-compose neovim];};
services = {
syncthing.enable = true;
};
} }

View File

@ -3,12 +3,10 @@
lib, lib,
... ...
}: { }: {
networking = { networking.firewall = {
firewall = { enable = true;
enable = true; allowedTCPPorts = [80 443 22];
allowedTCPPorts = [80 443 22 25565 26615 8080]; allowedUDPPorts = [];
allowedUDPPorts = [26615 8080 1900];
};
}; };
security.acme = { security.acme = {
@ -33,15 +31,6 @@
i2p = {enable = true;}; i2p = {enable = true;};
cockpit = {
enable = true;
allowed-origins = ["https://pit.dhilton.xyz"];
};
pulseaudio = {
enable = true;
};
nix-serve = { nix-serve = {
enable = true; enable = true;
secretKeyFile = "/var/cache-priv-key.pem"; secretKeyFile = "/var/cache-priv-key.pem";
@ -184,15 +173,6 @@
}; };
}; };
"pit.dhilton.xyz" = {
forceSSL = true;
enableACME = true;
locations."/" = {
proxyPass = "http://127.0.0.1:9090";
proxyWebsockets = true;
};
};
"nix.dhilton.xyz" = { "nix.dhilton.xyz" = {
locations."/".proxyPass = "http://127.0.0.1:5000"; locations."/".proxyPass = "http://127.0.0.1:5000";
}; };

View File

@ -29,19 +29,16 @@
postInstall = postInstall =
(oldAttrs.postInstall or "") (oldAttrs.postInstall or "")
+ '' + ''
mkdir -p "$out/bin" mkdir -p "$out/bin"
cat << EOF > "$out/bin/ollama-wrapped" cat << EOF > "$out/bin/ollama-wrapped"
#!/bin/sh #!/bin/sh
export LD_LIBRARY_PATH="${prev.intel-compute-runtime.drivers}/lib" export LD_LIBRARY_PATH="${prev.intel-compute-runtime.drivers}/lib"
export OLLAMA_INTEL_GPU=1 export OLLAMA_INTEL_GPU=1
export OLLAMA_NUM_GPU=999 exec "$out/bin/ollama-base" "\$@"
export ZES_ENABLE_SYSMAN=1 EOF
export SYCL_CACHE_PERSISTENT=1 chmod +x "$out/bin/ollama-wrapped"
exec "$out/bin/ollama-base" "\$@" mv $out/bin/ollama $out/bin/ollama-base
EOF ln -s "$out/bin/ollama-wrapped" "$out/bin/ollama"
chmod +x "$out/bin/ollama-wrapped"
mv $out/bin/ollama $out/bin/ollama-base
ln -s "$out/bin/ollama-wrapped" "$out/bin/ollama"
''; '';
}); });
}) })