diff --git a/flake.nix b/flake.nix index d6094abe..96a5a1d9 100644 --- a/flake.nix +++ b/flake.nix @@ -4,11 +4,6 @@ inputs = { # NixOS related inputs nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; - nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; - nixpkgs-unfree = { - url = "github:numtide/nixpkgs-unfree"; - inputs.nixpkgs.follows = "nixpkgs-unstable"; - }; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; sops-nix = { @@ -28,11 +23,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - aagl = { - url = "github:ezKEa/aagl-gtk-on-nix/release-24.05"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - nixos-anywhere = { url = "github:numtide/nixos-anywhere"; inputs = { @@ -53,11 +43,6 @@ }; nixd.url = "github:nix-community/nixd"; - # Other project inputs - nvfetcher = { - url = "github:berberman/nvfetcher"; - inputs.nixpkgs.follows = "nixpkgs"; - }; deadnix.url = "github:astro/deadnix"; }; @@ -67,7 +52,6 @@ nixpkgs, home-manager, sops-nix, - nvfetcher, ... }@inputs: { @@ -143,12 +127,12 @@ let inherit (sops-nix.packages.x86_64-linux) sops-init-gpg-key sops-import-keys-hook; inherit (self.packages.x86_64-linux) commit-nvfetcher; - inherit (nixpkgs.legacyPackages.x86_64-linux) nvchecker; + inherit (nixpkgs.legacyPackages.x86_64-linux) nvchecker nvfetcher; home-manager-bin = home-manager.packages.x86_64-linux.default; in nixpkgs.legacyPackages.x86_64-linux.mkShell { packages = [ - nvfetcher.packages.x86_64-linux.default + nvfetcher nvchecker commit-nvfetcher home-manager-bin diff --git a/nixos-config/hosts/yui/games.nix b/nixos-config/hosts/yui/games.nix index cfb8efff..90e2075e 100644 --- a/nixos-config/hosts/yui/games.nix +++ b/nixos-config/hosts/yui/games.nix @@ -2,7 +2,6 @@ { imports = [ # flake-inputs.nix-gaming.nixosModules.pipewireLowLatency - flake-inputs.aagl.nixosModules.default ]; environment.systemPackages = [ pkgs.mangohud ]; @@ -20,7 +19,6 @@ enable = true; gamescopeSession.enable = true; }; - anime-game-launcher.enable = true; gamescope = { enable = true; capSysNice = true; @@ -39,7 +37,4 @@ # Star citizen needs more boot.kernel.sysctl."vm.max_map_count" = 16777216; - - # AAGL - nix.settings = flake-inputs.aagl.nixConfig; } diff --git a/pkgs/scripts/commit-nvfetcher/default.nix b/pkgs/scripts/commit-nvfetcher/default.nix index f628aa72..99379e02 100644 --- a/pkgs/scripts/commit-nvfetcher/default.nix +++ b/pkgs/scripts/commit-nvfetcher/default.nix @@ -3,13 +3,13 @@ writeShellApplication, git, mktemp, - flake-inputs, + nvfetcher, }: writeShellApplication { name = "commit-nvfetcher"; runtimeInputs = [ - flake-inputs.nvfetcher.packages.${system}.default + nvfetcher git mktemp ];