update

etcnixos/common.nix

@@ -31,10 +31,7 @@
 
   #kernel options
   boot = {
-    # kernelPackages = pkgs.linuxPackages_cachyos-lto;
-    kernelPackages = pkgs.linuxPackages_6_10;
-
-    supportedFilesystems = [ "zfs" ];
+    kernelPackages = pkgs.linuxPackages_cachyos-lto;
 
     kernel.sysctl = {
       #for profiling

etcnixos/flake.lock

@@ -316,11 +316,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1727613673,
-        "narHash": "sha256-qqIffTQfxMYo3MKQ9BoY2s2mdKZNnUiksdnxv81js9U=",
+        "lastModified": 1727665282,
+        "narHash": "sha256-oKtfbQB1MBypqIyzkC8QCQcVGOa1soaXaGgcBIoh14o=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "f5c239fa9acb27f0a5326ba2949c00fada89ca9f",
+        "rev": "11c43c830e533dad1be527ecce379fcf994fbbb5",
         "type": "github"
       },
       "original": {
@@ -332,11 +332,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1727348695,
-        "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
+        "lastModified": 1727634051,
+        "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
+        "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9",
         "type": "github"
       },
       "original": {

etcnixos/networking.nix

@@ -8,7 +8,7 @@
     enable = true;
     insertNameservers = [
       "1.1.1.1"
-      "8.8.8.8"
+      "9.9.9.9"
     ];
     wifi = {
       scanRandMacAddress = true;

etcnixos/system-mreow.nix

@@ -46,7 +46,7 @@
     enable = true;
     settings = {
       default_session = {
-        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd ${pkgs.niri}/bin/niri-session";
+        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd niri-session";
         user = "${username}";
       };
     };

etcnixos/system-nixos.nix

@@ -15,6 +15,9 @@
   ];
 
   boot = {
+    kernelPackages = pkgs.linuxPackages_6_10;
+    supportedFilesystems = [ "zfs" ];
+
     kernelPatches = [
       #for making ALVR support better :)
       {

home-manager/flake.lock

@@ -33,11 +33,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1727595111,
-        "narHash": "sha256-i9Pz4vOnBdn1nqJmOL1+gP+A3nrK2WkOR8AO6RoIkQg=",
+        "lastModified": 1727688294,
+        "narHash": "sha256-bbisTJPMAObX/GD6tXjR1+4F/ED/jZgiZnFcXjnLC7k=",
         "owner": "orhun",
         "repo": "binsider",
-        "rev": "b1116e6118d3b6c481d9d99b25c23e2155260b97",
+        "rev": "3f4f742cfc759425ef767605417ff19d257023f9",
         "type": "github"
       },
       "original": {
@@ -68,22 +68,6 @@
         "type": "github"
       }
     },
-    "firefox-mod-theme": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1727035403,
-        "narHash": "sha256-xkVZOZRGrL5YKEXb0R701F71vGJ+K5BFpugtqPwf4XQ=",
-        "owner": "datguypiko",
-        "repo": "Firefox-Mod-Blur",
-        "rev": "694566afa267fe6d5eb5c97a87e116ba794ea293",
-        "type": "github"
-      },
-      "original": {
-        "owner": "datguypiko",
-        "repo": "Firefox-Mod-Blur",
-        "type": "github"
-      }
-    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": "nixpkgs-lib"
@@ -153,11 +137,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1727573335,
-        "narHash": "sha256-RCcDnBgJpP8GVdIrmS7IFhpUCWQjaYS4j7NBT6cbZ3s=",
+        "lastModified": 1727714074,
+        "narHash": "sha256-8a75SFeO1y6ynzF4kLZOnbwZCMWZ51GeBo9u+/MF4xc=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "415bbec6b9482afa0605682cf31064964ae705c6",
+        "rev": "63a85add825d4bd6ef48780f9c32ac0d31a8929a",
         "type": "github"
       },
       "original": {
@@ -186,11 +170,11 @@
     "niri-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1727525902,
-        "narHash": "sha256-NUsPodaJn384rLdPawH1u1cxHzE25EdrXMLkpRTkGFA=",
+        "lastModified": 1727699256,
+        "narHash": "sha256-/8+/LrIClf0ME2sC1R25p7JXT7n17xHDElCd8I/VOoc=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "c04ccafd0a2cb26c1f6a4835f4cbb01ffdb926a6",
+        "rev": "b501a9b303d9722173565d4b8f7f044a38cbc099",
         "type": "github"
       },
       "original": {
@@ -201,11 +185,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1727348695,
-        "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
+        "lastModified": 1727634051,
+        "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
+        "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9",
         "type": "github"
       },
       "original": {
@@ -264,7 +248,6 @@
       "inputs": {
         "agenix": "agenix",
         "binsider": "binsider",
-        "firefox-mod-theme": "firefox-mod-theme",
         "home-manager": "home-manager",
         "niri": "niri",
         "nixpkgs": "nixpkgs",
@@ -281,11 +264,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1727577080,
-        "narHash": "sha256-2LPT76Acp6ebt7fCt90eq/M8T2+X09s/yTVgfVFrtno=",
+        "lastModified": 1727663505,
+        "narHash": "sha256-83j/GrHsx8GFUcQofKh+PRPz6pz8sxAsZyT/HCNdey8=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "73a833855442ce8cee710cf4d8d054fea1c81196",
+        "rev": "c2099c6c7599ea1980151b8b6247a8f93e1806ee",
         "type": "github"
       },
       "original": {
@@ -381,15 +364,15 @@
         ]
       },
       "locked": {
-        "lastModified": 1727287465,
-        "narHash": "sha256-XQAf5M593WmxgaXagtkci/H9DA3jSVx1TJk6F3X5VQo=",
-        "owner": "MarceColl",
+        "lastModified": 1727680504,
+        "narHash": "sha256-QYlWZwUSwrM7BuO+dXclZIwoPvBIuJr6GpFKv9XKFPI=",
+        "owner": "ch4og",
         "repo": "zen-browser-flake",
-        "rev": "96f1b5d80bf7360cb77c9b521f388324f18383a0",
+        "rev": "a026029bd9c953559a6990a5c0c80e355ed8a9dc",
         "type": "github"
       },
       "original": {
-        "owner": "MarceColl",
+        "owner": "ch4og",
         "repo": "zen-browser-flake",
         "type": "github"
       }

home-manager/flake.nix

@@ -31,7 +31,7 @@
     };
 
     zen-browser = {
-      url = "github:MarceColl/zen-browser-flake";
+      url = "github:ch4og/zen-browser-flake";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
@@ -46,12 +46,6 @@
       url = "github:Matoking/vdf/support_new_bvdf";
       flake = false;
     };
