flake.lock: Update

Flake lock file updates: • Updated input 'ghostty': 'git+ssh://git@github.com/ghostty-org/ghostty?ref=refs/heads/main&rev=e54ae31d1cf1816f5b9fb7e1fb77d6537dabace6' (2024-11-18) → 'git+ssh://git@github.com/ghostty-org/ghostty?ref=refs/heads/main&rev=29c3a52e964a97dddaed876ce472aeb167774acf' (2024-11-18) • Updated input 'hyprland': 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=df9ff4489973afa9e29bb94ac47c946db745b460' (2024-11-18) → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=67cee430061626ccd73dc6d30eed9db289053608' (2024-11-19) • Updated input 'lix': 'c859d03013.tar.gz?narHash=sha256-bq21I1EjXJa/s5Rra9J9ot2NkPCnI0F5uNPurwYLdpE%3D&rev=c859d03013712b349d82ee6223948d6d03e63a8d' (2024-11-15) → 'f116608a20.tar.gz?narHash=sha256-OjrXEVD8LtZB5X7LtPCdNx4n5iZOQ2nJmpDlM/foEkI%3D&rev=f116608a20430b8484814300cdf22eebeb75a59f' (2024-11-19) • Updated input 'lix-module': '691193879d.tar.gz?narHash=sha256-RNaIu43b9PoXEhW4OqXUNZKY/jezQyCYWwdv1M0VjsA%3D&rev=691193879d96bdfd1e6ab5ebcca2fadc7604cf34' (2024-11-09) → 'aa2846680f.tar.gz?narHash=sha256-n6dPGRlMGdL8X5gviA6ZuRfUdbdD5KiNN/BpABA5YT0%3D&rev=aa2846680fa9a2032939d720487942567fd9eb63' (2024-11-18) • Updated input 'lix-module/flake-utils': 'github:numtide/flake-utils/c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a' (2024-09-17) → 'github:numtide/flake-utils/11707dc2f618dd54ca8739b309ec4fc024de578b' (2024-11-13) • Updated input 'nixpkgs-wayland': 'github:nix-community/nixpkgs-wayland/8cfa4547f95836136691e10493f18155694f198a' (2024-11-18) → 'github:nix-community/nixpkgs-wayland/5181aa924e9e322d2dcb610ec73d8bae73c1286d' (2024-11-19)
try building all at once
2024-12-21 21:50:43 -06:00 · 2024-11-19 15:42:15 +00:00 · 2024-11-19 09:39:38 -06:00 · 2024-11-19 09:19:21 -06:00 · 2024-11-18 17:38:53 -06:00 · 2024-11-18 16:58:15 -06:00
12 changed files with 259 additions and 43 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -7,8 +7,7 @@ on:
      hosts:
        description: 'list of hosts to build'
        required: true
-        default: 'othalan'
-        # default: ',othalan,algiz'
+        default: ',othalan,algiz'
        type: string
      lockFile:
        description: 'flake.lock file'
@ -18,8 +17,7 @@ on:
    inputs:
      hosts:
        description: 'list of hosts to build'
-        default: 'othalan'
-        # default: ',othalan,algiz'
+        default: ',othalan,algiz'
        type: string

 # concurrency:
@ -60,7 +58,7 @@ jobs:
          nix run .
          --
          cache
-          --host "${{ inputs.hosts }}"
+          --host,="${{ inputs.hosts }}"
          --flake .
          --debug
          --
--- a/.github/workflows/update.yml
+++ b/.github/workflows/update.yml
@ -51,7 +51,7 @@ jobs:
          nix run .
          --
          cache
-          --host "othalan"
+          --host,=",othalan,algiz"
          --flake .
          --debug

@ -60,6 +60,75 @@ jobs:
        with:
          push-args: --set-upstream --force origin flake-lock

