diff --git a/flake.lock b/flake.lock index 071e2efc7d8a109312c4c6ebc705754bc572fda9..99e6f6e9d54174ba778758c3cf83a7bac554c4f6 100644 --- a/flake.lock +++ b/flake.lock @@ -410,7 +410,6 @@ }, "helix": { "inputs": { "nixpkgs": [ - "jolheiser", "nixpkgs" ] }, @@ -446,24 +445,6 @@ "original": { "owner": "nix-community", "repo": "home-manager", "type": "github" - } - }, - "jolheiser": { - "inputs": { - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1730336659, - "narHash": "sha256-DYQUprBce8sXdBj7Ub1h/52GnGvxiXelvucVTcTXE8I=", - "ref": "refs/heads/main", - "rev": "69856a465c69e5b456ef652f0f5f17a12b9d8c02", - "revCount": 3, - "type": "git", - "url": "https://git.jolheiser.com/nixpkgs.git" - }, - "original": { - "type": "git", - "url": "https://git.jolheiser.com/nixpkgs.git" } }, "nixos-hardware": { @@ -533,23 +514,6 @@ }, "nixpkgs_2": { "locked": { { - "nixpkgs-unstable": "nixpkgs-unstable", - "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { -{ "revCount": 7679, "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", "owner": "nixos", @@ -565,7 +529,7 @@ "type": "github" } }, }, - "nixpkgs": [ +{ "locked": { "lastModified": 1725432240, "narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=", @@ -637,12 +601,9 @@ "gomodinit": "gomodinit", "helix": "helix", "home-manager": "home-manager", "nodes": { - "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41", - "nodes": { "type": "github" - "nodes": { "actual": { -{ + "revCount": 26, "nur": "nur", "resume": "resume", "spectre": "spectre", @@ -842,7 +803,7 @@ "tclip": { "inputs": { "gomod2nix": "gomod2nix", "nodes": { - "owner": "reckenrode", + "bennet": { "utils": [ "flake-utils" ] diff --git a/flake.nix b/flake.nix index c8f141a3ccdbeacdec15f408df6c808e22e3d348..0298d1ff65ac5c0367adc546440edf8099ad7165 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,6 @@ description = "jolheiser's nixos config"; inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - jolheiser.url = "git+https://git.jolheiser.com/nixpkgs.git"; flake-utils.url = "github:numtide/flake-utils"; # Only expressed here to use for followers home-manager = { @@ -22,7 +21,7 @@ nixos-hardware.url = "github:nixos/nixos-hardware/master"; nur.url = "github:nix-community/NUR"; helix = { url = "git+https://git.jolheiser.com/helix.drv.git"; - inputs.nixpkgs.follows = "jolheiser/nixpkgs"; + inputs.nixpkgs.follows = "nixpkgs"; }; website = { url = "git+https://git.jolheiser.com/jolheiser.com.git";