flake.lock: Update

Flake lock file updates: • Updated input 'hyprland': 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=ea728315410e220d73a993f17c83ae9dc9be9015' (2024-08-07) → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=9a09eac79b85c846e3a865a9078a3f8ff65a9259' (2024-08-07) • Updated input 'lix': 'ec7552ff74.tar.gz?narHash=sha256-fn8r4zVTCfLo1ruMbmzDB08N2giu3zWw/na2Jn/X6GQ%3D' (2024-08-07) → '6fdb47f0b2.tar.gz?narHash=sha256-JefJQFq8Y5iPXER0vQ0pXkgSbdim%2BCiuHF0qOaV7t6Y%3D' (2024-08-07) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/2a13929e1f191b3690dd2f2db13098b04adb9043' (2024-08-06) → 'github:nixos/nixpkgs/f5129fb42b9c262318130a97b47516946da3e7d7' (2024-08-07) • Updated input 'nixpkgs-wayland': 'github:nix-community/nixpkgs-wayland/5acf5ce79d80e23a2426b8a553a4d4b5996fef46' (2024-08-07) → 'github:nix-community/nixpkgs-wayland/526290c52272f08f7f3b5b36ef67012a60600e5e' (2024-08-07)
2024-11-09 16:23:15 -06:00 · 2024-08-08 00:35:01 +00:00
12 changed files with 51 additions and 172 deletions
--- a/flake.lock
+++ b/flake.lock
@ -341,11 +341,11 @@
        "xdph": "xdph"
      },
      "locked": {
-        "lastModified": 1723143710,
-        "narHash": "sha256-qbjodK+UgnQ2YdtKmuI1XEG84SZlid39rQo6Ap9NTqI=",
+        "lastModified": 1723058230,
+        "narHash": "sha256-deu8zvgseDg2gQEnZiCda4TrbA6pleE9iItoZlsoMtE=",
        "ref": "refs/heads/main",
-        "rev": "4b4971c06fb02df00a2bd20b6b47b5d0e7d799a7",
-        "revCount": 5071,
+        "rev": "9a09eac79b85c846e3a865a9078a3f8ff65a9259",
+        "revCount": 5069,
        "submodules": true,
        "type": "git",
        "url": "https://github.com/hyprwm/Hyprland/"
@ -534,11 +534,11 @@
    "lix": {
      "flake": false,
      "locked": {
-        "lastModified": 1723140921,
-        "narHash": "sha256-WRt4kYvg6cpnatF5zUCIUeurU67M7b4dk3oYdZ0cu9M=",
-        "rev": "e03cd8b3a6f70c60f359fd683c2b25f8eba4da0d",
+        "lastModified": 1723067281,
+        "narHash": "sha256-JefJQFq8Y5iPXER0vQ0pXkgSbdim+CiuHF0qOaV7t6Y=",
+        "rev": "6fdb47f0b259a9ffbe4bdb349d6aaf03a0144092",
        "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/e03cd8b3a6f70c60f359fd683c2b25f8eba4da0d.tar.gz"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/6fdb47f0b259a9ffbe4bdb349d6aaf03a0144092.tar.gz"
      },
      "original": {
        "type": "tarball",
@ -663,11 +663,11 @@
        "nixpkgs": "nixpkgs_3"
      },
      "locked": {
-        "lastModified": 1723124175,
-        "narHash": "sha256-w+rlZdbj4kn70uPJl4WrPDFoGEy0A9oJqw684nvZ9dY=",
+        "lastModified": 1722253092,
+        "narHash": "sha256-37vyqHPx57deHhwvi4jwyNQLYkhm/rlVTYKOG1iahsc=",
        "owner": "nix-community",
        "repo": "NixOS-WSL",
-        "rev": "be1a6b2e4ddc34b9b6a297e7df2f2a2ecee24690",
+        "rev": "f373ad59ae5866f0f98216bd5c71526b373450d2",
        "type": "github"
      },
      "original": {
@ -715,11 +715,11 @@
        "nixpkgs": "nixpkgs_6"
      },
      "locked": {
-        "lastModified": 1723137378,
-        "narHash": "sha256-+MkYW9iZwi0D0hLeS5S1Ov3VNJ3twdTlHW7dRKeiCBY=",
+        "lastModified": 1723065524,
+        "narHash": "sha256-tDVR90hCs2WOJkyNxw/WX7RfelEENWO3d29rTR5sTf8=",
        "owner": "nix-community",
        "repo": "nixpkgs-wayland",
-        "rev": "b412353cee03010813974408d5ae63f7422b176d",
+        "rev": "526290c52272f08f7f3b5b36ef67012a60600e5e",
        "type": "github"
      },
      "original": {
@ -1156,11 +1156,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1723080195,
-        "narHash": "sha256-0g2ljOHZZtEZZG9GKusKiNx1+VKm+MEKzCOL2KdkLRg=",
+        "lastModified": 1722993798,
+        "narHash": "sha256-cXzpRh+nUTBqo4mU+jzG4otZcpTfo29DC0apTmH2gtU=",
        "owner": "Cloudef",
        "repo": "zig2nix",
-        "rev": "7320da37a4d45afb0aa94d22861a0fe07152c038",
+        "rev": "5a0307b91ad2cd6c60fd5817b6a88108e254730a",
        "type": "github"
      },
      "original": {
--- a/hosts/othalan/default.nix
+++ b/hosts/othalan/default.nix
@ -1,4 +1,4 @@
-{ enabled, config, ... }:
+{ enabled, ... }:
 {
  oizys = {
    vpn = enabled;
@ -11,7 +11,6 @@
    };
    vbox = enabled;
    backups = enabled;
-    hp-scanner = enabled;
    languages = [
      "misc"
      "nim"
@ -22,7 +21,6 @@
      "tex"
      "zig"
    ];
-    llm = enabled;
  };

  services.restic.backups.gdrive = {
@ -35,5 +33,5 @@
    ];
  };

-  users.users.${config.oizys.user}.extraGroups = [ "audio" ];
+  users.users.daylin.extraGroups = [ "audio" ];
 }
--- a/hosts/othalan/system.nix
+++ b/hosts/othalan/system.nix
@ -7,6 +7,13 @@
  };

  services.printing = enabled;
