diff --git a/flake.lock b/flake.lock index c3feae8..8a85aa3 100644 --- a/flake.lock +++ b/flake.lock @@ -1,28 +1,5 @@ { "nodes": { - "aagl": { - "inputs": { - "flake-compat": [ - "flake-compat" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1721560199, - "narHash": "sha256-XQVh+i9/m2J2AfwuqJcKpm3GM67Top8mHKgaJ7lL1l0=", - "owner": "ezKEa", - "repo": "aagl-gtk-on-nix", - "rev": "cdb74c540af1d365ea799ba5d2200df707e31090", - "type": "github" - }, - "original": { - "owner": "ezKEa", - "repo": "aagl-gtk-on-nix", - "type": "github" - } - }, "crane": { "inputs": { "nixpkgs": [ @@ -257,32 +234,6 @@ "type": "github" } }, - "nix-formatter-pack": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ], - "nmd": [ - "nmd" - ], - "nmt": [ - "nmt" - ] - }, - "locked": { - "lastModified": 1715807870, - "narHash": "sha256-lutvG1LFGSpXsGA7U4TWfdfq6p71WdSlhw3vM4W/Opk=", - "owner": "Gerschtli", - "repo": "nix-formatter-pack", - "rev": "ab5feb867e5d074918852de6134500a82a09dc48", - "type": "github" - }, - "original": { - "owner": "Gerschtli", - "repo": "nix-formatter-pack", - "type": "github" - } - }, "nixos-hardware": { "locked": { "lastModified": 1722114937, @@ -329,61 +280,6 @@ "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1720535198, - "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nmd": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ], - "scss-reset": [ - "scss-reset" - ] - }, - "locked": { - "lastModified": 1705050560, - "narHash": "sha256-x3zzcdvhJpodsmdjqB4t5mkVW22V3wqHLOun0KRBzUI=", - "owner": "~rycee", - "repo": "nmd", - "rev": "66d9334933119c36f91a78d565c152a4fdc8d3d3", - "type": "sourcehut" - }, - "original": { - "owner": "~rycee", - "repo": "nmd", - "type": "sourcehut" - } - }, - "nmt": { - "flake": false, - "locked": { - "lastModified": 1705307515, - "narHash": "sha256-krVKx3/u1mDo8qe5qylYgmwAmlAPHa1BSPDzxq09FmI=", - "owner": "~rycee", - "repo": "nmt", - "rev": "1562940b7765a32f1987bd9a3ee6a4fa034c9429", - "type": "sourcehut" - }, - "original": { - "owner": "~rycee", - "repo": "nmt", - "type": "sourcehut" - } - }, "nur": { "locked": { "lastModified": 1722176547, @@ -411,7 +307,7 @@ "nixpkgs" ], "nixpkgs-stable": [ - "nixpkgs-stable" + "nixpkgs" ] }, "locked": { @@ -430,7 +326,6 @@ }, "root": { "inputs": { - "aagl": "aagl", "crane": "crane", "disko": "disko", "flake-compat": "flake-compat", @@ -442,17 +337,12 @@ "lanzaboote": "lanzaboote", "neovim": "neovim", "nix-darwin": "nix-darwin", - "nix-formatter-pack": "nix-formatter-pack", "nixos-hardware": "nixos-hardware", "nixos-sensible": "nixos-sensible", "nixpkgs": "nixpkgs", - "nixpkgs-stable": "nixpkgs-stable", - "nmd": "nmd", - "nmt": "nmt", "nur": "nur", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay", - "scss-reset": "scss-reset", "sops-nix": "sops-nix", "srvos": "srvos", "systems": "systems", @@ -479,29 +369,13 @@ "type": "github" } }, - "scss-reset": { - "flake": false, - "locked": { - "lastModified": 1683906868, - "narHash": "sha256-cif5Sx8Ca5vxdw/mNAgpulLH15TwmzyJFNM7JURpoaE=", - "owner": "andreymatin", - "repo": "scss-reset", - "rev": "5a7bd491ac82441e6283fb0d5d54644b913b30c7", - "type": "github" - }, - "original": { - "owner": "andreymatin", - "repo": "scss-reset", - "type": "github" - } - }, "sops-nix": { "inputs": { "nixpkgs": [ "nixpkgs" ], "nixpkgs-stable": [ - "nixpkgs-stable" + "nixpkgs" ] }, "locked": { diff --git a/flake.nix b/flake.nix index fb9d02c..8d44309 100644 --- a/flake.nix +++ b/flake.nix @@ -8,13 +8,7 @@ # # REFERENCE: https://discourse.nixos.org/t/differences-between-nix-channels/13998/5 nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-23.11"; - aagl = { - url = "github:ezKEa/aagl-gtk-on-nix"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-compat.follows = "flake-compat"; - }; disko = { url = "github:nix-community/disko"; inputs.nixpkgs.follows = "nixpkgs"; @@ -62,7 +56,7 @@ sops-nix = { url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; - inputs.nixpkgs-stable.follows = "nixpkgs-stable"; + inputs.nixpkgs-stable.follows = "nixpkgs"; }; srvos = { url = "github:nix-community/srvos"; @@ -90,25 +84,10 @@ url = "github:hercules-ci/gitignore.nix"; inputs.nixpkgs.follows = "nixpkgs"; }; - nix-formatter-pack = { - url = "github:Gerschtli/nix-formatter-pack"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.nmd.follows = "nmd"; - inputs.nmt.follows = "nmt"; - }; - nmd = { - url = "sourcehut:~rycee/nmd"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.scss-reset.follows = "scss-reset"; - }; - nmt = { - url = "sourcehut:~rycee/nmt"; - flake = false; - }; pre-commit-hooks-nix = { url = "github:cachix/pre-commit-hooks.nix"; inputs.nixpkgs.follows = "nixpkgs"; - inputs.nixpkgs-stable.follows = "nixpkgs-stable"; + inputs.nixpkgs-stable.follows = "nixpkgs"; inputs.flake-compat.follows = "flake-compat"; inputs.gitignore.follows = "gitignore"; }; @@ -116,10 +95,6 @@ url = "github:oxalica/rust-overlay"; inputs.nixpkgs.follows = "nixpkgs"; }; - scss-reset = { - url = "github:andreymatin/scss-reset"; - flake = false; - }; }; outputs = inputs: diff --git a/nixos/profiles/core/default.nix b/nixos/profiles/core/default.nix index 9de2a15..b846d04 100644 --- a/nixos/profiles/core/default.nix +++ b/nixos/profiles/core/default.nix @@ -13,7 +13,6 @@ "${inputs.srvos}/nixos/common/well-known-hosts.nix" ] ++ (with inputs; [ - aagl.nixosModules.default disko.nixosModules.disko home-manager.nixosModules.home-manager impermanence.nixosModules.impermanence