flake.lock: Update

Flake lock file updates: • Updated input 'hyprland': 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=25add26881d7b98d2b80eb7a95d3aee0449b72b9' (2025-01-14) → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=0dc7367a7006cc3cc877d52bf34c4998144bff84' (2025-01-16) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/9abb87b552b7f55ac8916b6fc9e5cb486656a2f3' (2025-01-13) → 'github:nixos/nixpkgs/eb62e6aa39ea67e0b8018ba8ea077efe65807dc8' (2025-01-14) • Updated input 'nixpkgs-wayland': 'github:nix-community/nixpkgs-wayland/07d1519ff6abaf37209529e03da075f990da2479' (2025-01-14) → 'github:nix-community/nixpkgs-wayland/8f3a889a1bb60d58f42fc671d8a0b73496ede51c' (2025-01-15) • Updated input 'treefmt-nix': 'github:numtide/treefmt-nix/13c913f5deb3a5c08bb810efd89dc8cb24dd968b' (2025-01-06) → 'github:numtide/treefmt-nix/97871d416166803134ba64597a1006f3f670fbde' (2025-01-16)
fix llm module
2025-02-05 09:14:17 -06:00 · 2025-01-16 21:04:22 +00:00 · 2025-01-16 14:48:29 -06:00 · 2025-01-16 14:32:15 -06:00 · 2025-01-15 13:22:22 -06:00 · 2025-01-15 13:19:16 -06:00
11 changed files with 81 additions and 182 deletions
--- a/flake.lock
+++ b/flake.lock
@ -91,22 +91,6 @@
      }
    },
    "flake-compat_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-compat_3": {
      "flake": false,
      "locked": {
        "lastModified": 1733328505,
@ -122,7 +106,7 @@
        "type": "github"
      }
    },
