From edddd33377946d2f6ac7a09eedbcd9b81c5222c5 Mon Sep 17 00:00:00 2001
From: GRMrGecko <grmrgecko@gmail.com>
Date: Fri, 18 Apr 2025 23:13:10 -0500
Subject: [PATCH] Updated 2024-04-18
---
flake.lock | 116 +++++++++++++++++++++++-----------------
flake.nix | 1 -
modules/nixos/users.nix | 2 +-
update.sh | 2 +-
4 files changed, 69 insertions(+), 52 deletions(-)
diff --git a/flake.lock b/flake.lock
index 8ac22b5..ccaa110 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
]
},
"locked": {
- "lastModified": 1731746438,
- "narHash": "sha256-f3SSp1axoOk0NAI7oFdRzbxG2XPBSIXC+/DaAXnvS1A=",
+ "lastModified": 1744940522,
+ "narHash": "sha256-TNoetfICvd29DhxRPpmyKItQBDlqSvKcV+wGNkn14jk=",
"owner": "nix-community",
"repo": "disko",
- "rev": "cb64993826fa7a477490be6ccb38ba1fa1e18fa8",
+ "rev": "51d33bbb7f1e74ba5f9d9a77357735149da99081",
"type": "github"
},
"original": {
@@ -22,15 +22,16 @@
},
"flatpaks": {
"inputs": {
- "nixpkgs": "nixpkgs",
- "utils": "utils"
+ "home-manager": "home-manager",
+ "nixpkgs": "nixpkgs_2",
+ "systems": "systems"
},
"locked": {
- "lastModified": 1730294700,
- "narHash": "sha256-piHI881ekHn14FEqwGyKkTEHTgXJrsKjX37gJFYx9G8=",
+ "lastModified": 1733581530,
+ "narHash": "sha256-W+orHmF+XpZosrBFAFRs7sS1iVKYveg9SutkzSXMVsI=",
"owner": "GermanBread",
"repo": "declarative-flatpak",
- "rev": "09b73f988d4a8376b81d0d22126bc8c2e039d36d",
+ "rev": "b88bd5b65f8e7c35eec0a90cfd6e096b2e7f79c0",
"type": "github"
},
"original": {
@@ -42,9 +43,7 @@
},
"home-manager": {
"inputs": {
- "nixpkgs": [
- "nixpkgs"
- ]
+ "nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1733572789,
@@ -68,11 +67,11 @@
]
},
"locked": {
- "lastModified": 1742246081,
- "narHash": "sha256-1e4oFbtdOOb6NqauHevWWjEUXZnfZ6RUAJJjn9i4YBc=",
+ "lastModified": 1745033012,
+ "narHash": "sha256-KjBMsjCzIOWgDqTZMYIriPFmHiQcCb2RhuDh5JF0VVc=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "c657142e24a43ea1035889f0b0a7c24598e0e18a",
+ "rev": "ae84885d9b6b62dc58ccd300e9ab321a3fd9f9c7",
"type": "github"
},
"original": {
@@ -82,29 +81,50 @@
"type": "github"
}
},
+ "home-manager_2": {
+ "inputs": {
+ "nixpkgs": [
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1744743431,
+ "narHash": "sha256-iyn/WBYDc7OtjSawbegINDe/gIkok888kQxk3aVnkgg=",
+ "owner": "nix-community",
+ "repo": "home-manager",
+ "rev": "c61bfe3ae692f42ce688b5865fac9e0de58e1387",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-community",
+ "ref": "release-24.11",
+ "repo": "home-manager",
+ "type": "github"
+ }
+ },
"nixpkgs": {
"locked": {
- "lastModified": 1727907660,
- "narHash": "sha256-QftbyPoieM5M50WKUMzQmWtBWib/ZJbHo7mhj5riQec=",
+ "lastModified": 1731755305,
+ "narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "5966581aa04be7eff830b9e1457d56dc70a0b798",
+ "rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "nixos-24.05",
+ "ref": "nixos-24.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-unstable": {
"locked": {
- "lastModified": 1731676054,
- "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=",
+ "lastModified": 1744932701,
+ "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add",
+ "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef",
"type": "github"
},
"original": {
@@ -116,11 +136,27 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1733550349,
- "narHash": "sha256-NcGumB4Lr6KSDq+nIqXtNA8QwAQKDSZT7N9OTGWbTrs=",
+ "lastModified": 1733412085,
+ "narHash": "sha256-FillH0qdWDt/nlO6ED7h4cmN+G9uXwGjwmCnHs0QVYM=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "e2605d0744c2417b09f8bf850dfca42fcf537d34",
+ "rev": "4dc2fc4e62dbf62b84132fe526356fbac7b03541",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nixos",
+ "ref": "nixos-24.11",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs_3": {
+ "locked": {
+ "lastModified": 1744440957,
+ "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=",
+ "owner": "nixos",
+ "repo": "nixpkgs",
+ "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d",
"type": "github"
},
"original": {
@@ -134,42 +170,24 @@
"inputs": {
"disko": "disko",
"flatpaks": "flatpaks",
- "home-manager": "home-manager",
+ "home-manager": "home-manager_2",
"home-manager-unstable": "home-manager-unstable",
- "nixpkgs": "nixpkgs_2",
+ "nixpkgs": "nixpkgs_3",
"nixpkgs-unstable": "nixpkgs-unstable"
}
},
"systems": {
"locked": {
- "lastModified": 1681028828,
- "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+ "lastModified": 1689347949,
+ "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"owner": "nix-systems",
- "repo": "default",
- "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+ "repo": "default-linux",
+ "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
"type": "github"
},
"original": {
"owner": "nix-systems",
- "repo": "default",
- "type": "github"
- }
- },
- "utils": {
- "inputs": {
- "systems": "systems"
- },
- "locked": {
- "lastModified": 1726560853,
- "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "flake-utils",
+ "repo": "default-linux",
"type": "github"
}
}
diff --git a/flake.nix b/flake.nix
index 31951a4..8fa600a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -73,7 +73,6 @@
system = settings.system;
specialArgs = {
inherit inputs;
- inherit pkgs;
inherit settings;
};
modules = [
diff --git a/modules/nixos/users.nix b/modules/nixos/users.nix
index cf86f35..09eb8aa 100644
--- a/modules/nixos/users.nix
+++ b/modules/nixos/users.nix
@@ -33,7 +33,7 @@
};
environment.systemPackages = with pkgs; [
- unstable.nodejs_22
+ nodejs_23
pure-prompt
fastfetch
home-manager
diff --git a/update.sh b/update.sh
index ff25877..0bdcbfd 100755
--- a/update.sh
+++ b/update.sh
@@ -20,7 +20,7 @@ if ! grep -q "nixosConfigurations.$host " flake.nix; then
fi
# Update nixpkgs.
-if ! $sudoCmd nix flake update "$nixosDir"; then
+if ! $sudoCmd nix flake update; then
echo "Update failed"
exit 1
fi