flake.lock: Update

Flake lock file updates: • Updated input 'f1multiviewer': 'github:daylinmorgan/f1multiviewer-flake/3cca24a07f71b2c13a079ac60ac9cedfbc0981e7' (2024-09-01) → 'github:daylinmorgan/f1multiviewer-flake/663a121c6b36ab86ea039dc15e7aff7710703e78' (2024-09-13) • Updated input 'hyprland': 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=8b9e385943d1a9fd0f8c6070fa1eae507ae26145' (2024-09-11) → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=e74efd87e5aa38f9cf84cb3848ee1ab26e5e4bcb' (2024-09-14) • Updated input 'lix': '24db81eaf2.tar.gz?narHash=sha256-tB4Y3Rrv67ZdEo3HJzxYL5XX9wqtvWwIX1z8k399W0s%3D&rev=24db81eaf28259ab8f8334ccd6368673a26ed422' (2024-09-11) → '727258241f.tar.gz?narHash=sha256-SqATcoZoC90sjVXmjBpvXAiksQfTGR08nuZh4h8esY0%3D&rev=727258241fc0b3c02691b72302d2c3092baca275' (2024-09-14) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/1355a0cbfeac61d785b7183c0caaec1f97361b43' (2024-09-10) → 'github:nixos/nixpkgs/4f807e8940284ad7925ebd0a0993d2a1791acb2f' (2024-09-11) • Updated input 'nixpkgs-wayland': 'github:nix-community/nixpkgs-wayland/5d6271a06b79364aa838cdc68c5852d383b17236' (2024-09-11) → 'github:nix-community/nixpkgs-wayland/f7a91cffe777b139d0b4e4e54d480950018ab37b' (2024-09-14) • Updated input 'nixpkgs-wayland/nixpkgs': 'github:nixos/nixpkgs/1355a0cbfeac61d785b7183c0caaec1f97361b43' (2024-09-10) → 'github:nixos/nixpkgs/4f807e8940284ad7925ebd0a0993d2a1791acb2f' (2024-09-11) • Updated input 'roc': 'github:roc-lang/roc/3d9c4673af25349be43e0e8e703a0f4b36176577' (2024-09-10) → 'github:roc-lang/roc/1993cd336b95b9b76d22db1e9e7821de68263910' (2024-09-12) • Updated input 'tsm': 'github:daylinmorgan/tsm/15e5cf6933a319503697f53d287e817fcafe7949?dir=nix' (2024-09-05) → 'github:daylinmorgan/tsm/8c866db5f020cbdbe9ea9123ce4b92478b41ede5?dir=nix' (2024-09-14) • Updated input 'zig-overlay': 'github:mitchellh/zig-overlay/4dedc1009bf778d0fbd9fbbddce39a696eb5fb9b' (2024-09-09) → 'github:mitchellh/zig-overlay/25f9cfc60ec930a6abb0be1ff89b3e27cda1cb59' (2024-09-14)
add temporary fix
2024-12-23 11:00:44 -06:00 · 2024-09-14 23:12:49 +00:00 · 2024-09-14 18:09:05 -05:00 · 2024-09-14 11:14:03 -05:00 · 2024-09-14 10:46:54 -05:00 · 2024-09-13 15:09:45 -05:00
15 changed files with 126 additions and 293 deletions
--- a/.github/actions/clean-disk/action.yml
+++ b/.github/actions/clean-disk/action.yml
@ -37,7 +37,6 @@ runs:
          if [[ "${{ inputs.purge-packages }}" == 'true' ]]; then
            sudo apt-get purge \
              --allow-remove-essential \
-              -qq \
              $(non_manifest_packages) # > /dev/null
          fi

--- a/flake.lock
+++ b/flake.lock
@ -40,11 +40,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1725155313,
-        "narHash": "sha256-Oc9KLFLVU+bNGPh2MHqt0EXwqVgIDN/Ndb89dK+E/z8=",
+        "lastModified": 1726248534,
+        "narHash": "sha256-NYDOvN3Y9r8F0tHE2Yh7lzoGN3OhfieYjFV9QzlEdhc=",
        "owner": "daylinmorgan",
        "repo": "f1multiviewer-flake",
