Merge branch 'master' of ssh://git.giugl.io/peperunas/nixos

flake.lock

@@ -250,11 +250,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1739757849,
+        "lastModified": 1743387206,
-        "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=",
+        "narHash": "sha256-24N3NAuZZbYqZ39NgToZgHUw6M7xHrtrAm18kv0+2Wo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe",
+        "rev": "15c5f9d04fabd176f30286c8f52bbdb2c853a146",
         "type": "github"
       },
       "original": {
@@ -331,11 +331,11 @@
     },
     "nixos-master": {
       "locked": {
-        "lastModified": 1741609898,
+        "lastModified": 1743784178,
-        "narHash": "sha256-2WBG7YPJRxEVEekvux7ut6/lBxkwyNmu54hVRbUx2Ts=",
+        "narHash": "sha256-rxchbu1Zcthv7fV+KWiF79SjUaeMe3tiK5qYhg+u+pA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "23aebfa4550ef6b2f755286f13b68aababf2ea03",
+        "rev": "d142f5ee8a1bc234868d9ea5bcc7c0db708651e1",
         "type": "github"
       },
       "original": {
@@ -347,11 +347,11 @@
     },
     "nixos-unstable": {
       "locked": {
-        "lastModified": 1741462378,
+        "lastModified": 1743689281,
-        "narHash": "sha256-ZF3YOjq+vTcH51S+qWa1oGA9FgmdJ67nTNPG2OIlXDc=",
+        "narHash": "sha256-y7Hg5lwWhEOgflEHRfzSH96BOt26LaYfrYWzZ+VoVdg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2d9e4457f8e83120c9fdf6f1707ed0bc603e5ac9",
+        "rev": "2bfc080955153be0be56724be6fa5477b4eefabb",
         "type": "github"
       },
       "original": {
@@ -379,11 +379,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1741607077,
+        "lastModified": 1743784303,
-        "narHash": "sha256-dVBOW6Hhc8dMvQMi/DrGQuaZOJRmOGX6Ps0+QkdW6cM=",
+        "narHash": "sha256-IlAPw8Hlwhy3xGOos7ji0W/O/oqWLhNtff84daWi1P0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1b47a1dbffce177e49d6174e540a5472432bffe2",
+        "rev": "95e38bac46071545b324dcb5932940f844d598f4",
         "type": "github"
       },
       "original": {
@@ -481,11 +481,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1741330828,
+        "lastModified": 1743670877,
-        "narHash": "sha256-Vj5UBTlVRWGX3T0EAI6pVWTMmi8SpAeMuRMMVz/Hgz0=",
+        "narHash": "sha256-OHuOhVCfx10VpWwl9T5Q+QB3To0N95flBR1rSwOiUHA=",
         "owner": "icewind1991",
         "repo": "nvidia-patch-nixos",
-        "rev": "0cc22a482f2aa4c13daeac0935a787d868122ff0",
+        "rev": "e80a4919e88a8cb496f649234fb3fc7e992ece10",
         "type": "github"
       },
       "original": {

hosts/architect/default.nix

@@ -37,7 +37,6 @@ in
     # ./photoprism.nix
     ./sunshine.nix
     ./jellyseer.nix
-    ./teslamate.nix
     ./postgres.nix
     ./netdata.nix
     ./homeassistant.nix

hosts/architect/dns.nix

@@ -1,6 +1,6 @@
-{ config, lib, ... }:
+{ config, pkgs, ... }:
 
-with lib;
+with pkgs.lib;
 
 let
   generateCoreDNSConfig = domains:
@@ -62,44 +62,9 @@ in
                           
         . {
           cache
-          forward . 127.0.0.1:${toString config.services.adguardhome.settings.dns.port}
+          forward . 45.90.28.77 45.90.30.77
         }
       '';
     };
-
-    adguardhome = {
-      enable = true;
-      settings = {
-        port = 5354;
-        dns = {
-          port = 5300;
-        };
-        upstream_dns = [
-          "tls://architect.d65174.dns.nextdns.io"
-          "https://dns.nextdns.io/d65174/architect"
-        ];
-      };
-    };
-
-    dnscrypt-proxy2 = {
-      enable = true;
-      settings = {
-        listen_addresses = [ "127.0.0.1:5354" ];
-        ipv4_servers = true;
-        ipv6_servers = false;
-        block_ipv6 = true;
-        dnscrypt_servers = true;
-        doh_servers = true;
-        require_nolog = true;
-        require_nofilter = true;
-        timeout = 350;
-        lb_strategy = "p4";
-        lb_estimator = true;
-        ignore_system_dns = true;
-        fallback_resolvers = [ "1.1.1.1:53" "9.9.9.9:53" ];
-        cache_min_ttl = 60;
-        cache_max_ttl = 360;
-      };
-    };
   };
 }

