From 7cc114a056e91b342d3fe804341970123bffa505 Mon Sep 17 00:00:00 2001 From: Nathan Date: Tue, 26 Aug 2025 11:49:35 -0500 Subject: [PATCH] update --- flake.lock | 158 ++++++++++++++++++++--------------------------------- flake.nix | 20 +------ 2 files changed, 59 insertions(+), 119 deletions(-) diff --git a/flake.lock b/flake.lock index 831190c..781eed5 100644 --- a/flake.lock +++ b/flake.lock @@ -61,11 +61,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1756094605, - "narHash": "sha256-EVEL1nB9n3G5ysABWR1MYB0JX92grZ0eGUU57qIytew=", + "lastModified": 1756181002, + "narHash": "sha256-bPChgpfVqZQxkX0sqFVypO4CFu+swVqqgWySHWK+1wc=", "owner": "rycee", "repo": "nur-expressions", - "rev": "b4df8d436285dda8d83386d1df3f82be5c1a7180", + "rev": "3cb5445c6a575cf7ece61678449bee89eec864d7", "type": "gitlab" }, "original": { @@ -226,27 +226,6 @@ "type": "github" } }, - "home-manager-droid": { - "inputs": { - "nixpkgs": [ - "nixpkgs-droid" - ] - }, - "locked": { - "lastModified": 1726989464, - "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-24.05", - "repo": "home-manager", - "type": "github" - } - }, "home-manager-us": { "inputs": { "nixpkgs": [ @@ -268,6 +247,27 @@ "type": "github" } }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "nix-on-droid", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709445365, + "narHash": "sha256-DVv6nd9FQBbMWbOmhq0KVqmlc3y3FMSYl49UXmMcO+0=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "4de84265d7ec7634a69ba75028696d74de9a44a7", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, "hyprcursor": { "inputs": { "hyprlang": [ @@ -565,7 +565,10 @@ "nix-on-droid", "nixpkgs" ], - "nmd": "nmd", + "nmd": [ + "nix-on-droid", + "nmd" + ], "nmt": "nmt" }, "locked": { @@ -604,28 +607,23 @@ }, "nix-on-droid": { "inputs": { - "home-manager": [ - "home-manager-droid" - ], + "home-manager": "home-manager_2", "nix-formatter-pack": "nix-formatter-pack", - "nixpkgs": [ - "nixpkgs-droid" - ], + "nixpkgs": "nixpkgs_3", "nixpkgs-docs": "nixpkgs-docs", "nixpkgs-for-bootstrap": "nixpkgs-for-bootstrap", - "nmd": "nmd_2" + "nmd": "nmd" }, "locked": { - "lastModified": 1720396533, - "narHash": "sha256-UFzk/hZWO1VkciIO5UPaSpJN8s765wsngUSvtJM6d5Q=", + "lastModified": 1753100895, + "narHash": "sha256-nEuGlpIT7q4c/otPu00pGhb5Y12FtQm00pH3MXOJpfw=", "owner": "nix-community", "repo": "nix-on-droid", - "rev": "f3d3b8294039f2f9a8fb7ea82c320f29c6b0fe25", + "rev": "27696cac81d4444319bb9158037b0da45e213f5e", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", "repo": "nix-on-droid", "type": "github" } @@ -662,22 +660,6 @@ "type": "github" } }, - "nixpkgs-droid": { - "locked": { - "lastModified": 1735563628, - "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-for-bootstrap": { "locked": { "lastModified": 1720244366, @@ -711,11 +693,11 @@ }, "nixpkgs-us": { "locked": { - "lastModified": 1755615617, - "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", + "lastModified": 1756125398, + "narHash": "sha256-XexyKZpf46cMiO5Vbj+dWSAXOnr285GHsMch8FBoHbc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "20075955deac2583bb12f07151c2df830ef346b4", + "rev": "3b9f00d7a7bf68acd4c4abb9d43695afb04e03a5", "type": "github" }, "original": { @@ -742,6 +724,21 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1708172716, + "narHash": "sha256-3M94oln0b61m3dUmLyECCA9hYAHXZEszM4saE3CmQO4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5d874ac46894c896119bce68e758e9e80bdb28f1", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1755922037, "narHash": "sha256-wY1+2JPH0ZZC4BQefoZw/k+3+DowFyfOxv17CN/idKs=", @@ -757,7 +754,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1755615617, "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", @@ -773,7 +770,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1755577059, "narHash": "sha256-5hYhxIpco8xR+IpP3uU56+4+Bw7mf7EMyxS/HqUYHQY=", @@ -792,7 +789,7 @@ "nixvim": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nixvim": "nixvim_2" }, "locked": { @@ -812,7 +809,7 @@ "nixvim_2": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "nuschtosSearch": "nuschtosSearch", "systems": "systems_4" }, @@ -831,22 +828,6 @@ } }, "nmd": { - "flake": false, - "locked": { - "lastModified": 1666190571, - "narHash": "sha256-Z1hc7M9X6L+H83o9vOprijpzhTfOBjd0KmUTnpHAVjA=", - "owner": "rycee", - "repo": "nmd", - "rev": "b75d312b4f33bd3294cd8ae5c2ca8c6da2afc169", - "type": "gitlab" - }, - "original": { - "owner": "rycee", - "repo": "nmd", - "type": "gitlab" - } - }, - "nmd_2": { "inputs": { "nixpkgs": [ "nix-on-droid", @@ -936,17 +917,14 @@ "disko": "disko", "firefox-addons": "firefox-addons", "home-manager": "home-manager", - "home-manager-droid": "home-manager-droid", "home-manager-us": "home-manager-us", "hyprland": "hyprland", "nix-minecraft": "nix-minecraft", "nix-on-droid": "nix-on-droid", - "nixpkgs": "nixpkgs_3", - "nixpkgs-droid": "nixpkgs-droid", + "nixpkgs": "nixpkgs_4", "nixpkgs-us": "nixpkgs-us", "nixvim": "nixvim", - "sops-nix": "sops-nix", - "themecord": "themecord" + "sops-nix": "sops-nix" } }, "scss-reset": { @@ -1045,26 +1023,6 @@ "type": "github" } }, - "themecord": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1743970059, - "narHash": "sha256-vwrIULP9VmYqhNtHcNaPat6OjKqbDgwf3qSypOusG9c=", - "owner": "danihek", - "repo": "themecord", - "rev": "2117717f830c4847eafc450319de26ae09ac9277", - "type": "github" - }, - "original": { - "owner": "danihek", - "repo": "themecord", - "type": "github" - } - }, "xdph": { "inputs": { "hyprland-protocols": [ diff --git a/flake.nix b/flake.nix index 5219dfd..b2ef6b6 100644 --- a/flake.nix +++ b/flake.nix @@ -20,18 +20,8 @@ inputs.nixpkgs.follows = "nixpkgs-us"; }; - nixpkgs-droid.url = "github:nixos/nixpkgs/nixos-24.05"; - - home-manager-droid = { - url = "github:nix-community/home-manager/release-24.05"; - #url = "git+ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/home-manager?ref=release-24.05"; - inputs.nixpkgs.follows = "nixpkgs-droid"; - }; - nix-on-droid = { - url = "github:nix-community/nix-on-droid/release-24.05"; - inputs.nixpkgs.follows = "nixpkgs-droid"; - inputs.home-manager.follows = "home-manager-droid"; + url = "github:nix-community/nix-on-droid"; }; disko = { @@ -60,11 +50,6 @@ nixvim.url = "git+ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/Moirai"; #nixvim.url = "git+https://gitea.blunkall.us/Blunkall-Technologies/Moirai"; - themecord = { - url = "github:danihek/themecord"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - }; outputs = { self, nixpkgs, home-manager, ... } @ inputs: { @@ -164,9 +149,6 @@ home-manager-config = import ./home-manager; }; }; - - home-manager-path = home-manager.outPath; - };