-        "rev": "3cca24a07f71b2c13a079ac60ac9cedfbc0981e7",
+        "rev": "663a121c6b36ab86ea039dc15e7aff7710703e78",
        "type": "github"
      },
      "original": {
@ -323,11 +323,11 @@
        "xdph": "xdph"
      },
      "locked": {
-        "lastModified": 1726071051,
-        "narHash": "sha256-eZPhLQ8DM8AsP+zM1KmUzxWQaiTpOUbFS1xeOyjgwvg=",
+        "lastModified": 1726353438,
+        "narHash": "sha256-DLSpQXNt6LLkhREYrnhU+/XrfDNiSN41iD575ua9+yA=",
        "ref": "refs/heads/main",
-        "rev": "8b9e385943d1a9fd0f8c6070fa1eae507ae26145",
-        "revCount": 5213,
+        "rev": "e74efd87e5aa38f9cf84cb3848ee1ab26e5e4bcb",
+        "revCount": 5221,
        "submodules": true,
        "type": "git",
        "url": "https://github.com/hyprwm/Hyprland/"
@ -504,11 +504,11 @@
    "lix": {
      "flake": false,
      "locked": {
-        "lastModified": 1726016547,
-        "narHash": "sha256-tB4Y3Rrv67ZdEo3HJzxYL5XX9wqtvWwIX1z8k399W0s=",
-        "rev": "24db81eaf28259ab8f8334ccd6368673a26ed422",
+        "lastModified": 1726342126,
+        "narHash": "sha256-SqATcoZoC90sjVXmjBpvXAiksQfTGR08nuZh4h8esY0=",
+        "rev": "727258241fc0b3c02691b72302d2c3092baca275",
        "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/24db81eaf28259ab8f8334ccd6368673a26ed422.tar.gz?rev=24db81eaf28259ab8f8334ccd6368673a26ed422"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/727258241fc0b3c02691b72302d2c3092baca275.tar.gz?rev=727258241fc0b3c02691b72302d2c3092baca275"
      },
      "original": {
        "type": "tarball",
@ -744,11 +744,11 @@
        "nixpkgs": "nixpkgs_6"
      },
      "locked": {
-        "lastModified": 1726058240,
-        "narHash": "sha256-p74soeV48Sry7+wOxDJ8Gqx3JT26lH9AY4+slpJemyw=",
+        "lastModified": 1726348607,
+        "narHash": "sha256-9Y3WXlXemlgmyzusDn4igL6UYg0Ye2fi7fcQL/gg6BA=",
        "owner": "nix-community",
        "repo": "nixpkgs-wayland",
-        "rev": "5d6271a06b79364aa838cdc68c5852d383b17236",
+        "rev": "f7a91cffe777b139d0b4e4e54d480950018ab37b",
        "type": "github"
      },
      "original": {
@ -791,11 +791,11 @@
    },
    "nixpkgs_4": {
      "locked": {
-        "lastModified": 1725983898,
-        "narHash": "sha256-4b3A9zPpxAxLnkF9MawJNHDtOOl6ruL0r6Og1TEDGCE=",
+        "lastModified": 1726062873,
+        "narHash": "sha256-IiA3jfbR7K/B5+9byVi9BZGWTD4VSbWe8VLpp9B/iYk=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "1355a0cbfeac61d785b7183c0caaec1f97361b43",
+        "rev": "4f807e8940284ad7925ebd0a0993d2a1791acb2f",
        "type": "github"
      },
      "original": {
@ -823,11 +823,11 @@
    },
    "nixpkgs_6": {
      "locked": {
-        "lastModified": 1725983898,
-        "narHash": "sha256-4b3A9zPpxAxLnkF9MawJNHDtOOl6ruL0r6Og1TEDGCE=",
+        "lastModified": 1726062873,
+        "narHash": "sha256-IiA3jfbR7K/B5+9byVi9BZGWTD4VSbWe8VLpp9B/iYk=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "1355a0cbfeac61d785b7183c0caaec1f97361b43",
+        "rev": "4f807e8940284ad7925ebd0a0993d2a1791acb2f",
        "type": "github"
      },
      "original": {
@ -900,11 +900,11 @@
        "rust-overlay": "rust-overlay"
      },
      "locked": {
-        "lastModified": 1726002278,
-        "narHash": "sha256-INEUQt5tQkmQtHv+//9+FGFOet2IEJPg/31y8qtsCqs=",
+        "lastModified": 1726146664,
+        "narHash": "sha256-lDUWuoj+iNGdHec5FnzDemhxs7xQgSAMcBlr+vrbTQk=",
        "owner": "roc-lang",
        "repo": "roc",
-        "rev": "3d9c4673af25349be43e0e8e703a0f4b36176577",
+        "rev": "1993cd336b95b9b76d22db1e9e7821de68263910",
        "type": "github"
      },
      "original": {
@ -1112,11 +1112,11 @@
      },
      "locked": {
        "dir": "nix",
-        "lastModified": 1725560270,
-        "narHash": "sha256-daF97eJRmjyGMr/sz+Bdd5ZbPvoLKS2p4edoh35jzto=",
+        "lastModified": 1726326914,
+        "narHash": "sha256-QMOS1KxI1tY3Rxtpc8UkG5vLBonybjJTiNT89ENOvo0=",
        "owner": "daylinmorgan",
        "repo": "tsm",
-        "rev": "15e5cf6933a319503697f53d287e817fcafe7949",
+        "rev": "8c866db5f020cbdbe9ea9123ce4b92478b41ede5",
        "type": "github"
      },
      "original": {
@ -1184,11 +1184,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1725883895,
-        "narHash": "sha256-Nt0LE6HnWoJNSE7eo9XewYwwVm0aZQd4Rta7l+Kav1E=",
+        "lastModified": 1726315777,
+        "narHash": "sha256-lbEfQ3ZWUsmJMeWbrUYDKIIYYas+GUdZVbtgn6txTfU=",
        "owner": "mitchellh",
        "repo": "zig-overlay",
-        "rev": "4dedc1009bf778d0fbd9fbbddce39a696eb5fb9b",
+        "rev": "25f9cfc60ec930a6abb0be1ff89b3e27cda1cb59",
        "type": "github"
      },
      "original": {
--- a/lib/default.nix
+++ b/lib/default.nix
@ -3,7 +3,12 @@ let
  lib = nixpkgs.lib.extend (import ./extended.nix inputs);

  inherit (builtins) mapAttrs readDir listToAttrs;
-  inherit (lib) genAttrs pkgFromSystem pkgsFromSystem loadOverlays;
+  inherit (lib)
+    genAttrs
+    pkgFromSystem
+    pkgsFromSystem
+    loadOverlays
+    ;

  inherit (import ./find-modules.nix { inherit lib; }) findModulesList;
  inherit (import ./generators.nix { inherit lib self inputs; }) mkIso mkSystem;
@ -40,15 +45,17 @@ let
        default = oizys-nim;
        oizys-nim = pkgs.callPackage ../pkgs/oizys-nim { };
        oizys-go = pkgs.callPackage ../pkgs/oizys { };
-        nimlangserver = pkgs.callPackage ../pkgs/nimlangserver { };
+        # nimlangserver = pkgs.callPackage ../pkgs/nimlangserver { };
+        # nph = pkgs.callPackage ../pkgs/nph { };
        iso = mkIso.config.system.build.isoImage;
-        roc = (pkgsFromSystem pkgs.system "roc").full;
+        # roc = (pkgsFromSystem pkgs.system "roc").full;
      }
      // (inheritFlakePkgs pkgs [
        "pixi"
        "f1multiviewer"
        "tsm"
      ])
+      // (import ../pkgs { inherit pkgs; })
    );

    devShells = forAllSystems (pkgs: {
@ -60,13 +67,13 @@ let
        ];
      };
    });
