diff --git a/flake.lock b/flake.lock index 5719592..c3e6160 100644 --- a/flake.lock +++ b/flake.lock @@ -202,22 +202,6 @@ "type": "github" } }, - "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -262,48 +246,6 @@ } }, "flake-parts_3": { - "inputs": { - "nixpkgs-lib": [ - "nixified-ai", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1698882062, - "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_4": { - "inputs": { - "nixpkgs-lib": [ - "nixified-ai", - "hercules-ci-effects", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1696343447, - "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", - "type": "github" - }, - "original": { - "id": "flake-parts", - "type": "indirect" - } - }, - "flake-parts_5": { "inputs": { "nixpkgs-lib": [ "nixos-anywhere", @@ -324,7 +266,7 @@ "type": "github" } }, - "flake-parts_6": { + "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "nixvim", @@ -430,28 +372,6 @@ "type": "github" } }, - "hercules-ci-effects": { - "inputs": { - "flake-parts": "flake-parts_4", - "nixpkgs": [ - "nixified-ai", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1699381651, - "narHash": "sha256-mZlQ54xJs3j5+SJrLhzePPMXzS+Czbx7gNyOnOAQrHA=", - "owner": "hercules-ci", - "repo": "hercules-ci-effects", - "rev": "0bd99f5ab7ec7a74c11238bd02bb29e709c14328", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "hercules-ci-effects", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -487,23 +407,6 @@ "type": "github" } }, - "invokeai-src": { - "flake": false, - "locked": { - "lastModified": 1697424725, - "narHash": "sha256-y3nxZ4PQ/d2wMX1crpJPDMYXf48YBG0sRIBOTgN6XlI=", - "owner": "invoke-ai", - "repo": "InvokeAI", - "rev": "ad786130ffb11f91cbfcc40846114dd1fdcecdf6", - "type": "github" - }, - "original": { - "owner": "invoke-ai", - "ref": "v3.3.0post3", - "repo": "InvokeAI", - "type": "github" - } - }, "jovian": { "inputs": { "nix-github-actions": "nix-github-actions", @@ -525,22 +428,6 @@ "type": "github" } }, - "libnbtplusplus": { - "flake": false, - "locked": { - "lastModified": 1699286814, - "narHash": "sha256-yy0q+bky80LtK1GWzz7qpM+aAGrOqLuewbid8WT1ilk=", - "owner": "PrismLauncher", - "repo": "libnbtplusplus", - "rev": "23b955121b8217c1c348a9ed2483167a6f3ff4ad", - "type": "github" - }, - "original": { - "owner": "PrismLauncher", - "repo": "libnbtplusplus", - "type": "github" - } - }, "nether": { "inputs": { "clan-core": "clan-core", @@ -586,21 +473,6 @@ "type": "github" } }, - "nix-filter": { - "locked": { - "lastModified": 1710156097, - "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "3342559a24e85fc164b295c3444e8a139924675b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "nix-filter", - "type": "github" - } - }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -623,30 +495,6 @@ "type": "github" } }, - "nixified-ai": { - "inputs": { - "flake-parts": "flake-parts_3", - "hercules-ci-effects": "hercules-ci-effects", - "invokeai-src": "invokeai-src", - "nixpkgs": [ - "nixpkgs" - ], - "textgen-src": "textgen-src" - }, - "locked": { - "lastModified": 1701304375, - "narHash": "sha256-WI/SimUvHPIWFhQTY04+1yCVjZzVjVb28pSE4S2yhFA=", - "owner": "nixified-ai", - "repo": "flake", - "rev": "63339e4c8727578a0fe0f2c63865f60b6e800079", - "type": "github" - }, - "original": { - "owner": "nixified-ai", - "repo": "flake", - "type": "github" - } - }, "nixlib": { "locked": { "lastModified": 1727571693, @@ -667,7 +515,7 @@ "disko": [ "disko" ], - "flake-parts": "flake-parts_5", + "flake-parts": "flake-parts_3", "nixos-images": "nixos-images", "nixos-stable": "nixos-stable", "nixpkgs": [ @@ -832,7 +680,7 @@ "inputs": { "devshell": "devshell", "flake-compat": "flake-compat", - "flake-parts": "flake-parts_6", + "flake-parts": "flake-parts_4", "git-hooks": "git-hooks", "home-manager": [ "home-manager" @@ -880,29 +728,6 @@ "type": "github" } }, - "prismlauncher": { - "inputs": { - "flake-compat": "flake-compat_2", - "libnbtplusplus": "libnbtplusplus", - "nix-filter": "nix-filter", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1727593645, - "narHash": "sha256-q1/H7WJiI74tRfiWBuCmIxxivSbUF+sY02Pvl0runUs=", - "owner": "PrismLauncher", - "repo": "PrismLauncher", - "rev": "a63451212f0d6bd22bca4d0842d633ea3919a7c2", - "type": "github" - }, - "original": { - "owner": "PrismLauncher", - "repo": "PrismLauncher", - "type": "github" - } - }, "root": { "inputs": { "catppuccin": "catppuccin", @@ -912,25 +737,22 @@ "impermanence": "impermanence", "jovian": "jovian", "nether": "nether", - "nixified-ai": "nixified-ai", "nixos-anywhere": "nixos-anywhere", "nixos-facter-modules": "nixos-facter-modules_2", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "nixvim": "nixvim", - "prismlauncher": "prismlauncher", "snm": "snm", "sops-nix": "sops-nix_2", "srvos": "srvos", - "tela-icon-theme": "tela-icon-theme", "treefmt-nix": "treefmt-nix_5" } }, "snm": { "inputs": { "blobs": "blobs", - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "nixpkgs": [ "nixpkgs" ], @@ -1049,39 +871,6 @@ "type": "github" } }, - "tela-icon-theme": { - "flake": false, - "locked": { - "lastModified": 1725386279, - "narHash": "sha256-ZzF4U/cTy/7oSDQs4+dezewgNzS5zroba8wpcfPciW4=", - "owner": "vinceliuice", - "repo": "Tela-icon-theme", - "rev": "01f163eef208f1556e42ddd17c5569e6e0bf19f5", - "type": "github" - }, - "original": { - "owner": "vinceliuice", - "repo": "Tela-icon-theme", - "type": "github" - } - }, - "textgen-src": { - "flake": false, - "locked": { - "lastModified": 1696789008, - "narHash": "sha256-+V8XOVnEyImj+a8uCkZXEHXW8bTIBRlnfMcQfcZNgqg=", - "owner": "oobabooga", - "repo": "text-generation-webui", - "rev": "2e471071af48e19867cfa522d2def44c24785c50", - "type": "github" - }, - "original": { - "owner": "oobabooga", - "ref": "v1.7", - "repo": "text-generation-webui", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index dd3b9d3..4fdf366 100644 --- a/flake.nix +++ b/flake.nix @@ -5,11 +5,6 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixos-facter-modules.url = "github:numtide/nixos-facter-modules"; - nixified-ai = { - url = "github:nixified-ai/flake"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - # Outputs nixos-generators = { url = "github:nix-community/nixos-generators"; @@ -56,14 +51,6 @@ }; # Packages - tela-icon-theme = { - url = "github:vinceliuice/Tela-icon-theme"; - flake = false; - }; - prismlauncher = { - url = "github:PrismLauncher/PrismLauncher"; - inputs.nixpkgs.follows = "nixpkgs"; - }; firefox-addons = { url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/packages/default.nix b/packages/default.nix index b3015e0..340a8d5 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -5,21 +5,11 @@ }: { - tela-icon-theme-git = pkgs.tela-icon-theme.overrideAttrs { src = inputs.tela-icon-theme; }; - libadwaita-follow-theme = pkgs.libadwaita.overrideAttrs (old: { patches = (old.patches or [ ]) ++ [ ./adwaita-theming-support.patch ]; doCheck = false; }); - prismlauncher-withExtraStuff = - inputs.prismlauncher.packages.${system}.prismlauncher.override - { - prismlauncher-unwrapped = inputs.prismlauncher.packages.${system}.prismlauncher-unwrapped.overrideAttrs (old: { - patches = (old.patches or [ ]) ++ [ ./prism-ftb.patch ]; - }); - }; - nixos-anywhere = inputs.nixos-anywhere.packages.${system}.nixos-anywhere; kde-hdr-fix = pkgs.callPackage ./kde-hdr.nix { }; diff --git a/systems/benzaiten/default.nix b/systems/benzaiten/default.nix index 84600da..ae641d0 100644 --- a/systems/benzaiten/default.nix +++ b/systems/benzaiten/default.nix @@ -18,7 +18,6 @@ audio = { enable = true; }; - bluetooth.enable = true; local.enable = true; nix.enable = true; plasma.enable = true; diff --git a/systems/ebisu/default.nix b/systems/ebisu/default.nix index 3696291..ff2ac6c 100644 --- a/systems/ebisu/default.nix +++ b/systems/ebisu/default.nix @@ -6,7 +6,6 @@ audio = { enable = true; }; - bluetooth.enable = true; local.enable = true; nix.enable = true; user = { diff --git a/systems/sukuna-biko-na/default.nix b/systems/sukuna-biko-na/default.nix index 5d8ef1c..5f35ae1 100644 --- a/systems/sukuna-biko-na/default.nix +++ b/systems/sukuna-biko-na/default.nix @@ -29,7 +29,6 @@ jopejoe1 = { audio.enable = true; - bluetooth.enable = true; local.enable = true; nix.enable = true; kodi.enable = true;