+  hardware.sane = enabled // {
+    extraBackends = [ pkgs.hplipWithPlugin ];
+  };
+  users.users.daylin.extraGroups = [
+    "scanner"
+    "lp"
+  ];

  # https://github.com/NixOS/nixos-hardware/blob/c478b3d56969006e015e55aaece4931f3600c1b2/lenovo/thinkpad/x1/9th-gen/default.nix
  # https://github.com/NixOS/nixos-hardware/blob/c478b3d56969006e015e55aaece4931f3600c1b2/common/pc/ssd/default.nix
--- a/lib/checks.nix
+++ b/lib/checks.nix
@ -10,22 +10,12 @@ let
  flake = flakeFromSystem system;
  pkgs = import inputs.nixpkgs {
    inherit system;
-    overlays = [
-      (flake.overlay "lix-module")
-      (flake.overlay "hyprland-contrib")
-      (flake.overlay "nixpkgs-wayland")
-    ];
+    overlays = map [
+      "lix-module"
+      "hyprland-contrib"
+      "nixpkgs-wayland"
+    ] flake.overlay;
  };
-  myPackages = map [
-    "tsm"
-    "hyprman"
-    "zls"
-  ] flake.pkg;
-
-  hyprPackages = with (flake.pkgs "hyprland"); [
-    default
-    xdg-desktop-portal-hyprland
-  ];
 in
 {
  makePackages =
@ -33,18 +23,24 @@ in
      {
        src = ./.;
        nativeBuildInputs =
-          (with pkgs; [
-            pixi
-            swww
-            nixVersions.stable
+          [
+            pkgs.pixi
+            pkgs.swww
+            pkgs.nixVersions.stable
+          ]
+          ++ (map [
+            "tsm"
+            "hyprman"
+            "zls"
+          ] flake.pkg)
+          ++ (with flake.pkgs "hyprland"; [
+            default
+            xdg-desktop-portal-hyprland
          ])
          ++ [
            (flake.pkgs "roc").full
            (flake.pkgs "zig2nix").zig.master.bin
-          ]
-          ++ myPackages
-          ++ hyprPackages;
-
+          ];
      }
      ''
        mkdir "$out"
--- a/modules/desktop/window-managers/hyprland.nix
+++ b/modules/desktop/window-managers/hyprland.nix
@ -47,9 +47,6 @@ mkOizysModule config "hyprland" {
      swww

      catppuccin-cursors.mochaDark
-
-      # not even clear why I need to add this but ¯\_(ツ)_/¯
-      kdePackages.qtwayland
    ])
    ++ [ (flake.pkg "hyprman") ]

--- a/modules/llm/default.nix
+++ b/modules/llm/default.nix
@ -1,24 +0,0 @@
-{
-  pkgs,
-  config,
-  enabled,
-  mkOizysModule,
-  ...
-}:
-
-let
-  inherit (pkgs) python3Packages;
-  llm-ollama = python3Packages.callPackage ../../pkgs/llm-plugins/llm-ollama { };
-  llm-claude3 = python3Packages.callPackage ../../pkgs/llm-plugins/llm-claude-3 { };
-  llm = (
-    pkgs.llm.withPlugins [
-      llm-ollama
-      llm-claude3
-    ]
-  );
-in
-
-mkOizysModule config "llm" {
-  services.ollama = enabled;
-  environment.systemPackages = [ llm ];
-}
--- a/modules/oizys.nix
+++ b/modules/oizys.nix
@ -28,7 +28,6 @@ in

    gui
    fonts
-    hp-scanner

    languages

@ -38,8 +37,6 @@ in

    nix-ld
    restic
-
-    llm
  ];

  options.oizys = {
--- a/modules/runes/default.nix
+++ b/modules/runes/default.nix
@ -25,7 +25,6 @@ let
      kind ? "braille",
    }:
    "[1;3${number}m\n" + runes.${name}.${kind} + "\n[0m";