-    # checks = forAllSystems (
-    #   pkgs:
-    #   import ./checks.nix {
-    #     inherit inputs lib self;
-    #     system = pkgs.system;
-    #   }
-    # );
+    checks = forAllSystems (
+      pkgs:
+      import ./checks.nix {
+        inherit inputs lib self;
+        system = pkgs.system;
+      }
+    );
    formatter = forAllSystems (pkgs: pkgs.nixfmt-rfc-style);
  };
 in
--- a/modules/languages/nim.nix
+++ b/modules/languages/nim.nix
@ -2,21 +2,23 @@
  config,
  lib,
  pkgs,
+  flake,
  ...
 }:
 let
  inherit (lib) mkIfIn;
  cfg = config.oizys.languages;
-  nimlangserver = pkgs.callPackage ../../pkgs/nimlangserver { };
 in
 {
  config = mkIfIn "nim" cfg {
    environment.systemPackages =
-      with pkgs;
-      [
+      (with pkgs; [
        nim
+      ])
+      ++ (with (flake.pkgs "self"); [
+        nimlangserver
+        nph
        nimble
-      ]
-      ++ [ nimlangserver ];
+      ]);
  };
 }
--- a/modules/networking/vpn.nix
+++ b/modules/networking/vpn.nix
@ -28,6 +28,10 @@ mkOizysModule config "vpn" {
      '';
      autoStart = false;
      updateResolvConf = true;
+
+      # https://github.com/NixOS/nixpkgs/pull/341223
+      # what happens when PR's are merged without review...
+      extraArgs = [];
    };
  };