+
+  build-full-at-once:
+    needs: build-minimal
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      # needed to access ghostty repo for now
+      - name: Setup SSH
+        uses: MrSquaare/ssh-setup-action@v3
+        with:
+            host: github.com
+            private-key: ${{ secrets.SSH_PRIVATE_KEY }}
+
+      - uses: daylin-bot/actions/setup@main
+      - uses: ./.github/actions/nix
+        with:
+          attic_token: ${{ secrets.ATTIC_TOKEN }}
+          clean: true
+          btrfs: true
+
+      - name: Pre-build oizys
+        run: nix build .
+
+      - name: Build
+        run: >
+          nix run .
+          --
+          build
+          "$(nix run . -- output --host,=othalan,algiz,mannaz,naudiz --flake .)"
+          --flake .
+          --debug
+          --
+          --keep-going
+          --out-link current
+
+      - run: git checkout flake-lock
+
+      - name: Pre-build oizys
+        run: nix build .
+
+      - name: Build Updated
+        run: >
+          nix run .
+          --
+          build
+          "$(nix run . -- output --host,=othalan,algiz,mannaz,naudiz --flake .)"
+          --flake .
+          --debug
+          --
+          --keep-going
+          --out-link updated
+
+      - run: ls
+      # - run: |
+      #     echo "# System Diff" >> $GITHUB_STEP_SUMMARY
+      #     nix run "nixpkgs#nvd" -- --color always diff ./current ./updated >> summary.md
+      #     printf '```\n%s\n```\n' "$(nix run "nixpkgs#nvd" -- diff ./current ./updated)" >> $GITHUB_STEP_SUMMARY
+      #
+      - run: df -h
+
+      # - uses: actions/upload-artifact@v4
+      #   with:
+      #     name: ${{ matrix.host }}-summary
+      #     path: summary.md
+      #
  build-full:
    needs: build-minimal
    runs-on: ubuntu-latest
--- a/flake.lock
+++ b/flake.lock
@ -165,11 +165,11 @@
        "systems": "systems_3"
      },
      "locked": {
-        "lastModified": 1726560853,
-        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
        "type": "github"
      },
      "original": {
@ -240,11 +240,11 @@
        "zig": "zig"
      },
      "locked": {
-        "lastModified": 1731947012,
-        "narHash": "sha256-OL7pQ/dMLC1Ek+rkXHEXpvx+UBO1Pbo1kTVe2kmcYsY=",
+        "lastModified": 1731971697,
+        "narHash": "sha256-6JNMcpy0z19yOLBRt3eE4Rk4A96kcEsRv5+ym1hkv1c=",
        "ref": "refs/heads/main",
-        "rev": "e54ae31d1cf1816f5b9fb7e1fb77d6537dabace6",
-        "revCount": 8018,
+        "rev": "29c3a52e964a97dddaed876ce472aeb167774acf",
+        "revCount": 8021,
        "type": "git",
        "url": "ssh://git@github.com/ghostty-org/ghostty"
      },
@ -318,11 +318,11 @@
        "xdph": "xdph"
      },
      "locked": {
-        "lastModified": 1731945258,
-        "narHash": "sha256-N7uJSSMqHzwH4uahb+Uw3sADVp3XdLfqkP2T144gnFk=",
+        "lastModified": 1731978971,
+        "narHash": "sha256-P9DXCxDvjFt4aMc2x67hvSpNvSqX18X840w6cEVZXoo=",
        "ref": "refs/heads/main",
-        "rev": "df9ff4489973afa9e29bb94ac47c946db745b460",
-        "revCount": 5475,
+        "rev": "67cee430061626ccd73dc6d30eed9db289053608",
+        "revCount": 5480,
        "submodules": true,
        "type": "git",
        "url": "https://github.com/hyprwm/Hyprland/"
@ -498,11 +498,11 @@
    "lix": {
      "flake": false,
      "locked": {
-        "lastModified": 1731683711,
-        "narHash": "sha256-bq21I1EjXJa/s5Rra9J9ot2NkPCnI0F5uNPurwYLdpE=",
-        "rev": "c859d03013712b349d82ee6223948d6d03e63a8d",
+        "lastModified": 1731992627,
+        "narHash": "sha256-OjrXEVD8LtZB5X7LtPCdNx4n5iZOQ2nJmpDlM/foEkI=",
+        "rev": "f116608a20430b8484814300cdf22eebeb75a59f",
        "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/c859d03013712b349d82ee6223948d6d03e63a8d.tar.gz?rev=c859d03013712b349d82ee6223948d6d03e63a8d"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/f116608a20430b8484814300cdf22eebeb75a59f.tar.gz?rev=f116608a20430b8484814300cdf22eebeb75a59f"
      },
      "original": {
        "type": "tarball",
@ -521,11 +521,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1731185731,
-        "narHash": "sha256-RNaIu43b9PoXEhW4OqXUNZKY/jezQyCYWwdv1M0VjsA=",
-        "rev": "691193879d96bdfd1e6ab5ebcca2fadc7604cf34",
+        "lastModified": 1731967274,
+        "narHash": "sha256-n6dPGRlMGdL8X5gviA6ZuRfUdbdD5KiNN/BpABA5YT0=",
+        "rev": "aa2846680fa9a2032939d720487942567fd9eb63",
        "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/691193879d96bdfd1e6ab5ebcca2fadc7604cf34.tar.gz?rev=691193879d96bdfd1e6ab5ebcca2fadc7604cf34"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/aa2846680fa9a2032939d720487942567fd9eb63.tar.gz?rev=aa2846680fa9a2032939d720487942567fd9eb63"
      },
      "original": {
        "type": "tarball",
@ -745,11 +745,11 @@
        "nixpkgs": "nixpkgs_6"
      },
      "locked": {
-        "lastModified": 1731954473,
-        "narHash": "sha256-iNzMvn3P/3tinhRpYQVSVukrFP22qqlQ59a9kKYN7LU=",
+        "lastModified": 1732026056,
+        "narHash": "sha256-ZXYNxTYD3uWtWrU/SMH43w1QRygDSoX1KEMhpwRrB5Y=",
        "owner": "nix-community",
        "repo": "nixpkgs-wayland",
-        "rev": "8cfa4547f95836136691e10493f18155694f198a",
+        "rev": "5181aa924e9e322d2dcb610ec73d8bae73c1286d",
        "type": "github"
      },
      "original": {
--- a/lib/default.nix
+++ b/lib/default.nix
@ -58,7 +58,8 @@ let
        packages = with pkgs; [
          openssl
          nim
-          nimble
+          self.packages.${pkgs.system}.nimble
+          # nimble
        ];
      };
    });