-
  cfg = config.oizys.rune;
 in
 {
--- a/modules/runes/generate.nu
+++ b/modules/runes/generate.nu
@ -20,7 +20,7 @@ def convert [] {
  }
 }

-def nix-file [] {
+def nix [] {
  let rune = $in | convert
  $"{
 braille = ''
@ -34,7 +34,8 @@ ascii = ''
 }

 def col [] {
-  $in | reduce --fold "" {|it, acc|
+  $in
+  | reduce --fold "" {|it, acc|
      $acc + $'<td><img src="($it.url)"></td>'
    }
 }
@ -44,7 +45,7 @@ def row [] { $"<tr>($in)</tr>" }
 def readme [] {
  let runes = $in
  let dims = { rows: 2 cols: 2 }
-  let cells = ($runes | chunks $dims.rows | each { col | row})
+  let cells = ($runes | chunks $dims.rows | each { $in | col | row})
  let table = [ "<table>" ...$cells "</table>" ] | str join

  $"# Runes\n\n($table)\n"
@ -55,7 +56,7 @@ $runes
 | save -f "README.md"

 $runes
-| each { nix-file }
+| each {|rune| $rune | nix }


-nix fmt
+print "don't forget to run `nix fmt`!"
--- a/modules/services/scanner/hp-scanner.nix
+++ b/modules/services/scanner/hp-scanner.nix
@ -1,25 +0,0 @@
-{
-  enabled,
-  config,
-  pkgs,
-  mkOizysModule,
-  ...
-}:
-mkOizysModule config "hp-scanner" {
-
-  environment.systemPackages = [ pkgs.kdePackages.skanpage ];
-
-  hardware.sane = enabled // {
-    extraBackends = [ pkgs.hplipWithPlugin ];
-  };
-
-  services.avahi = enabled // {
-    nssmdns4 = true;
-  };
-
-  users.users.${config.oizys.user}.extraGroups = [
-    "scanner"
-    "lp"
-  ];
-
-}
--- a/pkgs/llm-plugins/llm-claude-3/default.nix
+++ b/pkgs/llm-plugins/llm-claude-3/default.nix
@ -1,34 +0,0 @@
-{
-  buildPythonPackage,
-  fetchFromGitHub,
-
-  # build-system
-  setuptools,
-  wheel,
-
-  # deps
-  anthropic,
-  ...
-}:
-
-buildPythonPackage rec {
-  pname = "llm-claude-3";
-  version = "0.4";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "simonw";
-    repo = "llm-claude-3";
-    rev = version;
-    hash = "sha256-5qF5BK319PNzB4XsLdYvtyq/SxBDdHJ9IoKWEnvNRp4=";
-  };
-
-  nativeBuildInputs = [
-    setuptools
-    wheel
-  ];
-
-  dependencies = [ anthropic ];
-
-  dontCheckRuntimeDeps = true;
-}
--- a/pkgs/llm-plugins/llm-ollama/default.nix
+++ b/pkgs/llm-plugins/llm-ollama/default.nix
@ -1,33 +0,0 @@
-{
-  buildPythonPackage,
-  fetchPypi,
-
-  # build-system
-  setuptools,
-
-  # deps
-  ollama,
-  pydantic,
-
-  ...
-}:
-buildPythonPackage rec {
-  pname = "llm-ollama";
-  version = "0.5.0";
-  pyproject = true;
-  src = fetchPypi {
-    inherit version;
-    pname = "llm_ollama";
-    hash = "sha256-M3FF9fAZ2rr+toKoz/rLRPZxB7LIHqmZQXJBdKR4fVk=";
-  };
-
-  dependencies = [
-    ollama
-    pydantic
-  ];
-
-  build-system = [ setuptools ];
-
-  # will only be used in environment with llm installed
-  dontCheckRuntimeDeps = true;
-}