Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

flake.nix: Remove a bunch of superfluous inputs #350

Merged
merged 1 commit into from
Jul 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
149 changes: 0 additions & 149 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 2 additions & 18 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand All @@ -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 = {
Expand All @@ -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";
};

Expand All @@ -67,7 +52,6 @@
nixpkgs,
home-manager,
sops-nix,
nvfetcher,
...
}@inputs:
{
Expand Down Expand Up @@ -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
Expand Down
7 changes: 1 addition & 6 deletions nixos-config/hosts/yui/games.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
{ pkgs, flake-inputs, ... }:
{ pkgs, ... }:
{
imports = [
# flake-inputs.nix-gaming.nixosModules.pipewireLowLatency
flake-inputs.aagl.nixosModules.default
];

environment.systemPackages = [ pkgs.mangohud ];
Expand All @@ -20,7 +19,6 @@
enable = true;
gamescopeSession.enable = true;
};
anime-game-launcher.enable = true;
gamescope = {
enable = true;
capSysNice = true;
Expand All @@ -39,7 +37,4 @@

# Star citizen needs more
boot.kernel.sysctl."vm.max_map_count" = 16777216;

# AAGL
nix.settings = flake-inputs.aagl.nixConfig;
}
5 changes: 2 additions & 3 deletions pkgs/scripts/commit-nvfetcher/default.nix
Original file line number Diff line number Diff line change
@@ -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
];
Expand Down