-
-    firefox-mod-theme = {
-      url = "github:datguypiko/Firefox-Mod-Blur";
-      flake = false;
-    };
-
   };
 
   outputs =
@@ -71,7 +65,6 @@
       pkgs = import nixpkgs { };
     in
     {
-
       homeConfigurations.${username} = home-manager.lib.homeManagerConfiguration {
         inherit pkgs;
         extraSpecialArgs = {
@@ -82,13 +75,11 @@
           niri.homeModules.config
           agenix.homeManagerModules.age
 
-          # add declarative rust modules
           (
             { pkgs, ... }:
             {
               nixpkgs.overlays = [
                 rust-overlay.overlays.default
-                niri.overlays.niri
               ];
 
               # home-manager stuff

home-manager/gui.nix

@@ -87,6 +87,7 @@
     xdg-utils # xdg utils
 
     puddletag
+    picard
 
     inputs.zen-browser.packages."${pkgs.system}".specific
 

home-manager/progs/borg.nix

@@ -3,24 +3,21 @@
 
   home = {
     location = {
-      sourceDirectories =
-        # stuff in my home directory:
-        (
-          map (f: "${homeDirectory}/${f}") [
-            ".zen"
-            ".local/share/fish"
-            ".gnupg"
-            ".config/Signal"
-            ".wallpaper.png"
-            ".ssh"
+      sourceDirectories = (
+        map (f: "${homeDirectory}/${f}") [
+          ".zen"
+          ".local/share/fish"
+          ".config/Signal"
+          ".wallpaper.png"
+          ".ssh"
 
-            "Documents"
-            "projects"
-            "Pictures"
-            "school"
-            "justfile"
-          ]
-        );
+          "Documents"
+          "projects"
+          "Pictures"
+          "school"
+          "justfile"
+        ]
+      );
 
       excludeHomeManagerSymlinks = true;
       repositories = [ "ssh://server-public/tank/bak/laptop" ];

home-manager/progs/gpt4all-HEAD-disable-settings-err.patch

@@ -1,19 +0,0 @@
-diff --git a/main.qml b/main.qml
-index 1e685385..7c747eba 100644
---- a/main.qml
-+++ b/main.qml
-@@ -72,12 +72,14 @@ Window {
-             return;
-         }
- 
-+        /*
-         // check if we have access to settings and if not show an error
-         if (!hasShownSettingsAccess && !LLM.hasSettingsAccess()) {
-             errorSettingsAccess.open();
-             hasShownSettingsAccess = true;
-             return;
-         }
-+        */
- 
-         // check for first time start of this version
-         if (!hasCheckedFirstStart) {

home-manager/progs/gpt4all/gpt4all-HEAD-embeddings-model.patch

@@ -1,53 +0,0 @@
-commit 425b33877c819dd88f3692aae37452c767371f6b
-Author: Simon Gardling <titaniumtown@proton.me>
-Date:   Thu Sep 19 10:00:39 2024 -0400
-
-    use locally downloaded embeddings
-
-diff --git a/gpt4all-chat/CMakeLists.txt b/gpt4all-chat/CMakeLists.txt
-index 900307ae..802fc31a 100644
---- a//CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -120,6 +120,7 @@ elseif (APPLE)
- endif()
- 
- # Embedding model
-+#[[
- set(LOCAL_EMBEDDING_MODEL "nomic-embed-text-v1.5.f16.gguf")
- set(LOCAL_EMBEDDING_MODEL_MD5 "a5401e7f7e46ed9fcaed5b60a281d547")
- set(LOCAL_EMBEDDING_MODEL_PATH "${CMAKE_BINARY_DIR}/resources/${LOCAL_EMBEDDING_MODEL}")
-@@ -134,6 +135,7 @@ message(STATUS "Embedding model downloaded to ${LOCAL_EMBEDDING_MODEL_PATH}")
- if (APPLE)
-     list(APPEND CHAT_EXE_RESOURCES "${LOCAL_EMBEDDING_MODEL_PATH}")
- endif()
-+]]
- 
- set(QAPPLICATION_CLASS QGuiApplication)
- add_subdirectory(deps/SingleApplication)
-@@ -348,11 +350,13 @@ if (LLMODEL_CUDA)
-     endif()
- endif()
- 
-+#[[
- if (NOT APPLE)
-     install(FILES "${LOCAL_EMBEDDING_MODEL_PATH}"
-             DESTINATION resources
-             COMPONENT ${COMPONENT_NAME_MAIN})
- endif()
-+]]
- 
- set(CPACK_GENERATOR "IFW")
- set(CPACK_VERBATIM_VARIABLES YES)
-diff --git a/gpt4all-chat/src/embllm.cpp b/gpt4all-chat/src/embllm.cpp
-index 81b1e9e1..e3266cc7 100644
---- a/src/embllm.cpp
-+++ b/src/embllm.cpp
-@@ -84,7 +84,7 @@ bool EmbeddingLLMWorker::loadModel()
- 
-     QString filePath = embPathFmt.arg(QCoreApplication::applicationDirPath(), LOCAL_EMBEDDING_MODEL);
-     if (!QFileInfo::exists(filePath)) {
--        qWarning() << "embllm WARNING: Local embedding model not found";
-+        qWarning() << "embllm WARNING: Local embedding model not found: " << filePath;
-         return false;
-     }
- 

home-manager/progs/gpt4all/gpt4all.nix

@@ -46,7 +46,6 @@ let
   gpt4all_package = (
     optimizeWithFlags
       (pkgs.gpt4all.overrideAttrs (old: {
-        # https://github.com/NixOS/nixpkgs/pull/344001 3.2.1 -> 3.3.0
         version = "3.4.0-dev0";
         src = pkgs.fetchFromGitHub {
           fetchSubmodules = true;
@@ -56,10 +55,10 @@ let
           sha256 = "/w1VAfLYlhB5y08cVG2u9RT2kajtFtyTPziQXSwVFcE=";
         };
 
-        patches = [
-          ./gpt4all-HEAD-embeddings-model.patch
+        patches = old.patches ++ [
           ./gpt4all-HEAD-disable-settings-err.patch
         ];
+
       }))
       # compile flags
       [

home-manager/system-mreow.nix

@@ -16,7 +16,7 @@
     #manage bluetooth devices
     blueman
 
-    niri-unstable
+    niri
   ];
 
   #bluetooth manager
@@ -30,7 +30,6 @@
 
   #window manager
   programs.niri = {
-    package = pkgs.niri-unstable;
     settings = import ./progs/niri.nix { inherit config pkgs homeDirectory; };
   };