diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix index a878c21..eb22c7f 100644 --- a/hosts/laptop/configuration.nix +++ b/hosts/laptop/configuration.nix @@ -97,6 +97,7 @@ thermald.enable = true; }; + stylix = { enable = true; autoEnable = true; diff --git a/hosts/server/configuration.nix b/hosts/server/configuration.nix index e01d7b5..3818679 100644 --- a/hosts/server/configuration.nix +++ b/hosts/server/configuration.nix @@ -13,8 +13,8 @@ gc.automatic = true; settings = { experimental-features = ["nix-command" "flakes"]; - #substituters = ["http://nix.dhilton.xyz/" "https://cache.nixos.org/"]; - #trusted-public-keys = ["nix.dhilton.xyz:MOW060dF1A0/UXmPZBue9KMxCO13PHYFwx1X9hcdYZ4="]; + substituters = ["http://nix.dhilton.xyz/" "https://cache.nixos.org/"]; + trusted-public-keys = ["nix.dhilton.xyz:MOW060dF1A0/UXmPZBue9KMxCO13PHYFwx1X9hcdYZ4="]; }; }; @@ -50,15 +50,7 @@ home-manager = {users = {"k" = import ./home.nix;};}; - environment.systemPackages = with pkgs; [ - microcodeIntel - firefox - (pkgs.kodi.withPackages (kodiPkgs: - with kodiPkgs; [ - jellyfin - youtube - ])) - ]; + environment.systemPackages = with pkgs; [microcodeIntel]; hardware.bluetooth.enable = true; hardware.bluetooth.powerOnBoot = true; diff --git a/hosts/server/home.nix b/hosts/server/home.nix index 9d080c6..3b1a21b 100644 --- a/hosts/server/home.nix +++ b/hosts/server/home.nix @@ -5,8 +5,5 @@ ... }: { imports = [../home/home_common.nix]; - home = {packages = with pkgs; [docker docker-compose neovim waypipe];}; - services = { - syncthing.enable = true; - }; + home = {packages = with pkgs; [docker docker-compose neovim];}; } diff --git a/hosts/server/service.nix b/hosts/server/service.nix index 04f6f54..a2f2a71 100644 --- a/hosts/server/service.nix +++ b/hosts/server/service.nix @@ -3,12 +3,10 @@ lib, ... }: { - networking = { - firewall = { - enable = true; - allowedTCPPorts = [80 443 22 25565 26615 8080]; - allowedUDPPorts = [26615 8080 1900]; - }; + networking.firewall = { + enable = true; + allowedTCPPorts = [80 443 22]; + allowedUDPPorts = []; }; security.acme = { @@ -33,15 +31,6 @@ i2p = {enable = true;}; - cockpit = { - enable = true; - allowed-origins = ["https://pit.dhilton.xyz"]; - }; - - pulseaudio = { - enable = true; - }; - nix-serve = { enable = true; 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" = { locations."/".proxyPass = "http://127.0.0.1:5000"; }; diff --git a/overlays/ollama.nix b/overlays/ollama.nix index 008b022..8f9030b 100644 --- a/overlays/ollama.nix +++ b/overlays/ollama.nix @@ -29,19 +29,16 @@ postInstall = (oldAttrs.postInstall or "") + '' - mkdir -p "$out/bin" - cat << EOF > "$out/bin/ollama-wrapped" - #!/bin/sh - export LD_LIBRARY_PATH="${prev.intel-compute-runtime.drivers}/lib" - export OLLAMA_INTEL_GPU=1 - export OLLAMA_NUM_GPU=999 - export ZES_ENABLE_SYSMAN=1 - export SYCL_CACHE_PERSISTENT=1 - exec "$out/bin/ollama-base" "\$@" - EOF - chmod +x "$out/bin/ollama-wrapped" - mv $out/bin/ollama $out/bin/ollama-base - ln -s "$out/bin/ollama-wrapped" "$out/bin/ollama" + mkdir -p "$out/bin" + cat << EOF > "$out/bin/ollama-wrapped" + #!/bin/sh + export LD_LIBRARY_PATH="${prev.intel-compute-runtime.drivers}/lib" + export OLLAMA_INTEL_GPU=1 + exec "$out/bin/ollama-base" "\$@" + EOF + chmod +x "$out/bin/ollama-wrapped" + mv $out/bin/ollama $out/bin/ollama-base + ln -s "$out/bin/ollama-wrapped" "$out/bin/ollama" ''; }); })