flake update

flake.lock

@@ -8,11 +8,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1770196631,
-        "narHash": "sha256-neRXwIILc8BUFHeT0UM2Mj8Wt1oo4UPpmm4NkfBwQOY=",
+        "lastModified": 1772177232,
+        "narHash": "sha256-wVhLe9vJEoOf0mx+Z9CrynLm360oqXKMUVt+F6FGIlk=",
         "owner": "jacopone",
         "repo": "antigravity-nix",
-        "rev": "acc9baf089a67ef7456117ef31285e34c3294984",
+        "rev": "df7c7f6471154ec826aed1aefd8cd94e9002ad26",
         "type": "github"
       },
       "original": {
@@ -46,11 +46,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1769580047,
-        "narHash": "sha256-tNqCP/+2+peAXXQ2V8RwsBkenlfWMERb+Uy6xmevyhM=",
+        "lastModified": 1772020340,
+        "narHash": "sha256-aqBl3GNpCadMoJ/hVkWTijM1Aeilc278MjM+LA3jK6g=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "366d78c2856de6ab3411c15c1cb4fb4c2bf5c826",
+        "rev": "36e38ca0d9afe4c55405fdf22179a5212243eecc",
         "type": "github"
       },
       "original": {
@@ -62,11 +62,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1770056022,
-        "narHash": "sha256-yvCz+Qmci1bVucXEyac3TdoSPMtjqVJmVy5wro6j/70=",
+        "lastModified": 1772047000,
+        "narHash": "sha256-7DaQVv4R97cii/Qdfy4tmDZMB2xxtyIvNGSwXBBhSmo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d04d8548aed39902419f14a8537006426dc1e4fa",
+        "rev": "1267bb4920d0fc06ea916734c11b0bf004bbe17e",
         "type": "github"
       },
       "original": {
@@ -78,11 +78,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1770073757,
-        "narHash": "sha256-Vy+G+F+3E/Tl+GMNgiHl9Pah2DgShmIUBJXmbiQPHbI=",
+        "lastModified": 1772082373,
+        "narHash": "sha256-wySf8a6hvuqgFdwvvzPPTARBCMLDz7WFAufGkllD1M4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "47472570b1e607482890801aeaf29bfb749884f6",
+        "rev": "26eaeac4e409d7b5a6bf6f90a2a2dc223c78d915",
         "type": "github"
       },
       "original": {

flake.nix

@@ -73,6 +73,7 @@
           modules = [
             ./hosts/segfault-tower/configuration.nix
 
+            home-manager.nixosModules.home-manager
             {
               home-manager.backupFileExtension = "backup";
               home-manager.useGlobalPkgs = true;

home/lukas/tower/packages.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, antigravity-nix, ... }:
 
 {
   fonts.fontconfig.enable = true;
@@ -11,13 +11,14 @@
     pkgs.element-desktop
     pkgs.tidal-hifi
 
+    pkgs.solaar
+
     pkgs.tree
     pkgs.htop
     pkgs.neovim
     pkgs.wget
     pkgs.unzip
 
-    pkgs.open-webui
     pkgs.librechat
 
     pkgs.feather
@@ -34,21 +35,27 @@
     pkgs.eza
     pkgs.bat
     pkgs.ripgrep
+    pkgs.sqlitebrowser
 
     pkgs.seahorse
 
     pkgs.binutils
     pkgs.gcc
 
-    # pkgs.scenebuilder
+    pkgs.scenebuilder
 
     pkgs.nil
 
     pkgs.zotero
-    pkgs.jabref
 
-    (pkgs.aspellWithDicts
-      (dicts: with dicts; [ de en en-computers ]))
+    (pkgs.aspellWithDicts (
+      dicts: with dicts; [
+        de
+        en
+        en-computers
+      ]
+    ))
+
+    antigravity-nix.packages.x86_64-linux.default
   ];
 }
-

modules/networking/networkmanager.nix

@@ -1,4 +1,12 @@
 {
   networking.networkmanager.enable = true;
-}
 
+  services.resolved = {
+    enable = true;
+    dnssec = "false";
+    fallbackDns = [
+      "1.1.1.1"
+      "8.8.8.8"
+    ];
+  };
+}

modules/services/ollama.nix

@@ -14,22 +14,22 @@
     Environment = [ "OLLAMA_HOST=0.0.0.0:11434" ];
   };
 
