Compare commits

...

4 commits

7 changed files with 106 additions and 55 deletions

8
flake.lock generated
View file

@ -998,16 +998,16 @@
},
"nixpkgs-logseq": {
"locked": {
"lastModified": 1732454357,
"narHash": "sha256-HIGUjCmPRHdjHHnq8Jb7Nr+atCZ5fIX15fNruoFwY0U=",
"lastModified": 1735042470,
"narHash": "sha256-3A8afs4dVdbafOG4Rgg5ie2wk8b6ekzOce8JNNXq4/w=",
"owner": "steveej-forks",
"repo": "nixpkgs",
"rev": "5eac36380d52534313b1c139c07a04bd0fcb3fdf",
"rev": "24134ba2d4c2bb54e3736b3c66c0ba95551f2834",
"type": "github"
},
"original": {
"owner": "steveej-forks",
"ref": "logseq-linux-arm64",
"ref": "logseq-linux-arm64-selfbuilt-appimage",
"repo": "nixpkgs",
"type": "github"
}

View file

@ -81,7 +81,7 @@
flake = false;
};
nixpkgs-logseq.url = "github:steveej-forks/nixpkgs/logseq-linux-arm64";
nixpkgs-logseq.url = "github:steveej-forks/nixpkgs/logseq-linux-arm64-selfbuilt-appimage";
espanso = {
flake = false;

View file

@ -11,10 +11,6 @@ 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 = [
@ -250,7 +246,7 @@ in
# libretro.snes9x2010
# retroarchFull
pkgsLogseq.logseq
(pkgs.callPackage "${repoFlake.inputs.nixpkgs-logseq}/pkgs/by-name/lo/logseq/package.nix" {})
])
++ (lib.lists.optionals (!pkgs.stdenv.targetPlatform.isAarch64) [
pkgsUnstable.ledger-live-desktop

View file

@ -1,5 +1,21 @@
{
"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": [
@ -7,11 +23,11 @@
]
},
"locked": {
"lastModified": 1733050161,
"narHash": "sha256-lYnT+EYE47f5yY3KS/Kd4pJ6CO9fhCqumkYYkQ3TK20=",
"lastModified": 1734366194,
"narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "62d536255879be574ebfe9b87c4ac194febf47c5",
"rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f",
"type": "github"
},
"original": {
@ -21,13 +37,36 @@
"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": 1733261153,
"narHash": "sha256-eq51hyiaIwtWo19fPEeE0Zr2s83DYMKJoukNLgGGpek=",
"lastModified": 1734875076,
"narHash": "sha256-Pzyb+YNG5u3zP79zoi8HXYMs15Q5dfjDgwCdUI5B0nY=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "b681065d0919f7eb5309a93cea2cfa84dec9aa88",
"rev": "1807c2b91223227ad5599d7067a61665c52d1295",
"type": "github"
},
"original": {
@ -39,11 +78,11 @@
},
"nixpkgs-master": {
"locked": {
"lastModified": 1733472523,
"narHash": "sha256-7uLfmBHYgipmt9QbyA6/9U79vZJDlD1F8Cl4ArLUwSc=",
"lastModified": 1734988233,
"narHash": "sha256-Ucfnxq1rF/GjNP3kTL+uTfgdoE9a3fxDftSfeLIS8mA=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "de5658c9e4d0d47a03c8fd91c1ff7e5a368d3ac5",
"rev": "de1864217bfa9b5845f465e771e0ecb48b30e02d",
"type": "github"
},
"original": {
@ -55,11 +94,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1733426878,
"narHash": "sha256-boWvvAttPEXJbi5TiRqRuLE78mic+asXrCpcEm9XIK8=",
"lastModified": 1734962273,
"narHash": "sha256-Xu8m+P0dXpRsYqPY1XfOvYaLd8NVpQyiMYrzwwNFyiM=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "21e9e52183fd52452c26a1d7957b0299a37fa83a",
"rev": "fc9c33366b98237cc759cdd90ef6058f5a1cb9dd",
"type": "github"
},
"original": {
@ -69,29 +108,48 @@
"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",
"nixpkgs_forgejo": "nixpkgs_forgejo"
"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"
}
}
},

View file

@ -8,9 +8,5 @@
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 = _: { };
}

View file

@ -164,11 +164,11 @@
]
},
"locked": {
"lastModified": 1734944412,
"narHash": "sha256-36QfCAl8V6nMIRUCgiC79VriJPUXXkHuR8zQA1vAtSU=",
"lastModified": 1734992499,
"narHash": "sha256-f9UyHMTb+BwF6RDZ8eO9HOkSlKeeSPBlcYhMmV1UNIk=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "8264bfe3a064d704c57df91e34b795b6ac7bad9e",
"rev": "f1b1786ea77739dcd181b920d430e30fb1608b8a",
"type": "github"
},
"original": {
@ -181,16 +181,16 @@
"linux-jhovold": {
"flake": false,
"locked": {
"lastModified": 1734331387,
"narHash": "sha256-q49Gk6MNWX5cZZlls3mcZ1UloDtOjJGEVTFNQD/UtWM=",
"lastModified": 1734949573,
"narHash": "sha256-m1O1PLTDYrpt62+aj850I/xBLKbAulx+JlXj99KWjfw=",
"owner": "jhovold",
"repo": "linux",
"rev": "e6114ad3a4a32e01978f87af5844e03d50b7732b",
"rev": "2f0b291243ef93a37f93608d373e21a322af41a2",
"type": "github"
},
"original": {
"owner": "jhovold",
"ref": "wip/sc8280xp-6.13-rc3",
"ref": "wip/sc8280xp-6.13-rc4",
"repo": "linux",
"type": "github"
}
@ -264,11 +264,11 @@
"x13s-bt-linux-firmware": "x13s-bt-linux-firmware"
},
"locked": {
"lastModified": 1734814904,
"narHash": "sha256-+bjvOEXRmy1j3tbwYFBCy5Ego8YrYQah7osIDigF/Uc=",
"lastModified": 1734962407,
"narHash": "sha256-UjVcYBzg0WJh8cGH67JYZRm5BFPemQFGkEUFPJh0SXc=",
"ref": "bump",
"rev": "3c79ed01fb15d9e1f2c6226dae1a2ee883c77c8e",
"revCount": 130,
"rev": "5583f444c6abb38ca88cf2046bb792bea01a5496",
"revCount": 132,
"type": "git",
"url": "https://forgejo.www.stefanjunker.de/steveej/nixos-x13s.git"
},

View file

@ -10,6 +10,7 @@ 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 \