diff --git a/flake.lock b/flake.lock index af52a6c1..2ee8d410 100644 --- a/flake.lock +++ b/flake.lock @@ -1,27 +1,5 @@ { "nodes": { - "aagl": { - "inputs": { - "flake-compat": "flake-compat", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1720211631, - "narHash": "sha256-MuLp45pYOlhHisq69ArkvETYMOcQCrr4ZxqmbCm1AhY=", - "owner": "ezKEa", - "repo": "aagl-gtk-on-nix", - "rev": "3058d089f930a9be806d57f709ecefa6c002ec06", - "type": "github" - }, - "original": { - "owner": "ezKEa", - "ref": "release-24.05", - "repo": "aagl-gtk-on-nix", - "type": "github" - } - }, "deadnix": { "inputs": { "naersk": "naersk", @@ -83,38 +61,6 @@ "type": "github" } }, - "flake-compat": { - "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-compat_2": { - "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": "nixpkgs-lib" @@ -187,24 +133,6 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -434,42 +362,6 @@ "type": "github" } }, - "nixpkgs-unfree": { - "inputs": { - "nixpkgs": [ - "nixpkgs-unstable" - ] - }, - "locked": { - "lastModified": 1709054971, - "narHash": "sha256-3IwfLOCKF/aGzjG79GCsj/ZxZF0hQYbitFyzekSYDwk=", - "owner": "numtide", - "repo": "nixpkgs-unfree", - "rev": "1cfef288e8ddfb79fba9e11cc869ccf1bcfc01e6", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "nixpkgs-unfree", - "type": "github" - } - }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1720542800, - "narHash": "sha256-ZgnNHuKV6h2+fQ5LuqnUaqZey1Lqqt5dTUAiAnqH0QQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "feb2849fdeb70028c70d73b848214b00d324a497", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1714562304, @@ -517,31 +409,8 @@ "type": "github" } }, - "nvfetcher": { - "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1718252448, - "narHash": "sha256-xZZBdKqe1ByITzvx65pVgGQ5jeb73MybjgrcfI84lEo=", - "owner": "berberman", - "repo": "nvfetcher", - "rev": "fa7609950023462c6f91c425de7610c0bb6b86ba", - "type": "github" - }, - "original": { - "owner": "berberman", - "repo": "nvfetcher", - "type": "github" - } - }, "root": { "inputs": { - "aagl": "aagl", "deadnix": "deadnix", "disko": "disko", "fenix": "fenix", @@ -552,10 +421,7 @@ "nixos-anywhere": "nixos-anywhere", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_3", - "nixpkgs-unfree": "nixpkgs-unfree", - "nixpkgs-unstable": "nixpkgs-unstable", "nurpkgs": "nurpkgs", - "nvfetcher": "nvfetcher", "sops-nix": "sops-nix" } }, @@ -614,21 +480,6 @@ "type": "github" } }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ 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..e13743c9 100644 --- a/nixos-config/hosts/yui/games.nix +++ b/nixos-config/hosts/yui/games.nix @@ -1,8 +1,7 @@ -{ pkgs, flake-inputs, ... }: +{ pkgs, ... }: { 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..e618fe22 100644 --- a/pkgs/scripts/commit-nvfetcher/default.nix +++ b/pkgs/scripts/commit-nvfetcher/default.nix @@ -1,15 +1,14 @@ { - system, writeShellApplication, git, mktemp, - flake-inputs, + nvfetcher, }: writeShellApplication { name = "commit-nvfetcher"; runtimeInputs = [ - flake-inputs.nvfetcher.packages.${system}.default + nvfetcher git mktemp ];