diff --git a/flake.lock b/flake.lock index 7a82d26..be310a5 100644 --- a/flake.lock +++ b/flake.lock @@ -998,16 +998,16 @@ }, "nixpkgs-logseq": { "locked": { - "lastModified": 1735042470, - "narHash": "sha256-3A8afs4dVdbafOG4Rgg5ie2wk8b6ekzOce8JNNXq4/w=", + "lastModified": 1732454357, + "narHash": "sha256-HIGUjCmPRHdjHHnq8Jb7Nr+atCZ5fIX15fNruoFwY0U=", "owner": "steveej-forks", "repo": "nixpkgs", - "rev": "24134ba2d4c2bb54e3736b3c66c0ba95551f2834", + "rev": "5eac36380d52534313b1c139c07a04bd0fcb3fdf", "type": "github" }, "original": { "owner": "steveej-forks", - "ref": "logseq-linux-arm64-selfbuilt-appimage", + "ref": "logseq-linux-arm64", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 02c982c..17c8f97 100644 --- a/flake.nix +++ b/flake.nix @@ -81,7 +81,7 @@ flake = false; }; - nixpkgs-logseq.url = "github:steveej-forks/nixpkgs/logseq-linux-arm64-selfbuilt-appimage"; + nixpkgs-logseq.url = "github:steveej-forks/nixpkgs/logseq-linux-arm64"; espanso = { flake = false; diff --git a/nix/home-manager/configuration/graphical-fullblown.nix b/nix/home-manager/configuration/graphical-fullblown.nix index 78d8ff3..77ea7c9 100644 --- a/nix/home-manager/configuration/graphical-fullblown.nix +++ b/nix/home-manager/configuration/graphical-fullblown.nix @@ -11,6 +11,10 @@ let pkgsUnstable = pkgs.pkgsUnstable or (import nodeFlake.inputs.nixpkgs-unstable { inherit (pkgs) system config overlays; }); + + pkgsLogseq = + pkgs.pkgsLogseq + or (import repoFlake.inputs.nixpkgs-logseq { inherit (pkgs) system config overlays; }); in { imports = [ @@ -246,7 +250,7 @@ in # libretro.snes9x2010 # retroarchFull - (pkgs.callPackage "${repoFlake.inputs.nixpkgs-logseq}/pkgs/by-name/lo/logseq/package.nix" {}) + pkgsLogseq.logseq ]) ++ (lib.lists.optionals (!pkgs.stdenv.targetPlatform.isAarch64) [ pkgsUnstable.ledger-live-desktop diff --git a/nix/os/devices/sj-srv1/flake.lock b/nix/os/devices/sj-srv1/flake.lock index 8ab4b67..6259208 100644 --- a/nix/os/devices/sj-srv1/flake.lock +++ b/nix/os/devices/sj-srv1/flake.lock @@ -1,21 +1,5 @@ { "nodes": { - "flake-compat": { - "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" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -23,11 +7,11 @@ ] }, "locked": { - "lastModified": 1734366194, - "narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=", + "lastModified": 1733050161, + "narHash": "sha256-lYnT+EYE47f5yY3KS/Kd4pJ6CO9fhCqumkYYkQ3TK20=", "owner": "nix-community", "repo": "home-manager", - "rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f", + "rev": "62d536255879be574ebfe9b87c4ac194febf47c5", "type": "github" }, "original": { @@ -37,36 +21,13 @@ "type": "github" } }, - "nixos-dns": { - "inputs": { - "flake-compat": "flake-compat", - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems", - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1725163709, - "narHash": "sha256-VqUwWZBBdDE0Jk1tRW6Bsg978R6rTILrvsqjfjHz2HY=", - "owner": "Janik-Haag", - "repo": "nixos-dns", - "rev": "ac41b8690c8db01af1eb77ea2fd330a1c43d814f", - "type": "github" - }, - "original": { - "owner": "Janik-Haag", - "repo": "nixos-dns", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1734875076, - "narHash": "sha256-Pzyb+YNG5u3zP79zoi8HXYMs15Q5dfjDgwCdUI5B0nY=", + "lastModified": 1733261153, + "narHash": "sha256-eq51hyiaIwtWo19fPEeE0Zr2s83DYMKJoukNLgGGpek=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1807c2b91223227ad5599d7067a61665c52d1295", + "rev": "b681065d0919f7eb5309a93cea2cfa84dec9aa88", "type": "github" }, "original": { @@ -78,11 +39,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1734988233, - "narHash": "sha256-Ucfnxq1rF/GjNP3kTL+uTfgdoE9a3fxDftSfeLIS8mA=", + "lastModified": 1733472523, + "narHash": "sha256-7uLfmBHYgipmt9QbyA6/9U79vZJDlD1F8Cl4ArLUwSc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "de1864217bfa9b5845f465e771e0ecb48b30e02d", + "rev": "de5658c9e4d0d47a03c8fd91c1ff7e5a368d3ac5", "type": "github" }, "original": { @@ -94,11 +55,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1734962273, - "narHash": "sha256-Xu8m+P0dXpRsYqPY1XfOvYaLd8NVpQyiMYrzwwNFyiM=", + "lastModified": 1733426878, + "narHash": "sha256-boWvvAttPEXJbi5TiRqRuLE78mic+asXrCpcEm9XIK8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fc9c33366b98237cc759cdd90ef6058f5a1cb9dd", + "rev": "21e9e52183fd52452c26a1d7957b0299a37fa83a", "type": "github" }, "original": { @@ -108,48 +69,29 @@ "type": "github" } }, + "nixpkgs_forgejo": { + "locked": { + "lastModified": 1717596097, + "narHash": "sha256-ozSU3HYgTbUgyXfGEIdYzGNfCRtuV/Xw7O4ECsLigtk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "af4ac075a3e97cb239078e187112afdf380cd47b", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "af4ac075a3e97cb239078e187112afdf380cd47b", + "type": "github" + } + }, "root": { "inputs": { "home-manager": "home-manager", - "nixos-dns": "nixos-dns", "nixpkgs": "nixpkgs", "nixpkgs-master": "nixpkgs-master", - "nixpkgs-unstable": "nixpkgs-unstable" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "id": "systems", - "type": "indirect" - } - }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "nixos-dns", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1714058656, - "narHash": "sha256-Qv4RBm4LKuO4fNOfx9wl40W2rBbv5u5m+whxRYUMiaA=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "c6aaf729f34a36c445618580a9f95a48f5e4e03f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" + "nixpkgs-unstable": "nixpkgs-unstable", + "nixpkgs_forgejo": "nixpkgs_forgejo" } } }, diff --git a/nix/os/devices/sj-srv1/flake.nix b/nix/os/devices/sj-srv1/flake.nix index f5f7b6e..e4de055 100644 --- a/nix/os/devices/sj-srv1/flake.nix +++ b/nix/os/devices/sj-srv1/flake.nix @@ -8,5 +8,9 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + # remove when https://github.com/NixOS/nixpkgs/pull/312523 is merged and backported + inputs.nixpkgs_forgejo.url = "github:NixOS/nixpkgs/af4ac075a3e97cb239078e187112afdf380cd47b"; + # nixpkgs_forgejo.url = "github:steveej-forks/nixpkgs/9c3519ab3beb11b8d997281f8922330f707df419"; + outputs = _: { }; } diff --git a/nix/os/devices/steveej-x13s/flake.lock b/nix/os/devices/steveej-x13s/flake.lock index 872a45a..f0c68c3 100644 --- a/nix/os/devices/steveej-x13s/flake.lock +++ b/nix/os/devices/steveej-x13s/flake.lock @@ -164,11 +164,11 @@ ] }, "locked": { - "lastModified": 1734992499, - "narHash": "sha256-f9UyHMTb+BwF6RDZ8eO9HOkSlKeeSPBlcYhMmV1UNIk=", + "lastModified": 1734944412, + "narHash": "sha256-36QfCAl8V6nMIRUCgiC79VriJPUXXkHuR8zQA1vAtSU=", "owner": "nix-community", "repo": "home-manager", - "rev": "f1b1786ea77739dcd181b920d430e30fb1608b8a", + "rev": "8264bfe3a064d704c57df91e34b795b6ac7bad9e", "type": "github" }, "original": { @@ -181,16 +181,16 @@ "linux-jhovold": { "flake": false, "locked": { - "lastModified": 1734949573, - "narHash": "sha256-m1O1PLTDYrpt62+aj850I/xBLKbAulx+JlXj99KWjfw=", + "lastModified": 1734331387, + "narHash": "sha256-q49Gk6MNWX5cZZlls3mcZ1UloDtOjJGEVTFNQD/UtWM=", "owner": "jhovold", "repo": "linux", - "rev": "2f0b291243ef93a37f93608d373e21a322af41a2", + "rev": "e6114ad3a4a32e01978f87af5844e03d50b7732b", "type": "github" }, "original": { "owner": "jhovold", - "ref": "wip/sc8280xp-6.13-rc4", + "ref": "wip/sc8280xp-6.13-rc3", "repo": "linux", "type": "github" } @@ -264,11 +264,11 @@ "x13s-bt-linux-firmware": "x13s-bt-linux-firmware" }, "locked": { - "lastModified": 1734962407, - "narHash": "sha256-UjVcYBzg0WJh8cGH67JYZRm5BFPemQFGkEUFPJh0SXc=", + "lastModified": 1734814904, + "narHash": "sha256-+bjvOEXRmy1j3tbwYFBCy5Ego8YrYQah7osIDigF/Uc=", "ref": "bump", - "rev": "5583f444c6abb38ca88cf2046bb792bea01a5496", - "revCount": 132, + "rev": "3c79ed01fb15d9e1f2c6226dae1a2ee883c77c8e", + "revCount": 130, "type": "git", "url": "https://forgejo.www.stefanjunker.de/steveej/nixos-x13s.git" }, diff --git a/nix/pkgs/logseq/Containerfile b/nix/pkgs/logseq/Containerfile index 339d58e..ba1afd8 100644 --- a/nix/pkgs/logseq/Containerfile +++ b/nix/pkgs/logseq/Containerfile @@ -10,7 +10,6 @@ FROM clojure:temurin-11-tools-deps-bullseye-slim as builder ARG DEBIAN_FRONTEND=noninteractive # Install reqs -RUN echo 1 RUN apt-get update && apt-get install -y --no-install-recommends \ curl \ ca-certificates \