--- a/modules/desktop/window-managers/hyprland.nix
+++ b/modules/desktop/window-managers/hyprland.nix
@ -6,7 +6,6 @@
  flake,
  ...
 }:
-
 mkOizysModule config "hyprland" {
  programs.hyprland = enabled;
  security.pam.services.swaylock = { };
@ -42,8 +41,14 @@ mkOizysModule config "hyprland" {

      # not even clear why I need to add this but ¯\_(ツ)_/¯
      kdePackages.qtwayland
+
    ])
-    ++ [ (flake.pkg "hyprman") ]
+    ++ [
+      (flake.pkg "hyprman")
+      ((flake.pkgs "self").flameshot.override {
+        enableWlrSupport = true;
+      })
+    ]

    # swww-git is broken
    ++ (with (flake.pkgs "nixpkgs-wayland"); [
@ -59,7 +64,6 @@ mkOizysModule config "hyprland" {
    # (overlayFrom "hyprland")
  ];

- 
  services.getty = {
    extraArgs = [ "--skip-login" ];
    loginOptions = "-p -- ${config.oizys.user}";
--- a/modules/languages/nim.nix
+++ b/modules/languages/nim.nix
@ -2,6 +2,7 @@
  config,
  lib,
  pkgs,
+  flake,
  ...
 }:
 let
@ -12,8 +13,9 @@ in
  config = mkIfIn "nim" cfg {
    environment.systemPackages = with pkgs; [
      nim
-      nimble
+      # nimble
      nimlangserver
+      (flake.pkgs "self").nimble
    ];
  };
 }
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@ -1,11 +1,17 @@
 { pkgs, ... }:
-  let inherit (pkgs) python3Packages;
+let
+  inherit (pkgs) python3Packages;
 in
 {
  # nph = pkgs.callPackage ./nim/nph { }; # doesn't compile with 2.2.0 :/
  # nimlangserver = pkgs.callPackage ./nim/nimlangserver { };
  nimble = pkgs.callPackage ./nim/nimble { };
+
  distrobox = pkgs.callPackage ./distrobox { };
+
  llm = python3Packages.callPackage ./llm { };
  llm-claude-3 = python3Packages.callPackage ./llm-plugins/llm-claude-3 { };
+
+  flameshot = pkgs.callPackage ./flameshot { };
+
 }
--- a/pkgs/flameshot/default.nix
+++ b/pkgs/flameshot/default.nix
@ -0,0 +1,136 @@
+{
+  stdenv,
+  lib,
+  overrideSDK,
+  fetchFromGitHub,
+  fetchpatch,
+  cmake,
+  imagemagick,
+  libicns,
+  libsForQt5,
+  grim,
+  makeBinaryWrapper,
+  nix-update-script,
+  enableWlrSupport ? false,
+  enableMonochromeIcon ? false,
+}:
+
+assert stdenv.hostPlatform.isDarwin -> (!enableWlrSupport);
+
+let
+  stdenv' = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
+in
+
+stdenv'.mkDerivation {
+  pname = "flameshot";
+  # wlr screenshotting is currently only available on unstable version (>12.1.0)
+  version = "12.1.0-unstable-2024-11-18";
+
+  src = fetchFromGitHub {
+    owner = "flameshot-org";
+    repo = "flameshot";
+    rev = "729f494d535356adfbd65dc127a5c82ea218006e";
+    hash = "sha256-hrUPBVWnTYvgcWOSnRQAywr6RG5qMph5Nf0AbnKdpj0=";
+  };
+
+  # is this necessary with newer versions?
+  # patches = [
+  #   # https://github.com/flameshot-org/flameshot/pull/3166
+  #   # fixes fractional scaling calculations on wayland
+  #   (fetchpatch {
+  #     name = "10-fix-wayland.patch";
+  #     url = "https://github.com/flameshot-org/flameshot/commit/5fea9144501f7024344d6f29c480b000b2dcd5a6.patch";
+  #     hash = "sha256-SnjVbFMDKD070vR4vGYrwLw6scZAFaQA4b+MbI+0W9E=";
+  #   })
+  # ];
+
+  cmakeFlags =
+    [
+      (lib.cmakeBool "DISABLE_UPDATE_CHECKER" true)
+      (lib.cmakeBool "USE_MONOCHROME_ICON" enableMonochromeIcon)
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      (lib.cmakeBool "USE_WAYLAND_CLIPBOARD" true)
+      (lib.cmakeBool "USE_WAYLAND_GRIM" enableWlrSupport)
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      (lib.cmakeFeature "Qt5_DIR" "${libsForQt5.qtbase.dev}/lib/cmake/Qt5")
+    ];
+
+  nativeBuildInputs =
+    [
+      cmake
+      libsForQt5.qttools
+      libsForQt5.qtsvg
+      libsForQt5.wrapQtAppsHook
+      makeBinaryWrapper
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      imagemagick
+      libicns
+    ];
+
+  buildInputs = [
+    libsForQt5.qtbase
+    libsForQt5.kguiaddons
+  ];
+
+  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # Fix icns generation running concurrently with png generation
+    sed -E -i '/"iconutil -o/i\
+        )\
+        execute_process(\
+    ' src/CMakeLists.txt
+
+    # Replace unavailable commands
+    sed -E -i \
+        -e 's/"sips -z ([0-9]+) ([0-9]+) +(.+) --out /"magick \3 -resize \1x\2\! /' \
+        -e 's/"iconutil -o (.+) -c icns (.+)"/"png2icns \1 \2\/*{16,32,128,256,512}.png"/' \
+        src/CMakeLists.txt
+  '';
+
+  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    mkdir $out/Applications
+    mv $out/bin/flameshot.app $out/Applications
+
+    ln -s $out/Applications/flameshot.app/Contents/MacOS/flameshot $out/bin/flameshot
+
+    rm -r $out/share/applications
+    rm -r $out/share/dbus*
+    rm -r $out/share/icons
+    rm -r $out/share/metainfo
+  '';
+
+  dontWrapQtApps = true;
+
+  postFixup =
+    let
+      binary =
+        if stdenv.hostPlatform.isDarwin then
+          "Applications/flameshot.app/Contents/MacOS/flameshot"
+        else
+          "bin/flameshot";
+    in
+    ''
+      wrapProgram $out/${binary} \
+        ${lib.optionalString enableWlrSupport "--prefix PATH : ${lib.makeBinPath [ grim ]}"} \
+        ''${qtWrapperArgs[@]}
+    '';
+
+  passthru = {
+    updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
+  };
+
+  meta = with lib; {
+    description = "Powerful yet simple to use screenshot software";
+    homepage = "https://github.com/flameshot-org/flameshot";
+    changelog = "https://github.com/flameshot-org/flameshot/releases";
+    mainProgram = "flameshot";
+    maintainers = with maintainers; [
+      scode
+      oxalica
+    ];
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux ++ platforms.darwin;
+  };
+}
--- a/pkgs/oizys/default.nix
+++ b/pkgs/oizys/default.nix
@ -8,7 +8,7 @@ buildNimblePackage {
  verions = "unstable";
  src = lib.cleanSource ./.;
  nativeBuildInputs = [ openssl ];
-  nimbleDepsHash = "sha256-J/iuDYR5A771zAuRKA94rwXX9L3+KtiodDxQRFO0GEc=";
+  nimbleDepsHash = "sha256-1YoGvWvoJJSMauDbeH8ZHuK+QQot48Mkye9TeWteT8k=";

  meta = {
    description = "nix begat oizys";
--- a/pkgs/oizys/nimble.lock
+++ b/pkgs/oizys/nimble.lock
@ -3,12 +3,12 @@
  "packages": {
    "hwylterm": {
      "version": "0.1.0",
-      "vcsRevision": "cbeefd675c0884feebad4dc62910092519f8b2ed",
+      "vcsRevision": "c5f70cec4e40ba396f59162e98c359a1a1ea4fe1",
      "url": "https://github.com/daylinmorgan/hwylterm",
      "downloadMethod": "git",
      "dependencies": [],
      "checksums": {
-        "sha1": "4d043352ad07388d0181c0fd4cf325317e9306d0"
+        "sha1": "5727969a8e82e29a7581c13cc7cc45996dbca5a1"
      }
    },
    "jsony": {
--- a/pkgs/oizys/oizys.nimble
+++ b/pkgs/oizys/oizys.nimble
@ -13,5 +13,5 @@ bin           = @["oizys"]
 requires "nim >= 2.0.8"
 requires "jsony"
 requires "zippy"
-requires "https://github.com/daylinmorgan/hwylterm#cbeefd67"
+requires "https://github.com/daylinmorgan/hwylterm#HEAD"

--- a/pkgs/oizys/src/oizys/github.nim
+++ b/pkgs/oizys/src/oizys/github.nim
@ -93,7 +93,7 @@ proc getInProgressRun(
    while (now() - start) < timeoutDuration:
      let response = getGhApi(fmt"https://api.github.com/repos/daylinmorgan/oizys/actions/workflows/{workflow}/runs")
      let runs = fromJson(response.body,  ListGhWorkflowResponse).workflow_runs
-      if runs[0].status == "in_progress":
+      if runs[0].status in ["in_progress", "queued"]:
        spinner.stop() # cleanup
        return (runs[0], true)
      sleep 500
Author	SHA1	Message	Date
daylin-bot	946a645f17	flake.lock: Update Flake lock file updates: • Updated input 'ghostty': 'git+ssh://git@github.com/ghostty-org/ghostty?ref=refs/heads/main&rev=e54ae31d1cf1816f5b9fb7e1fb77d6537dabace6' (2024-11-18) → 'git+ssh://git@github.com/ghostty-org/ghostty?ref=refs/heads/main&rev=29c3a52e964a97dddaed876ce472aeb167774acf' (2024-11-18) • Updated input 'hyprland': 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=df9ff4489973afa9e29bb94ac47c946db745b460' (2024-11-18) → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=67cee430061626ccd73dc6d30eed9db289053608' (2024-11-19) • Updated input 'lix': '`c859d03013`.tar.gz?narHash=sha256-bq21I1EjXJa/s5Rra9J9ot2NkPCnI0F5uNPurwYLdpE%3D&rev=c859d03013712b349d82ee6223948d6d03e63a8d' (2024-11-15) → '`f116608a20`.tar.gz?narHash=sha256-OjrXEVD8LtZB5X7LtPCdNx4n5iZOQ2nJmpDlM/foEkI%3D&rev=f116608a20430b8484814300cdf22eebeb75a59f' (2024-11-19) • Updated input 'lix-module': '`691193879d`.tar.gz?narHash=sha256-RNaIu43b9PoXEhW4OqXUNZKY/jezQyCYWwdv1M0VjsA%3D&rev=691193879d96bdfd1e6ab5ebcca2fadc7604cf34' (2024-11-09) → '`aa2846680f`.tar.gz?narHash=sha256-n6dPGRlMGdL8X5gviA6ZuRfUdbdD5KiNN/BpABA5YT0%3D&rev=aa2846680fa9a2032939d720487942567fd9eb63' (2024-11-18) • Updated input 'lix-module/flake-utils': 'github:numtide/flake-utils/c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a' (2024-09-17) → 'github:numtide/flake-utils/11707dc2f618dd54ca8739b309ec4fc024de578b' (2024-11-13) • Updated input 'nixpkgs-wayland': 'github:nix-community/nixpkgs-wayland/8cfa4547f95836136691e10493f18155694f198a' (2024-11-18) → 'github:nix-community/nixpkgs-wayland/5181aa924e9e322d2dcb610ec73d8bae73c1286d' (2024-11-19)	2024-11-19 15:42:15 +00:00
Daylin Morgan	defb301c90	try building all at once	2024-11-19 09:39:38 -06:00
Daylin Morgan	c426a6b55a	also accept queued	2024-11-19 09:19:21 -06:00
Daylin Morgan	1e84539947	add flameshot	2024-11-18 17:38:53 -06:00
Daylin Morgan	c03776be01	formatting	2024-11-18 16:58:15 -06:00
Daylin Morgan	45eeeb3b78	fix hwylcli version	2024-11-18 15:14:55 -06:00
Daylin Morgan	b6619bf0b2	add back comma separated ci's	2024-11-18 14:19:32 -06:00
Daylin Morgan	c4512ad205	update hwylcli	2024-11-18 14:18:54 -06:00