hosts/architect/llm.nix

@@ -4,6 +4,8 @@ let
   backendDomain = "ollama.giugl.io";
   frontendDomain = "llm.giugl.io";
   ollamaPkg = pkgs.unstablePkgs.ollama-cuda;
+  uiPkg = pkgs.unstablePkgs.open-webui;
+  tikaPkg = pkgs.unstablePkgs.tika;
 in
 {
   environment = {
@@ -23,7 +25,15 @@ in
       };
     };
 
-    open-webui.enable = true;
+    open-webui = {
+      enable = true;
+      package = uiPkg;
+    };
+
+    tika = {
+      enable = true;
+      package = tikaPkg;
+    };
   };
 
   architect.vhost.${backendDomain} = {
@@ -51,6 +61,7 @@ in
       port = config.services.open-webui.port;
       allowLan = true;
       allowWAN = true;
+      proxyWebsockets = true;
     };
   };
 }

hosts/architect/sunshine.nix

@@ -122,7 +122,7 @@ in
           }
           {
             name = "Steam";
-            cmd = ''${pkgs.bash}/bin/bash -c "${pkgs.gamescope}/bin/gamescope --adaptive-sync --force-composition --immediate-flips --rt -C 3000 -f -e -W ''${SUNSHINE_CLIENT_WIDTH} -H ''${SUNSHINE_CLIENT_HEIGHT} -r ''${SUNSHINE_CLIENT_FPS} -- ${pkgs.steam}/bin/steam -pipewire"'';
+            cmd = ''${pkgs.bash}/bin/bash -c "${pkgs.steam}/bin/steam -pipewire"'';
             prep-cmd = [
               {
                 do = ''${pkgs.bash}/bin/bash -c "${resolutionScript}/bin/resolution.sh ''${SUNSHINE_CLIENT_WIDTH} ''${SUNSHINE_CLIENT_HEIGHT}" ''${SUNSHINE_CLIENT_FPS}"'';

roles/home/common.nix

@@ -1,5 +1,24 @@
 { pkgs, ... }:
 
+let
+  stablePkgs = with pkgs;[
+    rizin
+    sshfs
+    victor-mono
+    home-manager
+    ripgrep
+    ydiff
+    nix-index
+    pipenv
+    htop
+    glances
+    tree
+  ] ++ lib.optional (!pkgs.stdenv.isDarwin) pastebinit;
+
+  unstablePkgs = with pkgs.unstablePkgs; [
+    aider-chat-full
+  ];
+in
 {
   imports = [
     ./zsh.nix
@@ -8,20 +27,7 @@
   ];
 
   home = {
-    packages = with pkgs; [
+    packages = stablePkgs + unstablePkgs;
-      rizin
-      sshfs
-      victor-mono
-      home-manager
-      ripgrep
-      ydiff
-      nix-index
-      pipenv
-      htop
-      glances
-      tree
-    ]
-    ++ lib.optional (!pkgs.stdenv.isDarwin) pastebinit;
     
     stateVersion = "24.11";
   };