From 4050b8d21204ba7f95da046358146485aca25300 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 2 Jan 2024 21:06:51 +0100 Subject: [PATCH] clean up inputs --- flake.lock | 120 +++++++++++------------------------------------------ flake.nix | 12 +----- 2 files changed, 26 insertions(+), 106 deletions(-) diff --git a/flake.lock b/flake.lock index 871c243..da34a71 100644 --- a/flake.lock +++ b/flake.lock @@ -39,11 +39,11 @@ ] }, "locked": { - "lastModified": 1701473968, - "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=", + "lastModified": 1704152458, + "narHash": "sha256-DS+dGw7SKygIWf9w4eNBUZsK+4Ug27NwEWmn2tnbycg=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5", + "rev": "88a2cd8166694ba0b6cb374700799cec53aef527", "type": "github" }, "original": { @@ -52,21 +52,6 @@ "type": "github" } }, - "flake-schemas": { - "locked": { - "lastModified": 1697467827, - "narHash": "sha256-j8SR19V1SRysyJwpOBF4TLuAvAjF5t+gMiboN4gYQDU=", - "owner": "DeterminateSystems", - "repo": "flake-schemas", - "rev": "764932025c817d4e500a8d2a4d8c565563923d29", - "type": "github" - }, - "original": { - "owner": "DeterminateSystems", - "repo": "flake-schemas", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": [ @@ -154,11 +139,11 @@ ] }, "locked": { - "lastModified": 1703995158, - "narHash": "sha256-oYMwbObpWheGeeNWY1LjO/+omrbAWDNdyzNDxTr2jo8=", + "lastModified": 1704100519, + "narHash": "sha256-SgZC3cxquvwTN07vrYYT9ZkfvuhS5Y1k1F4+AMsuflc=", "owner": "nix-community", "repo": "home-manager", - "rev": "2e8634c252890cb38c60ab996af04926537cbc27", + "rev": "6e91c5df192395753d8e6d55a0352109cb559790", "type": "github" }, "original": { @@ -224,21 +209,6 @@ "type": "github" } }, - "nix-empty-flake": { - "locked": { - "lastModified": 1695341185, - "narHash": "sha256-htO6DSbWyCgaDkxi7foPjXwJFPzGjVt3RRUbPSpNtZY=", - "owner": "chaotic-cx", - "repo": "nix-empty-flake", - "rev": "98b8e330823a3570d328720f87a1153f8a7f2224", - "type": "github" - }, - "original": { - "owner": "chaotic-cx", - "repo": "nix-empty-flake", - "type": "github" - } - }, "nix-filter": { "locked": { "lastModified": 1701697642, @@ -291,28 +261,13 @@ "type": "github" } }, - "nix-systems-linux": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, "nixos-hardware": { "locked": { - "lastModified": 1704061647, - "narHash": "sha256-M/Kxfmb/fkgOz94jQ9eLFpXOhjQJ3CRmdPhVIVXqJmg=", + "lastModified": 1704124233, + "narHash": "sha256-lBHs/yUtkcGgapHRS31oOb5NqvnVrikvktGOW8rK+sE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "316bc98323fe3a7e7f72dbbbe68dce0cce3d4984", + "rev": "f752581d6723a10da7dfe843e917a3b5e4d8115a", "type": "github" }, "original": { @@ -340,16 +295,16 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1703637592, - "narHash": "sha256-8MXjxU0RfFfzl57Zy3OfXCITS0qWDNLzlBAdwxGZwfY=", - "owner": "NixOS", + "lastModified": 1703961334, + "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "cfc3698c31b1fb9cdcf10f36c9643460264d0ca8", + "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9", "type": "github" }, "original": { "dir": "lib", - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -373,11 +328,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1703637592, - "narHash": "sha256-8MXjxU0RfFfzl57Zy3OfXCITS0qWDNLzlBAdwxGZwfY=", + "lastModified": 1703961334, + "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cfc3698c31b1fb9cdcf10f36c9643460264d0ca8", + "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9", "type": "github" }, "original": { @@ -389,11 +344,11 @@ }, "nur": { "locked": { - "lastModified": 1704057136, - "narHash": "sha256-+vj3PjcsFrjdo7op/Jb9xND206FsFatntp7SmTzc8W0=", + "lastModified": 1704224443, + "narHash": "sha256-BhoQWg+1Rf6Ie6CnnPwX4rn2bBnQHWsZEKVEnNnkTp8=", "owner": "nix-community", "repo": "NUR", - "rev": "74bee334e8d3cadfe11fefea2ae426e0c25246d7", + "rev": "c4f5f8beacb9819f19dbae1d1e09c2dfd404d542", "type": "github" }, "original": { @@ -496,11 +451,11 @@ ] }, "locked": { - "lastModified": 1704022100, - "narHash": "sha256-9ey5D3OhDVMetNRMIlzdXmOtVNAjx/KtTiEWyX5RejQ=", + "lastModified": 1704194907, + "narHash": "sha256-auDvhr7o7z0axOlwBsHSx6np9eJNvpg2Nn5QW4oNGcU=", "owner": "PrismLauncher", "repo": "PrismLauncher", - "rev": "b280a6d36db26b3815ea5d91955db9c5510b93b1", + "rev": "0cf9b6537b055e85759a0b0ecb7d06338cb00478", "type": "github" }, "original": { @@ -513,17 +468,14 @@ "inputs": { "flake-compat": "flake-compat", "flake-parts": "flake-parts", - "flake-schemas": "flake-schemas", "flake-utils": "flake-utils", "gitignore": "gitignore", "home-manager": "home-manager", "jovian": "jovian", "kde2nix": "kde2nix", "libnbtplusplus": "libnbtplusplus", - "nix-empty-flake": "nix-empty-flake", "nix-filter": "nix-filter", "nix-systems": "nix-systems", - "nix-systems-linux": "nix-systems-linux", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2", "nixpkgs-lib": "nixpkgs-lib", @@ -531,8 +483,7 @@ "pre-commit-hooks": "pre-commit-hooks_2", "prism-game-options-patch": "prism-game-options-patch", "prismlauncher": "prismlauncher", - "tela-icon-theme": "tela-icon-theme", - "yafas": "yafas" + "tela-icon-theme": "tela-icon-theme" } }, "systems": { @@ -565,29 +516,6 @@ "repo": "Tela-icon-theme", "type": "github" } - }, - "yafas": { - "inputs": { - "flake-schemas": [ - "flake-schemas" - ], - "systems": [ - "nix-systems" - ] - }, - "locked": { - "lastModified": 1695926485, - "narHash": "sha256-wNFFnItckgSs8XeYhhv8vlJs2WF09fSQaWgw4xkDqHQ=", - "owner": "UbiqueLambda", - "repo": "yafas", - "rev": "7772afd6686458ca0ddbc599a52cf5d337367653", - "type": "github" - }, - "original": { - "owner": "UbiqueLambda", - "repo": "yafas", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 3294ddf..99eb378 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { description = "jopejoe1 NixOS configuration"; - inputs = { + inputs = rec { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; kde2nix.url = "github:nix-community/kde2nix"; nur.url = "github:nix-community/NUR"; @@ -33,8 +33,7 @@ url = "github:hercules-ci/flake-parts"; inputs.nixpkgs-lib.follows = "nixpkgs-lib"; }; - nixpkgs-lib.url = "github:NixOS/nixpkgs/nixos-unstable?dir=lib"; - flake-schemas.url = "github:DeterminateSystems/flake-schemas"; + nixpkgs-lib.url = "github:nixos/nixpkgs/nixos-unstable?dir=lib"; pre-commit-hooks = { url = "github:cachix/pre-commit-hooks.nix"; inputs.nixpkgs.follows = "nixpkgs"; @@ -43,11 +42,6 @@ inputs.gitignore.follows = "gitignore"; inputs.flake-utils.follows = "flake-utils"; }; - yafas = { - url = "github:UbiqueLambda/yafas"; - inputs.flake-schemas.follows = "flake-schemas"; - inputs.systems.follows = "nix-systems"; - }; flake-compat = { url = "github:edolstra/flake-compat"; flake = false; @@ -65,8 +59,6 @@ inputs.systems.follows = "nix-systems"; }; nix-systems.url = "github:nix-systems/default"; - nix-systems-linux.url = "github:nix-systems/default-linux"; - nix-empty-flake.url = "github:chaotic-cx/nix-empty-flake"; nix-filter.url = "github:numtide/nix-filter"; # Patches