--- a/overlays/nimble/default.nix
+++ b/overlays/nimble/default.nix
@ -1,13 +0,0 @@
-{ ... }:
-(final: prev: {
-  nimble = prev.nimble.overrideNimAttrs rec {
-    version = "0.16.0";
-
-    src = final.fetchFromGitHub {
-      owner = "nim-lang";
-      repo = "nimble";
-      rev = "v${version}";
-      hash = "sha256-nsQAUe+soRkWAFPYP5LftBCvQdkC1SpiIORscDsPQB4=";
-    };
-  };
-})
--- a/overlays/nimlangserver/default.nix
+++ b/overlays/nimlangserver/default.nix
@ -1,14 +0,0 @@
-{ ... }:
-(final: prev: {
-  nimlangserver = prev.nimlangserver.overrideNimAttrs rec {
-    version = "1.4.0";
-
-    lockFile = ./lock.json;
-    src = final.fetchFromGitHub {
-      owner = "nim-lang";
-      repo = "langserver";
-      rev = "v${version}";
-      hash = "sha256-mh+p8t8/mbZvgsJ930lXkcBdUjjioZoNyNZzwywAiUI=";
-    };
-  };
-})
--- a/overlays/nimlangserver/lock.json
+++ b/overlays/nimlangserver/lock.json
@ -1,220 +0,0 @@
-{
-  "depends": [
-    {
-      "method": "fetchzip",
-      "path": "/nix/store/l4zs1l1yw4yhf1f8q7r5x5z2szjygr6d-source",
-      "rev": "ba143e029f35fd9b4cd3d89d007cc834d0d5ba3c",
-      "sha256": "1lv3l9c4ifqzlfgpwpvpq2z3994zz1nirg8f59xrnfb7zgbv8l3i",
-      "srcDir": "",
-      "url": "https://github.com/status-im/nim-chronos/archive/ba143e029f35fd9b4cd3d89d007cc834d0d5ba3c.tar.gz",
-      "subDir": "",
-      "packages": [
-        "chronos"
-      ]
-    },
-    {
-      "method": "fetchzip",
-      "path": "/nix/store/q42j4w2f70qfihcrpzgl3fspxihfsadb-source",
-      "rev": "c0ae9e10a9238883d18226fa28a5435c4d305e45",
-      "sha256": "0dxhjg5nf4sc4ga2zrxqcmr1v3ki9irkl603x0y3pz5sd8jdi731",
-      "srcDir": "",
-      "url": "https://github.com/status-im/nim-stint/archive/c0ae9e10a9238883d18226fa28a5435c4d305e45.tar.gz",
-      "subDir": "",
-      "packages": [
-        "stint"
-      ]
-    },
-    {
-      "method": "fetchzip",
-      "path": "/nix/store/jmgpadmdabybhij1srd81xfr873zgfmm-source",
-      "rev": "5065d2cf18dcb9812e25cc0e2c50eb357bde04cf",
-      "sha256": "069fw3h9cjn0hab9vhfri8ibld7yihb8ggyg1nv5vxz6i3x026m5",
-      "srcDir": "",
-      "url": "https://github.com/status-im/nim-http-utils/archive/5065d2cf18dcb9812e25cc0e2c50eb357bde04cf.tar.gz",
-      "subDir": "",
-      "packages": [
-        "httputils"
-      ]
-    },
-    {
-      "method": "fetchzip",
-      "path": "/nix/store/wdj38hf9hdyb1skgb6v0z00kxkdmnq04-source",
-      "rev": "b178f47527074964f76c395ad0dfc81cf118f379",
-      "sha256": "1ir20z9m4wmm0bs2dd2qiq75w0x3skv0yj7sqp6bqfh98ni44xdc",
-      "srcDir": "",
-      "url": "https://github.com/status-im/nim-unittest2/archive/b178f47527074964f76c395ad0dfc81cf118f379.tar.gz",
-      "subDir": "",
-      "packages": [
-        "unittest2"
-      ]
-    },
-    {
-      "method": "fetchzip",
-      "path": "/nix/store/yad26q3iv3r2lw9xs655kyx3hvflxi1p-source",
-      "rev": "2c3ae3137f3c9cb48134285bd4a47186fa51f0e8",
-      "sha256": "09pkxzsnahljkqyp540v1wwiqcnbkz5ji5bz9q9cwn3axpmqc3v7",
-      "srcDir": "",
-      "url": "https://github.com/status-im/nim-websock/archive/2c3ae3137f3c9cb48134285bd4a47186fa51f0e8.tar.gz",
-      "subDir": "",
-      "packages": [
-        "websock"
-      ]
-    },
-    {
-      "method": "fetchzip",
-      "path": "/nix/store/siwfngb840kcdjdviy5rhlpvdpkw14sk-source",
-      "rev": "8bfd753649aa7e870ec45e93f1453d3bfcf66733",
-      "sha256": "0hvs4kfr4aais7ixvh9d7na2r2zjnvaw3m3rpklafn9qld2wpaav",
-      "srcDir": "src",
-      "url": "https://github.com/status-im/news/archive/8bfd753649aa7e870ec45e93f1453d3bfcf66733.tar.gz",
-      "subDir": "",
-      "packages": [
-        "news"
-      ]
-    },
-    {
-      "method": "fetchzip",
-      "path": "/nix/store/ss096qz8svm5my0mjhk3imyrc2nm2x0y-source",
-      "rev": "4d541ec43454809904fc4c3c0a7436410ad597d2",
-      "sha256": "1a5x0fsxxkqpambz9q637dz0jrzv9q1jb3cya12k6106vc65lyf8",
-      "srcDir": "",
-      "url": "https://github.com/status-im/nim-serialization/archive/4d541ec43454809904fc4c3c0a7436410ad597d2.tar.gz",
-      "subDir": "",
-      "packages": [
-        "serialization"
-      ]
-    },
-    {
-      "method": "fetchzip",
-      "path": "/nix/store/90rwcr71bq13cid74v4aazikv2s924r1-source",
-      "rev": "d9400ddea08341a65102cffdb693d3a7131efef4",
-      "sha256": "0gkmh63izhp0bxyfmwfvyp81bxnzwnc3r7nxr5a05xpl8crk85w2",
-      "srcDir": "",
-      "url": "https://github.com/status-im/nim-stew/archive/d9400ddea08341a65102cffdb693d3a7131efef4.tar.gz",
-      "subDir": "",
-      "packages": [
-        "stew"
-      ]
-    },
-    {
-      "method": "fetchzip",
-      "path": "/nix/store/4nj341ypj07hjvxv0462wpnywhkj02b5-source",
-      "rev": "422971502bd641703bf78a27cb20429e77fcfb8b",
-      "sha256": "0snzh904f8f3wn33liy6817q9ccx8mvsl88blhr49qh69mzbgnba",
-      "srcDir": "",
-      "url": "https://github.com/status-im/nim-faststreams/archive/422971502bd641703bf78a27cb20429e77fcfb8b.tar.gz",
-      "subDir": "",
-      "packages": [
-        "faststreams"
-      ]
-    },
-    {
-      "method": "fetchzip",
-      "path": "/nix/store/qkwz2w5haw8px691c6gkklvxxp38j9d3-source",
-      "rev": "2f95909c767605e06670dc70f5cffd6b9284f192",
-      "sha256": "1qdq9wpm6xahqczmvdn3a7yvvrw5x42ylvzmbybdwjzd8vmgg0zv",
-      "srcDir": "",
-      "url": "https://github.com/zevv/with/archive/2f95909c767605e06670dc70f5cffd6b9284f192.tar.gz",
-      "subDir": "",
-      "packages": [
-        "with"
-      ]
-    },
-    {
-      "method": "fetchzip",
-      "path": "/nix/store/hn5r1ywl4qzzjl9zj62w5m6f8bqkjn8q-source",
-      "rev": "dfc4c1b39f9ded9baf6365014de2b4bfb4dafc34",
-      "sha256": "0fi59m8yvayzlh1ajbl98ddy43i3ikjqh3s5px16y0s3cidg4fai",
-      "srcDir": "",
-      "url": "https://github.com/status-im/nim-testutils/archive/dfc4c1b39f9ded9baf6365014de2b4bfb4dafc34.tar.gz",
-      "subDir": "",
-      "packages": [
-        "testutils"
-      ]
-    },
-    {
-      "method": "fetchzip",
-      "path": "/nix/store/szg3jxcg0bf6zv224nyisqhnibkd2pxw-source",
-      "rev": "c8a5cbe26917e6716b1597dae2d08166f3ce789a",
-      "sha256": "1l1y4psbcd5w68j1zz172rlwsk7jxbwlr14r2kwnkj7xc7lfwlnx",
-      "srcDir": "",
-      "url": "https://github.com/yyoncho/nim-json-rpc/archive/c8a5cbe26917e6716b1597dae2d08166f3ce789a.tar.gz",
-      "subDir": "",
-      "packages": [
-        "json_rpc"
-      ]
-    },
-    {
-      "method": "fetchzip",
-      "path": "/nix/store/dnj20qh97ylf57nka9wbxs735wbw7yxv-source",
-      "rev": "4014ef939b51e02053c2e16dd3481d47bc9267dd",
-      "sha256": "1kgqr2lqaffglc1fgbanwcvhkqcbbd20d5b6w4lf0nksfl9c357a",
-      "srcDir": "",
-      "url": "https://github.com/cheatfate/nimcrypto/archive/4014ef939b51e02053c2e16dd3481d47bc9267dd.tar.gz",
-      "subDir": "",
-      "packages": [
-        "nimcrypto"
-      ]
-    },
-    {
-      "method": "fetchzip",
-      "path": "/nix/store/drj65wylnxdbv4jqhymf7biiyjfb75v8-source",
-      "rev": "9372f27a25d0718d3527afad6cc936f6a853f86e",
-      "sha256": "152zbyqx12fmmjl4wn6kqqk1jzp1ywm4xvjd28ll9037f1pyd5ic",
-      "srcDir": "",
-      "url": "https://github.com/status-im/nim-bearssl/archive/9372f27a25d0718d3527afad6cc936f6a853f86e.tar.gz",
-      "subDir": "",
-      "packages": [
-        "bearssl"
-      ]
-    },
-    {
-      "method": "fetchzip",
-      "path": "/nix/store/h0xl7qnw7bh513rb24k1n805x3n1rimw-source",
-      "rev": "d9394dc7286064902d825bbc1203d03d7218633a",
-      "sha256": "102m7jaxjip24a6hrnk0nvfb0vmdx5zq4m9i4xyzq8m782xyqp94",
-      "srcDir": "",
-      "url": "https://github.com/status-im/nim-json-serialization/archive/d9394dc7286064902d825bbc1203d03d7218633a.tar.gz",
-      "subDir": "",
-      "packages": [
-        "json_serialization"
-      ]
-    },
-    {
-      "method": "fetchzip",
-      "path": "/nix/store/ffz78k6z9wf8vj2kv1jdj5dq2rxf61j7-source",
-      "rev": "2a2681b60289aaf7895b7056f22616081eb1a882",
-      "sha256": "0n8awgrmn9f6vd7ibv1jlyxk61lrs7hc51fghilrw6g6xq5w9rxq",
-      "srcDir": "",
-      "url": "https://github.com/status-im/nim-chronicles/archive/2a2681b60289aaf7895b7056f22616081eb1a882.tar.gz",
-      "subDir": "",
-      "packages": [
-        "chronicles"
-      ]
-    },
-    {
-      "method": "fetchzip",
-      "path": "/nix/store/51nf7pb5cwg2n441ka6w6g6c4hdjsdj4-source",
-      "rev": "bb01d965a2ad0f08eaff6a53874f028ddbab4909",
-      "sha256": "0v4n7maskd07qsx8rsr9v0bs7nzbncmvxsn7j9jsk9azcy803v49",
-      "srcDir": "",
-      "url": "https://github.com/nickysn/asynctools/archive/bb01d965a2ad0f08eaff6a53874f028ddbab4909.tar.gz",
-      "subDir": "",
-      "packages": [
-        "asynctools"
-      ]
-    },
-    {
-      "method": "fetchzip",
-      "path": "/nix/store/br78rad2jnl6zka2q89qi6pkfiyn10fv-source",
-      "rev": "f34ca261efd90f118dc1647beefd2f7a69b05d93",
-      "sha256": "1k8y7m1ry1z8jm8hj8pa3vlqprshaa59cdwq2a4acrfw9ks5w482",
-      "srcDir": "",
-      "url": "https://github.com/status-im/nim-zlib/archive/f34ca261efd90f118dc1647beefd2f7a69b05d93.tar.gz",
-      "subDir": "",
-      "packages": [
-        "zlib"
-      ]
-    }
-  ]
-}
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@ -0,0 +1,6 @@
+{ pkgs, ... }:
+{
+  nph = pkgs.callPackage ./nim/nph { };
+  nimlangserver = pkgs.callPackage ./nim/nimlangserver { };
+  nimble = pkgs.callPackage ./nim/nimble { };
+}
--- a/pkgs/nim/nimble/default.nix
+++ b/pkgs/nim/nimble/default.nix
@ -0,0 +1,20 @@
+{
+  fetchFromGitHub,
+  buildNimPackage,
+  # deps
+  openssl,
+
+}:
+buildNimPackage (finalAttrs: {
+  pname = "nimble";
+  version = "0.16.1";
+  src = fetchFromGitHub {
+    owner = "nim-lang";
+    repo = "nimble";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-sa0irAZjQRZLduEMBPf7sHlY1FigBJTR/vIH4ihii/w=";
+  };
+  buildInputs = [ openssl ];
+  lockFile = ./lock.json;
+  doCheck = false;
+})
--- a/pkgs/nim/nimble/lock.json
+++ b/pkgs/nim/nimble/lock.json
@ -0,0 +1,28 @@
+{
+  "depends": [
+    {
+      "method": "fetchzip",
+      "path": "/nix/store/6aph9sfwcws7pd2725fwjnibdfrv7qmw-source",
+      "rev": "f8f6bd34bfa3fe12c64b919059ad856a96efcba0",
+      "sha256": "11m1rb6rzk70kvskppf97ddzgf5fnh9crjziqc6hib0jgsm5d615",
+      "srcDir": "src",
+      "url": "https://github.com/nim-lang/checksums/archive/f8f6bd34bfa3fe12c64b919059ad856a96efcba0.tar.gz",
+      "subDir": "",
+      "packages": [
+        "checksums"
+      ]
+    },
+    {
+      "method": "fetchzip",
+      "path": "/nix/store/lwg9fm34h5xv0dvxij9r5m2y6pn1zsvx-source",
+      "rev": "faf1617f44d7632ee9601ebc13887644925dcc01",
+      "sha256": "1dxbc41wbvkpdp6q3qz1r38lpn32447qkkgyh2s12ym6bx4ynni4",
+      "srcDir": "src",
+      "url": "https://github.com/nim-lang/sat/archive/faf1617f44d7632ee9601ebc13887644925dcc01.tar.gz",
+      "subDir": "",
+      "packages": [
+        "sat"
+      ]
+    }
+  ]
+}
--- a/pkgs/nim/nimlangserver/default.nix
+++ b/pkgs/nim/nimlangserver/default.nix
--- a/pkgs/nim/nimlangserver/lock.json
+++ b/pkgs/nim/nimlangserver/lock.json
--- a/pkgs/nim/nph/default.nix
+++ b/pkgs/nim/nph/default.nix
@ -0,0 +1,14 @@
+{ fetchFromGitHub, buildNimPackage }:
+buildNimPackage (finalAttrs: {
+  pname = "nph";
+  version = "0.6.0";
+  src = fetchFromGitHub {
+    owner = "arnetheduck";
+    repo = "nph";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-9t5VeGsxyytGdu7+Uv/J+x6bmeB5+eQapbyp30iPxqs=";
+  };
+
+  doCheck = false;
+}
+)
--- a/pkgs/oizys-nim/src/oizys/nix.nim
+++ b/pkgs/oizys-nim/src/oizys/nix.nim
@ -56,7 +56,7 @@ proc parseDryRunOutput(err: string): DryRunOutput =
  let lines = err.strip().splitLines()
  let theseLines = collect:
    for i, line in enumerate(lines):