-  services.open-webui = {
-    package = pkgs.open-webui;
-    enable = true;
-    port = 8081;
-    environment = {
-      ANONYMIZED_TELEMETRY = "False";
-      DO_NOT_TRACK = "True";
-      SCARF_NO_ANALYTICS = "True";
-      OLLAMA_API_BASE_URL = "http://127.0.0.1:11434/api";
-      OLLAMA_BASE_URL = "http://127.0.0.1:11434";
-      WEBUI_AUTH = "False";
-      FRONTEND_BUILD_DIR = "${config.services.open-webui.stateDir}/build";
-      DATA_DIR = "${config.services.open-webui.stateDir}/data";
-      STATIC_DIR = "${config.services.open-webui.stateDir}/static";
-    };
-  };
+  # services.open-webui = {
+  #   package = pkgs.open-webui;
+  #   enable = true;
+  #   port = 8081;
+  #   environment = {
+  #     ANONYMIZED_TELEMETRY = "False";
+  #     DO_NOT_TRACK = "True";
+  #     SCARF_NO_ANALYTICS = "True";
+  #     OLLAMA_API_BASE_URL = "http://127.0.0.1:11434/api";
+  #     OLLAMA_BASE_URL = "http://127.0.0.1:11434";
+  #     WEBUI_AUTH = "False";
+  #     FRONTEND_BUILD_DIR = "${config.services.open-webui.stateDir}/build";
+  #     DATA_DIR = "${config.services.open-webui.stateDir}/data";
+  #     STATIC_DIR = "${config.services.open-webui.stateDir}/static";
+  #   };
+  # };
 
   services.searx = {
     enable = true;

modules/system/nvidia.nix

@@ -1,20 +1,20 @@
-{config, pkgs, ...}:
+{ config, pkgs, ... }:
 {
 
-   nixpkgs.config.allowUnfree = true;
+  nixpkgs.config.allowUnfree = true;
 
-   services.xserver.videoDrivers = ["nvidia"];
-   hardware.graphics = {
-     enable = true;
-     enable32Bit = true;
-   };
+  services.xserver.videoDrivers = [ "nvidia" ];
+  hardware.graphics = {
+    enable = true;
+    enable32Bit = true;
+  };
 
-   hardware.nvidia = {
+  hardware.nvidia = {
     modesetting.enable = true;
 
     # Nvidia power management. Experimental, and can cause sleep/suspend to fail.
     # Enable this if you have graphical corruption issues or application crashes after waking
-    # up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead 
+    # up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead
     # of just the bare essentials.
     powerManagement.enable = true;
 
@@ -25,7 +25,31 @@
 
     open = false;
     nvidiaSettings = true;
-    package = config.boot.kernelPackages.nvidiaPackages.stable;
+    package =
+      let
+        base = config.boot.kernelPackages.nvidiaPackages.mkDriver {
+          version = "590.48.01";
+          sha256_64bit = "sha256-ueL4BpN4FDHMh/TNKRCeEz3Oy1ClDWto1LO/LWlr1ok=";
+          openSha256 = "sha256-hECHfguzwduEfPo5pCDjWE/MjtRDhINVr4b1awFdP44=";
+          settingsSha256 = "sha256-4SfCWp3swUp+x+4cuIZ7SA5H7/NoizqgPJ6S9fm90fA=";
+          persistencedSha256 = "";
+        };
+        cachyos-nvidia-patch = pkgs.fetchpatch {
+          url = "https://raw.githubusercontent.com/CachyOS/CachyOS-PKGBUILDS/master/nvidia/nvidia-utils/kernel-6.19.patch";
+          sha256 = "sha256-YuJjSUXE6jYSuZySYGnWSNG5sfVei7vvxDcHx3K+IN4=";
+        };
+
+        # Patch the appropriate driver based on config.hardware.nvidia.open
+        driverAttr = if config.hardware.nvidia.open then "open" else "bin";
+      in
+      base
+      // {
+        ${driverAttr} = base.${driverAttr}.overrideAttrs (oldAttrs: {
+          patches = (oldAttrs.patches or [ ]) ++ [ cachyos-nvidia-patch ];
+        });
+      };
+
+    # package = config.boot.kernelPackages.nvidiaPackages.unstable;
   };
 
 }