flake.lock: Update

Flake lock file updates: • Updated input 'hyprland': 'github:hyprwm/Hyprland/f801d15947e151a8129ff82c99abb208e4767322' (2024-02-29) → 'github:hyprwm/Hyprland/2a08f2ba84ead47bd13aae5797d0d71b2e11b612' (2024-03-03) • Updated input 'hyprland-contrib': 'github:hyprwm/contrib/16884001b26e6955ff4b88b4dfe4c8986e20f153' (2024-01-25) → 'github:hyprwm/contrib/2d4ece4a008feefddc194bde785b1d39f987b5a7' (2024-03-02) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/ebe6e807793e7c9cc59cf81225fdee1a03413811' (2024-02-29) → 'github:nixos/nixpkgs/458b097d81f90275b3fdf03796f0563844926708' (2024-03-02) • Updated input 'nixpkgs-wayland': 'github:nix-community/nixpkgs-wayland/80c30658b9c38af1fac51eb3fc6f423a1f0ae36d' (2024-02-29) → 'github:nix-community/nixpkgs-wayland/ea91a1d89e6f237d2369ad0de846785965cbef0b' (2024-03-02) • Updated input 'pinix': 'github:remi-dupre/pinix/83d58d64ebbb68532a0c23646ecd987d95dc0581' (2024-02-18) → 'github:remi-dupre/pinix/6f7dc0fccb0e48176629d061b07576d092a5d09c' (2024-03-02)
2024-12-30 12:10:43 -06:00 · 2024-03-03 00:37:10 +00:00
5 changed files with 33 additions and 190 deletions
--- a/flake.lock
+++ b/flake.lock
@ -38,7 +38,7 @@
    },
    "flake-utils": {
      "inputs": {
-        "systems": "systems_3"
+        "systems": "systems_2"
      },
      "locked": {
        "lastModified": 1709126324,
@ -54,50 +54,23 @@
        "type": "github"
      }
    },