-      if line.startswith("these"): i
+      if line.startswith("these") or line.startswith("this"): i

  case theseLines.len:
    of 2:
Author	SHA1	Message	Date
daylin-bot	49b22cf395	flake.lock: Update Flake lock file updates: • Updated input 'f1multiviewer': 'github:daylinmorgan/f1multiviewer-flake/3cca24a07f71b2c13a079ac60ac9cedfbc0981e7' (2024-09-01) → 'github:daylinmorgan/f1multiviewer-flake/663a121c6b36ab86ea039dc15e7aff7710703e78' (2024-09-13) • Updated input 'hyprland': 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=8b9e385943d1a9fd0f8c6070fa1eae507ae26145' (2024-09-11) → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=e74efd87e5aa38f9cf84cb3848ee1ab26e5e4bcb' (2024-09-14) • Updated input 'lix': '`24db81eaf2`.tar.gz?narHash=sha256-tB4Y3Rrv67ZdEo3HJzxYL5XX9wqtvWwIX1z8k399W0s%3D&rev=24db81eaf28259ab8f8334ccd6368673a26ed422' (2024-09-11) → '`727258241f`.tar.gz?narHash=sha256-SqATcoZoC90sjVXmjBpvXAiksQfTGR08nuZh4h8esY0%3D&rev=727258241fc0b3c02691b72302d2c3092baca275' (2024-09-14) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/1355a0cbfeac61d785b7183c0caaec1f97361b43' (2024-09-10) → 'github:nixos/nixpkgs/4f807e8940284ad7925ebd0a0993d2a1791acb2f' (2024-09-11) • Updated input 'nixpkgs-wayland': 'github:nix-community/nixpkgs-wayland/5d6271a06b79364aa838cdc68c5852d383b17236' (2024-09-11) → 'github:nix-community/nixpkgs-wayland/f7a91cffe777b139d0b4e4e54d480950018ab37b' (2024-09-14) • Updated input 'nixpkgs-wayland/nixpkgs': 'github:nixos/nixpkgs/1355a0cbfeac61d785b7183c0caaec1f97361b43' (2024-09-10) → 'github:nixos/nixpkgs/4f807e8940284ad7925ebd0a0993d2a1791acb2f' (2024-09-11) • Updated input 'roc': 'github:roc-lang/roc/3d9c4673af25349be43e0e8e703a0f4b36176577' (2024-09-10) → 'github:roc-lang/roc/1993cd336b95b9b76d22db1e9e7821de68263910' (2024-09-12) • Updated input 'tsm': 'github:daylinmorgan/tsm/15e5cf6933a319503697f53d287e817fcafe7949?dir=nix' (2024-09-05) → 'github:daylinmorgan/tsm/8c866db5f020cbdbe9ea9123ce4b92478b41ede5?dir=nix' (2024-09-14) • Updated input 'zig-overlay': 'github:mitchellh/zig-overlay/4dedc1009bf778d0fbd9fbbddce39a696eb5fb9b' (2024-09-09) → 'github:mitchellh/zig-overlay/25f9cfc60ec930a6abb0be1ff89b3e27cda1cb59' (2024-09-14)	2024-09-14 23:12:49 +00:00
Daylin Morgan	3be2d9fcd9	add temporary fix	2024-09-14 18:09:05 -05:00
Daylin Morgan	a508ec48ce	overlays aren't worth the trouble	2024-09-14 11:14:03 -05:00
Daylin Morgan	7a89a4da08	add back checks	2024-09-14 10:46:54 -05:00
Daylin Morgan	95b208d4a6	add nph	2024-09-13 15:09:45 -05:00
Daylin Morgan	6c5254b6ad	handle one path fetch case	2024-09-13 15:09:40 -05:00
Daylin Morgan	1bf6de3b30	make apt-say something	2024-09-13 09:56:40 -05:00