From f77ff8d28422d7bc68c6dbc6184666ccc1b8288d Mon Sep 17 00:00:00 2001
From: Leyla Becker <git@jan-leila.com>
Date: Sat, 29 Mar 2025 11:43:51 -0500
Subject: [PATCH] updated flake lock and disabled lix again
---
flake.lock | 128 ++++++++---------------------------------------
flake.nix | 8 +--
util/default.nix | 4 +-
3 files changed, 28 insertions(+), 112 deletions(-)
diff --git a/flake.lock b/flake.lock
index 56a5cd1..b9809b3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -29,11 +29,11 @@
},
"locked": {
"dir": "pkgs/firefox-addons",
- "lastModified": 1742489760,
- "narHash": "sha256-OkYl/wf09cKviSV1R6SshcRmeX1iDNEKCMg5KlmTwK0=",
+ "lastModified": 1743119709,
+ "narHash": "sha256-tlJY7MfAena/yi3lmd7y7vQGpLma4Q1BLtO4dvzF/Vs=",
"owner": "rycee",
"repo": "nur-expressions",
- "rev": "10f7b577f5081b30ca6b7fd5f98de8d7dfdb5a27",
+ "rev": "f8861a4b09a181dd88f6626d0202d9225ae85d65",
"type": "gitlab"
},
"original": {
@@ -91,39 +91,6 @@
"type": "github"
}
},
- "flake-utils_3": {
- "inputs": {
- "systems": "systems_2"
- },
- "locked": {
- "lastModified": 1731533236,
- "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "flake-utils",
- "type": "github"
- }
- },
- "flakey-profile": {
- "locked": {
- "lastModified": 1712898590,
- "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=",
- "owner": "lf-",
- "repo": "flakey-profile",
- "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d",
- "type": "github"
- },
- "original": {
- "owner": "lf-",
- "repo": "flakey-profile",
- "type": "github"
- }
- },
"home-manager": {
"inputs": {
"nixpkgs": [
@@ -131,11 +98,11 @@
]
},
"locked": {
- "lastModified": 1742588233,
- "narHash": "sha256-Fi5g8H5FXMSRqy+mU6gPG0v+C9pzjYbkkiePtz8+PpA=",
+ "lastModified": 1743259333,
+ "narHash": "sha256-2Fi3K++co4IGbeOLGXdRA6VEfbzQzMgcuBaPTyjfj0s=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "296ddc64627f4a6a4eb447852d7346b9dd16197d",
+ "rev": "1f679ed2a2ebe3894bad9f89fb0bd9f141c28a68",
"type": "github"
},
"original": {
@@ -159,41 +126,6 @@
"type": "github"
}
},
- "lix": {
- "flake": false,
- "locked": {
- "lastModified": 1737234286,
- "narHash": "sha256-pgDJZjj4jpzkFxsqBTI/9Yb0n3gW+DvDtuv9SwQZZcs=",
- "rev": "079528098f5998ba13c88821a2eca1005c1695de",
- "type": "tarball",
- "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/079528098f5998ba13c88821a2eca1005c1695de.tar.gz?rev=079528098f5998ba13c88821a2eca1005c1695de"
- },
- "original": {
- "type": "tarball",
- "url": "https://git.lix.systems/lix-project/lix/archive/release-2.92.tar.gz"
- }
- },
- "lix-module": {
- "inputs": {
- "flake-utils": "flake-utils_2",
- "flakey-profile": "flakey-profile",
- "lix": "lix",
- "nixpkgs": [
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1741892773,
- "narHash": "sha256-8oUT6D7VlsuLkms3zBsUaPBUoxucmFq62QdtyVpjq0Y=",
- "rev": "ed7a2fa83145868ecb830d6b3c73ebfd81a9e911",
- "type": "tarball",
- "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/ed7a2fa83145868ecb830d6b3c73ebfd81a9e911.tar.gz?rev=ed7a2fa83145868ecb830d6b3c73ebfd81a9e911"
- },
- "original": {
- "type": "tarball",
- "url": "https://git.lix.systems/lix-project/nixos-module/archive/stable.tar.gz"
- }
- },
"nix-darwin": {
"inputs": {
"nixpkgs": [
@@ -201,11 +133,11 @@
]
},
"locked": {
- "lastModified": 1742595055,
- "narHash": "sha256-cEetDber6LF8W4ThmRc4rwKs/o8y2GH0pUdX7e6CnAQ=",
+ "lastModified": 1743221873,
+ "narHash": "sha256-i8VPNm4UBsC3Ni6VwjojVJvCpS9GZ4vPrpFRtCGJzBs=",
"owner": "LnL7",
"repo": "nix-darwin",
- "rev": "e9f41de2a81f04390afd106959adf352a207628f",
+ "rev": "53d0f0ed11487a4476741fde757d0feabef4cc4e",
"type": "github"
},
"original": {
@@ -237,17 +169,17 @@
},
"nix-vscode-extensions": {
"inputs": {
- "flake-utils": "flake-utils_3",
+ "flake-utils": "flake-utils_2",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
- "lastModified": 1742522036,
- "narHash": "sha256-OmIHuzgZt38vn9SkysbS5D+KaAbKadtaKfODh0iWALk=",
+ "lastModified": 1743213162,
+ "narHash": "sha256-9UU0x2fZORsX6PEpzkIAD/7+bwm+javJtZA/411ZmLg=",
"owner": "nix-community",
"repo": "nix-vscode-extensions",
- "rev": "4cff80a994fd6edb6c62ee5439cd587b50871cf3",
+ "rev": "1b2a53e3478225bc35d14ae75ea9e7b749c16d5b",
"type": "github"
},
"original": {
@@ -258,11 +190,11 @@
},
"nixos-hardware": {
"locked": {
- "lastModified": 1742376361,
- "narHash": "sha256-VFMgJkp/COvkt5dnkZB4D2szVdmF6DGm5ZdVvTUy61c=",
+ "lastModified": 1743167577,
+ "narHash": "sha256-I09SrXIO0UdyBFfh0fxDq5WnCDg8XKmZ1HQbaXzMA1k=",
"owner": "NixOS",
"repo": "nixos-hardware",
- "rev": "daaae13dff0ecc692509a1332ff9003d9952d7a9",
+ "rev": "0ed819e708af17bfc4bbc63ee080ef308a24aa42",
"type": "github"
},
"original": {
@@ -274,11 +206,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1742422364,
- "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=",
+ "lastModified": 1743095683,
+ "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc",
+ "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6",
"type": "github"
},
"original": {
@@ -295,7 +227,6 @@
"flake-compat": "flake-compat",
"home-manager": "home-manager",
"impermanence": "impermanence",
- "lix-module": "lix-module",
"nix-darwin": "nix-darwin",
"nix-syncthing": "nix-syncthing",
"nix-vscode-extensions": "nix-vscode-extensions",
@@ -328,11 +259,11 @@
]
},
"locked": {
- "lastModified": 1742595978,
- "narHash": "sha256-05onsoMrLyXE4XleDCeLC3bXnC4nyUbKWInGwM7v6hU=",
+ "lastModified": 1742700801,
+ "narHash": "sha256-ZGlpUDsuBdeZeTNgoMv+aw0ByXT2J3wkYw9kJwkAS4M=",
"owner": "Mic92",
"repo": "sops-nix",
- "rev": "b7756921b002de60fb66782effad3ce8bdb5b25d",
+ "rev": "67566fe68a8bed2a7b1175fdfb0697ed22ae8852",
"type": "github"
},
"original": {
@@ -355,21 +286,6 @@
"repo": "default",
"type": "github"
}
- },
- "systems_2": {
- "locked": {
- "lastModified": 1681028828,
- "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
- "owner": "nix-systems",
- "repo": "default",
- "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
- "type": "github"
- },
- "original": {
- "owner": "nix-systems",
- "repo": "default",
- "type": "github"
- }
}
},
"root": "root",
diff --git a/flake.nix b/flake.nix
index f9cb9a6..c5968db 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,10 +5,10 @@
# base packages
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
- lix-module = {
- url = "https://git.lix.systems/lix-project/nixos-module/archive/stable.tar.gz";
- inputs.nixpkgs.follows = "nixpkgs";
- };
+ # lix-module = {
+ # url = "https://git.lix.systems/lix-project/nixos-module/archive/stable.tar.gz";
+ # inputs.nixpkgs.follows = "nixpkgs";
+ # };
# secret encryption
sops-nix = {
diff --git a/util/default.nix b/util/default.nix
index c6e0e06..4b713da 100644
--- a/util/default.nix
+++ b/util/default.nix
@@ -10,7 +10,7 @@
nix-syncthing = inputs.nix-syncthing;
disko = inputs.disko;
impermanence = inputs.impermanence;
- lix-module = inputs.lix-module;
+ # lix-module = inputs.lix-module;
systems = [
"aarch64-darwin"
@@ -83,7 +83,7 @@ in {
impermanence.nixosModules.impermanence
home-manager.nixosModules.home-manager
disko.nixosModules.disko
- lix-module.nixosModules.default
+ # lix-module.nixosModules.default
../modules/nixos-modules
../configurations/nixos/${host}
];