-    "flake-compat_4": {
+    "flake-compat_3": {
      "locked": {
        "lastModified": 1717312683,
        "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=",
@ -161,25 +145,7 @@
    },
    "flake-utils": {
      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1705309234,
-        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_3"
+        "systems": "systems_2"
      },
      "locked": {
        "lastModified": 1731533236,
@ -195,9 +161,9 @@
        "type": "github"
      }
    },
-    "flake-utils_3": {
+    "flake-utils_2": {
      "inputs": {
-        "systems": "systems_4"
+        "systems": "systems_3"
      },
      "locked": {
        "lastModified": 1726560853,
@ -213,9 +179,9 @@
        "type": "github"
      }
    },
-    "flake-utils_4": {
+    "flake-utils_3": {
      "inputs": {
-        "systems": "systems_5"
+        "systems": "systems_4"
      },
      "locked": {
        "lastModified": 1731533236,
@ -246,32 +212,6 @@
        "type": "github"
      }
    },
-    "ghostty": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "nixpkgs-stable": [
-          "nixpkgs"
-        ],
-        "nixpkgs-unstable": [
-          "nixpkgs"
-        ],
-        "zig": "zig"
-      },
-      "locked": {
-        "lastModified": 1735678070,
-        "narHash": "sha256-BiXFNeoL+BYpiqzCuDIrZGQ6JVI8cBOXerJH48CbnxU=",
-        "ref": "refs/tags/v1.0.1",
-        "rev": "4fdb1d7d47544e4b3912e32343f4075c5a9744b8",
-        "revCount": 8696,
-        "type": "git",
-        "url": "https://github.com/ghostty-org/ghostty.git"
-      },
-      "original": {
-        "ref": "refs/tags/v1.0.1",
-        "type": "git",
-        "url": "https://github.com/ghostty-org/ghostty.git"
-      }
-    },
    "gitignore": {
      "inputs": {
        "nixpkgs": [
@ -366,15 +306,15 @@
          "nixpkgs"
        ],
        "pre-commit-hooks": "pre-commit-hooks",
-        "systems": "systems_2",
+        "systems": "systems",
        "xdph": "xdph"
      },
      "locked": {
-        "lastModified": 1736873552,
-        "narHash": "sha256-lGZv+YcdDXYowKJf7vaeu97o7JKFzTL/vzS8WxTT+UM=",
+        "lastModified": 1737038559,
+        "narHash": "sha256-iSJIeZz2Bto/RiZN1scp4hfvnEAc+IhIRGxD2V3iu+c=",
        "ref": "refs/heads/main",
-        "rev": "25add26881d7b98d2b80eb7a95d3aee0449b72b9",
-        "revCount": 5672,
+        "rev": "0dc7367a7006cc3cc877d52bf34c4998144bff84",
+        "revCount": 5674,
        "submodules": true,
        "type": "git",
        "url": "https://github.com/hyprwm/Hyprland/"
@ -496,11 +436,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1731684150,
-        "narHash": "sha256-jY0bRx2SWuLU02nwDE8Q5bPuMMSiUISJYaH4GWfUFc4=",
+        "lastModified": 1736893905,
+        "narHash": "sha256-ClktBES0JrbUU1RUFGWpcbIekKPZdHkr11J6iBFZrr8=",
        "ref": "refs/heads/main",
-        "rev": "888c8e4c9395e7abfcbfc044d575ff6cf955672a",
-        "revCount": 21,
+        "rev": "a3784287446cbdffb4dcb0558e9d4351a4792253",
+        "revCount": 23,
        "type": "git",
        "url": "https://git.dayl.in/daylin/hyprman.git"
      },
@ -561,7 +501,7 @@
    },
    "jj": {
      "inputs": {
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils",
        "nixpkgs": [
          "nixpkgs"
        ],
@ -584,7 +524,7 @@
    },
    "lib-aggregate": {
      "inputs": {
-        "flake-utils": "flake-utils_4",
+        "flake-utils": "flake-utils_3",
        "nixpkgs-lib": "nixpkgs-lib"
      },
      "locked": {
@ -617,7 +557,7 @@
    },
    "lix-module": {
      "inputs": {
-        "flake-utils": "flake-utils_3",
+        "flake-utils": "flake-utils_2",
        "flakey-profile": "flakey-profile",
        "lix": "lix",
        "nixpkgs": [
@ -776,7 +716,7 @@
    },
    "nixos-wsl": {
      "inputs": {
-        "flake-compat": "flake-compat_3",
+        "flake-compat": "flake-compat_2",
        "nixpkgs": "nixpkgs"
      },
      "locked": {
@ -826,17 +766,17 @@
    },
    "nixpkgs-wayland": {
      "inputs": {
-        "flake-compat": "flake-compat_4",
+        "flake-compat": "flake-compat_3",
        "lib-aggregate": "lib-aggregate",
        "nix-eval-jobs": "nix-eval-jobs",
        "nixpkgs": "nixpkgs_4"
      },
      "locked": {
-        "lastModified": 1736879154,
-        "narHash": "sha256-aN0v2sr9o2zVoolZvoxOZuRRiACTRN1ySKZxDyvynxc=",
+        "lastModified": 1736965550,
+        "narHash": "sha256-u34e02DgidNBbJ2ZPUWlNZeqQTo7tCGT8LN9dZphNAY=",
        "owner": "nix-community",
        "repo": "nixpkgs-wayland",
-        "rev": "07d1519ff6abaf37209529e03da075f990da2479",
+        "rev": "8f3a889a1bb60d58f42fc671d8a0b73496ede51c",
        "type": "github"
      },
      "original": {
@ -847,11 +787,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1736798957,
-        "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=",
+        "lastModified": 1736883708,
+        "narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3",
+        "rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8",
        "type": "github"
      },
      "original": {
@ -947,7 +887,7 @@
    },
    "pre-commit-hooks": {
      "inputs": {
-        "flake-compat": "flake-compat_2",
+        "flake-compat": "flake-compat",
        "gitignore": "gitignore",
        "nixpkgs": [
          "hyprland",
@ -972,7 +912,6 @@
      "inputs": {
        "NixVirt": "NixVirt",
        "f1multiviewer": "f1multiviewer",
-        "ghostty": "ghostty",
        "hyprland": "hyprland",
        "hyprland-contrib": "hyprland-contrib",
        "hyprman": "hyprman",
@ -1050,21 +989,6 @@
      }
    },
    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_2": {
      "locked": {
        "lastModified": 1689347949,
        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
@ -1079,6 +1003,21 @@
        "type": "github"
      }
    },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
    "systems_3": {
      "locked": {
        "lastModified": 1681028828,
@ -1109,21 +1048,6 @@
        "type": "github"
      }
    },
-    "systems_5": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
    "treefmt-nix": {
      "inputs": {
        "nixpkgs": [
@ -1151,11 +1075,11 @@
        "nixpkgs": "nixpkgs_5"
      },
      "locked": {
-        "lastModified": 1736154270,
-        "narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=",
+        "lastModified": 1737054102,
+        "narHash": "sha256-saLiCRQ5RtdTnznT/fja7GxcYRAzeY3k8S+IF/2s/2A=",
        "owner": "numtide",
        "repo": "treefmt-nix",
-        "rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b",
+        "rev": "97871d416166803134ba64597a1006f3f670fbde",
        "type": "github"
      },
      "original": {
@ -1250,31 +1174,6 @@
        "repo": "xdg-desktop-portal-hyprland",
        "type": "github"
      }
-    },
-    "zig": {
-      "inputs": {
-        "flake-compat": [
-          "ghostty"
-        ],
-        "flake-utils": "flake-utils",
-        "nixpkgs": [
-          "ghostty",
-          "nixpkgs-stable"
-        ]
-      },
-      "locked": {
-        "lastModified": 1717848532,
-        "narHash": "sha256-d+xIUvSTreHl8pAmU1fnmkfDTGQYCn2Rb/zOwByxS2M=",
-        "owner": "mitchellh",
-        "repo": "zig-overlay",
-        "rev": "02fc5cc555fc14fda40c42d7c3250efa43812b43",
-        "type": "github"
-      },
-      "original": {
-        "owner": "mitchellh",
-        "repo": "zig-overlay",
-        "type": "github"
-      }
    }
  },
  "root": "root",
--- a/flake.nix
+++ b/flake.nix
@ -38,15 +38,15 @@
      inputs.nixpkgs.follows = "nixpkgs";
    };

-    # https://github.com/NixOS/nixpkgs/pull/368404 replace when PR merged?
-    # https://github.com/ghostty-org/ghostty/issues/2025
-    ghostty = {
-      url = "git+https://github.com/ghostty-org/ghostty.git?ref=refs/tags/v1.0.1";
-      inputs = {
-        nixpkgs-stable.follows = "nixpkgs";
-        nixpkgs-unstable.follows = "nixpkgs";
-      };
-    };
+    # using nixpkgs version now
+    # # https://github.com/ghostty-org/ghostty/issues/2025
+    # ghostty = {
+    #   url = "git+https://github.com/ghostty-org/ghostty.git?ref=refs/tags/v1.0.1";
+    #   inputs = {
+    #     nixpkgs-stable.follows = "nixpkgs";
+    #     nixpkgs-unstable.follows = "nixpkgs";
+    #   };
+    # };

    hyprland.url = "git+https://github.com/hyprwm/Hyprland/?submodules=1";
    hyprland.inputs.nixpkgs.follows = "nixpkgs";
--- a/hosts/othalan/settings/pkgs
+++ b/hosts/othalan/settings/pkgs
@ -1,8 +1,9 @@
 flake:utils
-flake:ghostty
+ghostty
 sops
 attic-client
 distrobox
+firefox
 zk
 graphviz
 charm-freeze
--- a/modules/llm/default.nix
+++ b/modules/llm/default.nix
@ -1,25 +1,10 @@
 {
-  pkgs,
  config,
-  mkOizysModule,
  flake,
+  mkOizysModule,
  ...
 }:

-let
-  selfPackages = (flake.pkgs "self");
-  pyWithLlm = (
-    pkgs.python3.withPackages (_: [
-      selfPackages.llm
-      selfPackages.llm-claude-3
-    ])
-  );
-  llm-with-plugins = (
-    pkgs.writeShellScriptBin "llm" ''
-      exec ${pyWithLlm}/bin/llm "$@"
-    ''
-  );
-in
 mkOizysModule config "llm" {
-  environment.systemPackages = [ llm-with-plugins ];
+  environment.systemPackages = [ (flake.pkgs "self").llm-with-plugins ];
 }
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@ -1,7 +1,4 @@
 { pkgs, ... }:
-let
-  inherit (pkgs) python3Packages;
-in
 {
  nimlangserver = pkgs.callPackage ./nim/nimlangserver { };
  procs = pkgs.callPackage ./nim/procs { };
@ -9,6 +6,5 @@ in

  distrobox = pkgs.callPackage ./distrobox { };

-  llm = python3Packages.callPackage ./llm { };
-  llm-claude-3 = python3Packages.callPackage ./llm-plugins/llm-claude-3 { };
+  llm-with-plugins = pkgs.callPackage ./llm/llm-with-plugins { };
 }
--- a/pkgs/llm-plugins/llm-claude-3/default.nix
+++ b/pkgs/llm-plugins/llm-claude-3/default.nix
--- a/pkgs/llm-plugins/llm-ollama/default.nix
+++ b/pkgs/llm-plugins/llm-ollama/default.nix
--- a/pkgs/llm/llm-with-plugins/default.nix
+++ b/pkgs/llm/llm-with-plugins/default.nix
@ -0,0 +1,19 @@
+{
+  pkgs,
+  ...
+}:
+let
+  inherit (pkgs) python3Packages;
+  llm = python3Packages.callPackage ../llm { };
+  llm-claude-3 = python3Packages.callPackage ../llm-claude-3 { };
+
+  pyWithLlm = (
+    pkgs.python3.withPackages (_: [
+      llm
+      llm-claude-3
+    ])
+  );
+in
+pkgs.writeShellScriptBin "llm" ''
+  exec ${pyWithLlm}/bin/llm "$@"
+''
--- a/pkgs/llm/llm/default.nix
+++ b/pkgs/llm/llm/default.nix
--- a/pkgs/nim/nimlangserver/default.nix
+++ b/pkgs/nim/nimlangserver/default.nix
@ -1,12 +1,11 @@
 { fetchFromGitHub, buildNimPackage }:
 buildNimPackage (finalAttrs: {
  pname = "nimlangserver";
-  version = "1.6.0-unstable";
+  version = "1.8.0";
  src = fetchFromGitHub {
    owner = "nim-lang";
    repo = "langserver";
-    rev = "5adc15be0f785f0caa3b7fc444e54eeb5596602a";
-    # rev = "v${finalAttrs.version}";
+    rev = "v${finalAttrs.version}";
    hash = "sha256-JyBjHAP/sxQfQ1XvyeZyHsu0Er5D7ePDGyJK7Do5kyk=";
  };

--- a/pkgs/oizys/src/oizys/nix.nim
+++ b/pkgs/oizys/src/oizys/nix.nim
@ -104,7 +104,7 @@ proc parseDryRunOutput(err: string): DryRunOutput =
      elif line.contains("will be fetched"):
        result.toFetch = drvs
      else:
-        fatal "expected on of the lines to contain built or fetched check the output below"
+        fatal """expected at least one of the lines to contain "built" or "fetched", check the output below"""
        stderr.writeLine err
        quit()
    of 0:
Author	SHA1	Message	Date
daylin-bot	e4fb3d6e64	flake.lock: Update Flake lock file updates: • Updated input 'hyprland': 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=25add26881d7b98d2b80eb7a95d3aee0449b72b9' (2025-01-14) → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=0dc7367a7006cc3cc877d52bf34c4998144bff84' (2025-01-16) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/9abb87b552b7f55ac8916b6fc9e5cb486656a2f3' (2025-01-13) → 'github:nixos/nixpkgs/eb62e6aa39ea67e0b8018ba8ea077efe65807dc8' (2025-01-14) • Updated input 'nixpkgs-wayland': 'github:nix-community/nixpkgs-wayland/07d1519ff6abaf37209529e03da075f990da2479' (2025-01-14) → 'github:nix-community/nixpkgs-wayland/8f3a889a1bb60d58f42fc671d8a0b73496ede51c' (2025-01-15) • Updated input 'treefmt-nix': 'github:numtide/treefmt-nix/13c913f5deb3a5c08bb810efd89dc8cb24dd968b' (2025-01-06) → 'github:numtide/treefmt-nix/97871d416166803134ba64597a1006f3f670fbde' (2025-01-16)	2025-01-16 21:04:22 +00:00
Daylin Morgan	10bc61746e	fix llm module	2025-01-16 14:48:29 -06:00
Daylin Morgan	d27d5b9a52	needlessly reorganize llm and plugins	2025-01-16 14:32:15 -06:00
Daylin Morgan	18013da777	fix typo in oizys	2025-01-15 13:22:22 -06:00
Daylin Morgan	488742e77c	use nixpkgs ghostty	2025-01-15 13:19:16 -06:00
Daylin Morgan	ca38052fe2	update nimlangserver	2025-01-15 10:27:18 -06:00
Daylin Morgan	079457282d	flake.lock: Update Flake lock file updates: • Updated input 'hyprman': 'git+https://git.dayl.in/daylin/hyprman.git?ref=refs/heads/main&rev=888c8e4c9395e7abfcbfc044d575ff6cf955672a' (2024-11-15) → 'git+https://git.dayl.in/daylin/hyprman.git?ref=refs/heads/main&rev=a3784287446cbdffb4dcb0558e9d4351a4792253' (2025-01-14)	2025-01-14 16:52:24 -06:00
Daylin Morgan	664c044143	add firefox	2025-01-14 16:50:01 -06:00