-    "hyprcursor": {
-      "inputs": {
-        "hyprlang": "hyprlang",
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1709942067,
-        "narHash": "sha256-DGU4zQDwIx6pXM6oHdA+89UU/QjqE05HiXOvigECJjI=",
-        "owner": "hyprwm",
-        "repo": "hyprcursor",
-        "rev": "a2233d4a2a58233457712acfd88d10a2a8a85711",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprcursor",
-        "type": "github"
-      }
-    },
    "hyprland": {
      "inputs": {
-        "hyprcursor": "hyprcursor",
        "hyprland-protocols": "hyprland-protocols",
-        "hyprlang": "hyprlang_2",
+        "hyprlang": "hyprlang",
        "nixpkgs": [
          "nixpkgs"
        ],
-        "systems": "systems_2",
+        "systems": "systems",
        "wlroots": "wlroots",
        "xdph": "xdph"
      },
      "locked": {
-        "lastModified": 1710026388,
-        "narHash": "sha256-Z/ReJhaauOe+uThHB1LJ/3tJOnNxdYybS72Z8gkRWT8=",
+        "lastModified": 1709425896,
+        "narHash": "sha256-r/Tsr+BfgaiJIWTwWrrxHzTmNGEIi8HzYDGO3kFJmx8=",
        "owner": "hyprwm",
        "repo": "Hyprland",
-        "rev": "335506d5557b91a0baf974750c353443841e691b",
+        "rev": "2a08f2ba84ead47bd13aae5797d0d71b2e11b612",
        "type": "github"
      },
      "original": {
@ -153,29 +126,6 @@
      }
    },
    "hyprlang": {
-      "inputs": {
-        "nixpkgs": [
-          "hyprland",
-          "hyprcursor",
-          "nixpkgs"
-        ],
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1709914708,
-        "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=",
-        "owner": "hyprwm",
-        "repo": "hyprlang",
-        "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprlang",
-        "type": "github"
-      }
-    },
-    "hyprlang_2": {
      "inputs": {
        "nixpkgs": [
          "hyprland",
@ -187,11 +137,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1709914708,
-        "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=",
+        "lastModified": 1708787654,
+        "narHash": "sha256-7ACgM3ZuAhPqurXHUvR2nWMRcnmzGGPjLK6q4DSTelI=",
        "owner": "hyprwm",
        "repo": "hyprlang",
-        "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2",
+        "rev": "0fce791ba2334aca183f2ed42399518947550d0d",
        "type": "github"
      },
      "original": {
@ -206,11 +156,11 @@
        "nixpkgs-lib": "nixpkgs-lib"
      },
      "locked": {
-        "lastModified": 1709467759,
-        "narHash": "sha256-ojIpNROGKk56wyvpMAlBVor3CvPez3pFMORrocxW4io=",
+        "lastModified": 1709208631,
+        "narHash": "sha256-n+SCii/GQR3zjaZzjhGAjrQQlF+xjaGEjWdpDb4wJ3U=",
        "owner": "nix-community",
        "repo": "lib-aggregate",
-        "rev": "206e40afdc468d0658e30e1644e2473dc6285cf2",
+        "rev": "1f03ac8dc3a54f68f55d36b5e7fc65afc302a3d7",
        "type": "github"
      },
      "original": {
@ -270,11 +220,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1709906691,
-        "narHash": "sha256-206XMy1NGW42bnHukJl5W2F90yHNoJc7+H3i+/8i2Pg=",
+        "lastModified": 1708830466,
+        "narHash": "sha256-nGKe3Y1/jkLR2eh1aRSVBtKadMBNv8kOnB52UXqRy6A=",
        "owner": "nix-community",
        "repo": "nix-index-database",
-        "rev": "2ad5ebce1e1be47a8cf330d85265ac09ffa15178",
+        "rev": "f070c7eeec3bde8c8c8baa9c02b6d3d5e114d73b",
        "type": "github"
      },
      "original": {
@ -285,11 +235,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1709968316,
-        "narHash": "sha256-4rZEtEDT6jcgRaqxsatBeds7x1PoEiEjb6QNGb4mNrk=",
+        "lastModified": 1709356872,
+        "narHash": "sha256-mvxCirJbtkP0cZ6ABdwcgTk0u3bgLoIoEFIoYBvD6+4=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "0e7f98a5f30166cbed344569426850b21e4091d4",
+        "rev": "458b097d81f90275b3fdf03796f0563844926708",
        "type": "github"
      },
      "original": {
@ -301,11 +251,11 @@
    },
    "nixpkgs-lib": {
      "locked": {
-        "lastModified": 1709426687,
-        "narHash": "sha256-jLBZmwXf0WYHzLkmEMq33bqhX55YtT5edvluFr0RcSA=",
+        "lastModified": 1708821942,
+        "narHash": "sha256-jd+E1SD59qty65pwqad2mftzkT6vW5nNFWVuvayh4Zw=",
        "owner": "nix-community",
        "repo": "nixpkgs.lib",
-        "rev": "7873d84a89ae6e4841528ff7f5697ddcb5bdfe6c",
+        "rev": "479831ed8b3c9c7b80533999f880c7d0bf6a491b",
        "type": "github"
      },
      "original": {
@ -326,11 +276,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1709990107,
-        "narHash": "sha256-fuAqFR/lGwKOxMw7wCK7xzUv/JhS8v9bdNQJ9KCE5HQ=",
+        "lastModified": 1709421307,
+        "narHash": "sha256-8jG7XToXTQHYWBaaNRoALxcEPoE+yE5dKHvb2gErjOg=",
        "owner": "nix-community",
        "repo": "nixpkgs-wayland",
-        "rev": "c737af27135864461e68214f7bbe9222f7d859fb",
+        "rev": "ea91a1d89e6f237d2369ad0de846785965cbef0b",
        "type": "github"
      },
      "original": {
@ -386,21 +336,6 @@
      }
    },
    "systems_2": {
-      "locked": {
-        "lastModified": 1689347949,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "type": "github"
-      }
-    },
-    "systems_3": {
      "locked": {
        "lastModified": 1681028828,
        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@ -440,18 +375,18 @@
      "flake": false,
      "locked": {
        "host": "gitlab.freedesktop.org",
-        "lastModified": 1709983277,
-        "narHash": "sha256-wXWIJLd4F2JZeMaihWVDW/yYXCLEC8OpeNJZg9a9ly8=",
+        "lastModified": 1708558866,
+        "narHash": "sha256-Mz6hCtommq7RQfcPnxLINigO4RYSNt23HeJHC6mVmWI=",
        "owner": "wlroots",
        "repo": "wlroots",
-        "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b",
+        "rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5",
        "type": "gitlab"
      },
      "original": {
        "host": "gitlab.freedesktop.org",
        "owner": "wlroots",
        "repo": "wlroots",
-        "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b",
+        "rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5",
        "type": "gitlab"
      }
    },
@ -475,11 +410,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1709299639,
-        "narHash": "sha256-jYqJM5khksLIbqSxCLUUcqEgI+O2LdlSlcMEBs39CAU=",
+        "lastModified": 1708696469,
+        "narHash": "sha256-shh5wmpeYy3MmsBfkm4f76yPsBDGk6OLYRVG+ARy2F0=",
        "owner": "hyprwm",
        "repo": "xdg-desktop-portal-hyprland",
-        "rev": "2d2fb547178ec025da643db57d40a971507b82fe",
+        "rev": "1b713911c2f12b96c2574474686e4027ac4bf826",
        "type": "github"
      },
      "original": {
--- a/modules/languages/python.nix
+++ b/modules/languages/python.nix
@ -6,7 +6,6 @@
 }: let
  inherit (lib) mkIfIn;
  cfg = config.oizys.languages;
-  pixi = pkgs.callPackage ../../pkgs/pixi.nix {};
 in {
  config = mkIfIn "python" cfg {
    environment.systemPackages = let
--- a/oizys/oizys.nim
+++ b/oizys/oizys.nim
@ -17,14 +17,6 @@ proc error(args: varargs[string, `$`]) =
    args.join("")
  )

-proc warn(args: varargs[string, `$`]) =
-  stdout.styledWriteLine(
-    fgCyan, "oizys", resetStyle, "|",
-    fgYellow, "WARN", resetStyle, "| ",
-    args.join("")
-  )
-
-
 type
  OizysContext = object
    flake, host: string
@ -51,13 +43,7 @@ proc check(c: OizysContext) =
  info "host: ", c.host

 proc cmd(c: OizysContext): string {.inline.} =
-  let pixExists = findExe("pix") != ""
-  if c.pinix:
-    if pixExists:
-      return "pix"
-    else:
-      warn "pinix not found, falling back to nix"
-  return "nix"
+  if c.pinix: "pix" else: "nix"

 proc systemFlakePath(c: OizysContext): string =
  c.flake & "#nixosConfigurations." & c.host & ".config.system.build.toplevel"
--- a/pkgs/pixi.nix
+++ b/pkgs/pixi.nix
@ -1,76 +0,0 @@
-{ lib
-, stdenv
-, rustPlatform
-, fetchFromGitHub
-, pkg-config
-, openssl
-, installShellFiles
-, darwin
-, testers
-, pixi
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "pixi";
-  version = "0.15.2";
-
-  src = fetchFromGitHub {
-    owner = "prefix-dev";
-    repo = "pixi";
-    rev = "v${version}";
-    hash = "sha256-bh8Uu6Q2AND50Qzivc6k1Z8JWudkHC2i4YW1Hxa69SM=";
-  };
-
-  cargoHash = "sha256-yMIcPwnuN7F2ZrOtJw8T+nxeSzLsYn+iC34bYeWpi/w=";
-
-  nativeBuildInputs = [
-    pkg-config
-    installShellFiles
-  ];
-
-  buildInputs = [
-    openssl
-  ]
-  ++ lib.optionals stdenv.isDarwin (
-    with darwin.apple_sdk_11_0.frameworks; [ CoreFoundation IOKit SystemConfiguration Security ]
-  );
-
-  # There are some CI failures with Rattler. Tests on Aarch64 has been skipped.
-  # See https://github.com/prefix-dev/pixi/pull/241.
-  doCheck = !stdenv.isAarch64;
-
-  preCheck = ''
-    export HOME="$(mktemp -d)"
-  '';
-
-  checkFlags = [
-    # Skip tests requiring network
-    "--skip=add_channel"
-    "--skip=add_functionality"
-    "--skip=add_functionality_os"
-    "--skip=add_functionality_union"
-    "--skip=add_pypi_functionality"
-    "--skip=test_alias"
-    "--skip=test_cwd"
-    "--skip=test_incremental_lock_file"
-  ];
-
-  postInstall = ''
-    installShellCompletion --cmd pix \
-      --bash <($out/bin/pixi completion --shell bash) \
-      --fish <($out/bin/pixi completion --shell fish) \
-      --zsh <($out/bin/pixi completion --shell zsh)
-  '';
-
-  passthru.tests.version = testers.testVersion {
-    package = pixi;
-  };
-
-  meta = with lib; {
-    description = "Package management made easy";
-    homepage = "https://pixi.sh/";
-    license = licenses.bsd3;
-    maintainers = with lib.maintainers; [ aaronjheng edmundmiller ];
-    mainProgram = "pixi";
-  };
-}
--- a/todo.md
+++ b/todo.md
@ -1,7 +1,6 @@
 # oizys todo's

- [-] add graceful fall back for oizys-cli if pinix isn't installed system-wide yet
+- [ ] add graceful fall back for oizys-cli if pinix isn't installed system-wide yet
 - [ ] trackdown wezterm bug... (try building from flake?)
-  > https://github.com/wez/wezterm/issues/5067

 <!-- generated with <3 by daylinmorgan/todo -->