diff --git a/flake.lock b/flake.lock index c6a5174..c8a305c 100644 --- a/flake.lock +++ b/flake.lock @@ -49,11 +49,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1757797810, - "narHash": "sha256-cecYpMD1SR0QwqiMTmhy1OtfjC4UUkP3TAeiHQjVpG0=", + "lastModified": 1760309387, + "narHash": "sha256-yCjkJuQbt6DjdS1XJL2uwyLu1AcmDvlyMGojBq8Ua38=", "owner": "9001", "repo": "copyparty", - "rev": "8f587627e16cb14efa0c20ad77e18728792e4186", + "rev": "d099e5e84e191d67a7bffa574ab39b6d0d4f6adf", "type": "github" }, "original": { @@ -91,11 +91,11 @@ ] }, "locked": { - "lastModified": 1757508292, - "narHash": "sha256-7lVWL5bC6xBIMWWDal41LlGAG+9u2zUorqo3QCUL4p4=", + "lastModified": 1758287904, + "narHash": "sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU=", "owner": "nix-community", "repo": "disko", - "rev": "146f45bee02b8bd88812cfce6ffc0f933788875a", + "rev": "67ff9807dd148e704baadbd4fd783b54282ca627", "type": "github" }, "original": { @@ -233,11 +233,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1757555667, - "narHash": "sha256-09403AZgH/TR1bpilDm8yJucZ2hYcZm8bzY3t8NgPJQ=", + "lastModified": 1760234253, + "narHash": "sha256-ElkSuw4RxtyOY3mThezUpOM8c0fTNWlL0we/deGiTZU=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "d6d19d54dcec2a6afac3b9442643dd18e8b0566d", + "rev": "a82ae8f5079a134d33337cf211d7617f1268b301", "type": "github" }, "original": { @@ -311,11 +311,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1757545623, - "narHash": "sha256-mCxPABZ6jRjUQx3bPP4vjA68ETbPLNz9V2pk9tO7pRQ=", + "lastModified": 1759994382, + "narHash": "sha256-wSK+3UkalDZRVHGCRikZ//CyZUJWDJkBDTQX1+G77Ow=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8cd5ce828d5d1d16feff37340171a98fc3bf6526", + "rev": "5da4a26309e796daa7ffca72df93dbe53b8164c7", "type": "github" }, "original": { @@ -385,22 +385,6 @@ "type": "github" } }, - "ollama-intel": { - "flake": false, - "locked": { - "lastModified": 1757015956, - "narHash": "sha256-A8zt9SE6rUCm06LkNB1dwsV8lZ+dMMZZWkAhjlnUawU=", - "owner": "NikolasEnt", - "repo": "ollama-webui-intel", - "rev": "ac701a2e9bd1a61deba8d88e5a4ac65b60adc173", - "type": "github" - }, - "original": { - "owner": "NikolasEnt", - "repo": "ollama-webui-intel", - "type": "github" - } - }, "pyproject-build-systems": { "inputs": { "nixpkgs": [ @@ -459,7 +443,6 @@ "disko": "disko", "nix-minecraft": "nix-minecraft", "nixpkgs": "nixpkgs_5", - "ollama-intel": "ollama-intel", "shoblog-front": "shoblog-front", "striped-back": "striped-back", "striped-front": "striped-front", @@ -590,11 +573,11 @@ }, "unstable": { "locked": { - "lastModified": 1757745802, - "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", + "lastModified": 1760038930, + "narHash": "sha256-Oncbh0UmHjSlxO7ErQDM3KM0A5/Znfofj2BSzlHLeVw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", + "rev": "0b4defa2584313f3b781240b29d61f6f9f7e0df3", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 6b25b24..e20a1c0 100644 --- a/flake.nix +++ b/flake.nix @@ -20,10 +20,6 @@ shoblog-front.url = "gitlab:shobu13/shoblog"; striped-front.url = "git+ssh://git@gitlab.com/striped1/striped-front"; striped-back.url = "git+ssh://git@gitlab.com/striped1/striped-back"; - ollama-intel = { - url = "github:NikolasEnt/ollama-webui-intel"; - flake = false; - }; copyparty.url = "github:9001/copyparty"; @@ -47,7 +43,6 @@ nix-minecraft, testing-grounds, copyparty, - ollama-intel, ... }: let @@ -98,6 +93,7 @@ ]; deployment.targetHost = "zimablade.homelab.local"; + # deployment.targetHost = "10.0.0.4"; # deployment.targetPort = 22223; }; }; diff --git a/hosts/zimablade/configuration.nix b/hosts/zimablade/configuration.nix index 271ce30..f09ba6e 100644 --- a/hosts/zimablade/configuration.nix +++ b/hosts/zimablade/configuration.nix @@ -77,6 +77,7 @@ httpie btop tmux + # firefox ]); services = { @@ -84,6 +85,21 @@ enable = true; ports = [ 22 ]; }; + + # xserver = { + # enable = true; + # desktopManager = { + # xterm.enable = false; + # xfce.enable = true; + # }; + # }; + + blueman.enable = true; + }; + + hardware.bluetooth = { + enable = true; + powerOnBoot = true; }; system.stateVersion = "24.11"; diff --git a/hosts/zimablade/coredns/default.nix b/hosts/zimablade/coredns/default.nix index 0381373..2c24bc6 100644 --- a/hosts/zimablade/coredns/default.nix +++ b/hosts/zimablade/coredns/default.nix @@ -3,16 +3,14 @@ enable = true; config = '' homelab.local { - file ${./db.homelab.local} log errors cache + file ${./db.homelab.local} } . { forward . 8.8.8.8 - forward . 84.200.69.80 - forward . 84.200.70.40 log errors cache