From 44e881942ed45e73e63544de0269ac8cd1736509 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sat, 26 Apr 2025 15:55:06 +0200 Subject: [PATCH 1/3] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/15c5f9d04fabd176f30286c8f52bbdb2c853a146' (2025-03-31) → 'github:nix-community/home-manager/dd26f75fb4ec1c731d4b1396eaf4439ce40a91c1' (2025-04-25) • Updated input 'nix-logseq-unstable': 'github:TomaSajt/nixpkgs/882d96f3e755c91626ce769a22841e49e540f811' (2025-03-18) → 'github:TomaSajt/nixpkgs/b457b39340679f8606312546887561fe0aa5fb02' (2025-04-01) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/de6fc5551121c59c01e2a3d45b277a6d05077bc4' (2025-03-31) → 'github:NixOS/nixos-hardware/f7bee55a5e551bd8e7b5b82c9bc559bc50d868d1' (2025-04-24) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/52faf482a3889b7619003c0daec593a1912fddc1' (2025-03-30) → 'github:NixOS/nixpkgs/f771eb401a46846c1aebd20552521b233dd7e18b' (2025-04-24) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/7ffe0edc685f14b8c635e3d6591b0bbb97365e6c' (2025-03-30) → 'github:NixOS/nixpkgs/5630cf13cceac06cefe9fc607e8dfa8fb342dde3' (2025-04-24) • Updated input 'nur': 'github:nix-community/NUR/24373c950c3c4757c64e9567391bcac0996c5c08' (2025-03-28) → 'github:nix-community/NUR/34c80a75bf09085cfd04a476389a4162c6154d42' (2025-04-26) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/698214a32beb4f4c8e3942372c694f40848b360d' (2025-03-25) → 'github:nixos/nixpkgs/f771eb401a46846c1aebd20552521b233dd7e18b' (2025-04-24) --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 26fd5a3..f75c5d4 100644 --- a/flake.lock +++ b/flake.lock @@ -138,11 +138,11 @@ ] }, "locked": { - "lastModified": 1743387206, - "narHash": "sha256-24N3NAuZZbYqZ39NgToZgHUw6M7xHrtrAm18kv0+2Wo=", + "lastModified": 1745557122, + "narHash": "sha256-eqSo9ugzsqhFgaDFYUZj943nurlX4L6f+AW0skJ4W+M=", "owner": "nix-community", "repo": "home-manager", - "rev": "15c5f9d04fabd176f30286c8f52bbdb2c853a146", + "rev": "dd26f75fb4ec1c731d4b1396eaf4439ce40a91c1", "type": "github" }, "original": { @@ -216,11 +216,11 @@ }, "nix-logseq-unstable": { "locked": { - "lastModified": 1742338843, - "narHash": "sha256-U1ycpNrG1gO8YAAN0+KuNixha58L+uabRhCg/G9m/Lc=", + "lastModified": 1743493460, + "narHash": "sha256-Elxw/OLba9qpwampG/n/tRJFZEhidNP1+1HVUSnDHC8=", "owner": "TomaSajt", "repo": "nixpkgs", - "rev": "882d96f3e755c91626ce769a22841e49e540f811", + "rev": "b457b39340679f8606312546887561fe0aa5fb02", "type": "github" }, "original": { @@ -232,11 +232,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1743420942, - "narHash": "sha256-b/exDDQSLmENZZgbAEI3qi9yHkuXAXCPbormD8CSJXo=", + "lastModified": 1745503349, + "narHash": "sha256-bUGjvaPVsOfQeTz9/rLTNLDyqbzhl0CQtJJlhFPhIYw=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "de6fc5551121c59c01e2a3d45b277a6d05077bc4", + "rev": "f7bee55a5e551bd8e7b5b82c9bc559bc50d868d1", "type": "github" }, "original": { @@ -248,11 +248,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1743315132, - "narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=", + "lastModified": 1745526057, + "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "52faf482a3889b7619003c0daec593a1912fddc1", + "rev": "f771eb401a46846c1aebd20552521b233dd7e18b", "type": "github" }, "original": { @@ -296,11 +296,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1743367904, - "narHash": "sha256-sOos1jZGKmT6xxPvxGQyPTApOunXvScV4lNjBCXd/CI=", + "lastModified": 1745487689, + "narHash": "sha256-FQoi3R0NjQeBAsEOo49b5tbDPcJSMWc3QhhaIi9eddw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7ffe0edc685f14b8c635e3d6591b0bbb97365e6c", + "rev": "5630cf13cceac06cefe9fc607e8dfa8fb342dde3", "type": "github" }, "original": { @@ -312,11 +312,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1742889210, - "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=", + "lastModified": 1745526057, + "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "698214a32beb4f4c8e3942372c694f40848b360d", + "rev": "f771eb401a46846c1aebd20552521b233dd7e18b", "type": "github" }, "original": { @@ -333,11 +333,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1743136605, - "narHash": "sha256-S7wG4Rq0BVNVfZWiJzX0cNw4fA1WEvHVYyojISJF1io=", + "lastModified": 1745672678, + "narHash": "sha256-+3HDClco9BTgWovVMODc0e8Gh3+LNTt1EXZW2tJaXjA=", "owner": "nix-community", "repo": "NUR", - "rev": "24373c950c3c4757c64e9567391bcac0996c5c08", + "rev": "34c80a75bf09085cfd04a476389a4162c6154d42", "type": "github" }, "original": { From d68d2a64f3343a9a3cb349bce9e00dbfeed59cf0 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sat, 26 Apr 2025 16:00:02 +0200 Subject: [PATCH 2/3] packages: take logseq from unstable instead of PR flake input --- flake.lock | 17 ----------------- flake.nix | 1 - home/modules/packages.nix | 2 +- 3 files changed, 1 insertion(+), 19 deletions(-) diff --git a/flake.lock b/flake.lock index f75c5d4..a68be18 100644 --- a/flake.lock +++ b/flake.lock @@ -214,22 +214,6 @@ "type": "github" } }, - "nix-logseq-unstable": { - "locked": { - "lastModified": 1743493460, - "narHash": "sha256-Elxw/OLba9qpwampG/n/tRJFZEhidNP1+1HVUSnDHC8=", - "owner": "TomaSajt", - "repo": "nixpkgs", - "rev": "b457b39340679f8606312546887561fe0aa5fb02", - "type": "github" - }, - "original": { - "owner": "TomaSajt", - "ref": "logseq", - "repo": "nixpkgs", - "type": "github" - } - }, "nixos-hardware": { "locked": { "lastModified": 1745503349, @@ -383,7 +367,6 @@ "lanzaboote": "lanzaboote", "mysecrets": "mysecrets", "nix-darwin": "nix-darwin", - "nix-logseq-unstable": "nix-logseq-unstable", "nixos-hardware": "nixos-hardware", "nixos-unstable": "nixos-unstable", "nixpkgs": "nixpkgs_2", diff --git a/flake.nix b/flake.nix index 3577777..5053a22 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,6 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; - nix-logseq-unstable.url = "github:TomaSajt/nixpkgs/logseq"; home-manager = { url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 2cf8c42..82e4343 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -184,7 +184,7 @@ let #(pkgs.pidgin-with-plugins.override { # plugins = [ pkgs.pidginotr ];}) - inputs.nix-logseq-unstable.legacyPackages.${system}.logseq + unstable.logseq # for Hibiscus banking software jameica From 07739ef1d10d5a7f0313b46e74cef13f892f330b Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sat, 26 Apr 2025 16:00:23 +0200 Subject: [PATCH 3/3] flake apps.hm: use lix instead of nix --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 5053a22..2fe6f6b 100644 --- a/flake.nix +++ b/flake.nix @@ -164,7 +164,7 @@ pkgs.git pkgs.coreutils pkgs.findutils - pkgs.nix + pkgs.lix pkgs.jq pkgs.unixtools.hostname ]