diff --git a/flake.lock b/flake.lock index 222d9d7..5d51d0f 100644 --- a/flake.lock +++ b/flake.lock @@ -53,11 +53,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1675545634, - "narHash": "sha256-TbQeQcM5TA/wIho6xtzG+inUfiGzUXi8ewwttiQWYJE=", + "lastModified": 1675673983, + "narHash": "sha256-8hzNh1jtiPxL5r3ICNzSmpSzV7kGb3KwX+FS5BWJUTo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0591d6b57bfeb55dfeec99a671843337bc2c3323", + "rev": "5a350a8f31bb7ef0c6e79aea3795a890cf7743d4", "type": "github" }, "original": { @@ -75,11 +75,11 @@ ] }, "locked": { - "lastModified": 1675536108, - "narHash": "sha256-HjWJ7HF77U32QLsRWZGrrZXW3lnq7iYPZ6as+Je5dwQ=", + "lastModified": 1675828160, + "narHash": "sha256-xnc5NG/YSFiz/d1SFq6r3DlXgHGqpk1yGXTFpvyDFME=", "owner": "Gerg-L", "repo": "nvim-config", - "rev": "cda439a36bf6677fe4c8ebddf7e59e2df2742059", + "rev": "3ad02f2b90d9928b4a245dac08243b698744c957", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index e5e35a7..a75c88e 100644 --- a/flake.nix +++ b/flake.nix @@ -1,24 +1,24 @@ { inputs = { - nixpkgs.url = github:NixOS/nixpkgs/nixos-unstable; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; spicetify-nix = { - url = github:the-argus/spicetify-nix; + url = "github:the-argus/spicetify-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; suckless = { - url = github:Gerg-L/suckless; + url = "github:Gerg-L/suckless"; inputs.nixpkgs.follows = "nixpkgs"; }; nvim-config = { - url = github:Gerg-L/nvim-config; + url = "github:Gerg-L/nvim-config"; inputs.nixpkgs.follows = "nixpkgs"; }; sxhkd-flake = { - url = github:Gerg-L/sxhkd-flake; + url = "github:Gerg-L/sxhkd-flake"; inputs.nixpkgs.follows = "nixpkgs"; }; fetch-rs = { - url = github:Gerg-L/fetch-rs; + url = "github:Gerg-L/fetch-rs"; inputs.nixpkgs.follows = "nixpkgs"; }; }; @@ -33,7 +33,7 @@ inherit system; config.allowUnfree = true; overlays = [ - (final: prev: rec { + (final: _: { t-rex-miner = final.callPackage ./pkgs/t-rex-miner {}; afk-cmds = final.callPackage ./pkgs/afk-cmds {}; parrot = final.callPackage ./pkgs/parrot {}; diff --git a/imports/boot.nix b/imports/boot.nix index ff39307..d88f333 100644 --- a/imports/boot.nix +++ b/imports/boot.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: { +{ environment.etc = { "issue" = { text = "[?12l[?25h"; diff --git a/imports/gaming.nix b/imports/gaming.nix index 9f3a1cf..b6555ee 100644 --- a/imports/gaming.nix +++ b/imports/gaming.nix @@ -1,8 +1,4 @@ -{ - pkgs, - inputs, - ... -}: { +{pkgs, ...}: { environment.systemPackages = with pkgs; [ heroic legendary-gl diff --git a/imports/prime.nix b/imports/prime.nix index 9c7f447..c541bcb 100644 --- a/imports/prime.nix +++ b/imports/prime.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: { +{ hardware.nvidia = { prime = { offload.enable = true; diff --git a/imports/shells.nix b/imports/shells.nix index 734e6c1..1825355 100644 --- a/imports/shells.nix +++ b/imports/shells.nix @@ -1,8 +1,4 @@ -{ - pkgs, - lib, - ... -}: rec { +{pkgs, ...}: rec { environment = { systemPackages = with pkgs; [ dash diff --git a/nix.nix b/nix.nix index b584fc8..7ce3418 100644 --- a/nix.nix +++ b/nix.nix @@ -1,7 +1,6 @@ { inputs, lib, - config, self, ... }: { diff --git a/pkgs/afk-cmds/default.nix b/pkgs/afk-cmds/default.nix index c034316..3f2a507 100644 --- a/pkgs/afk-cmds/default.nix +++ b/pkgs/afk-cmds/default.nix @@ -1,7 +1,6 @@ { lib, rustPlatform, - fetchFromGitHub, wrapGAppsHook, libX11, libXScrnSaver, @@ -44,12 +43,4 @@ rustPlatform.buildRustPackage rec { cp $src/afk-icon.png $out/share/icons/hicolor/256x256/apps/afk-icon.png ''; cargoSha256 = "sha256-CPpFUdgb0zTZAVlv4uhJ0Y7eocCjuEZNgQJdNwV1FI4="; - - meta = with lib; { - homepage = "https://github.com/ISnortPennies/AFKCommands"; - description = ""; - license = licenses.unlicense; - maintainers = with maintainers; []; - platforms = platforms.linux; - }; } diff --git a/pkgs/parrot/default.nix b/pkgs/parrot/default.nix index 555d70b..19d79a5 100644 --- a/pkgs/parrot/default.nix +++ b/pkgs/parrot/default.nix @@ -1,5 +1,4 @@ { - lib, rustPlatform, fetchFromGitHub, pkg-config, @@ -8,7 +7,7 @@ libopus, }: # yt-dlp and ffmpeg required at runtime -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "parrot"; version = "1.5.1"; src = fetchFromGitHub { @@ -30,12 +29,4 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-qPyuj5OxHrWz0YbrquCTTKZM3j1poXuioNNvn9z+xDQ="; RUSTC_BOOTSTRAP = 1; - - meta = with lib; { - homepage = "https://github.com/aquelemiguel/parrot"; - description = ""; - license = licenses.mit; - maintainers = with maintainers; []; - platforms = platforms.linux; - }; } diff --git a/pkgs/t-rex-miner/default.nix b/pkgs/t-rex-miner/default.nix index 87936e4..07a8a1a 100644 --- a/pkgs/t-rex-miner/default.nix +++ b/pkgs/t-rex-miner/default.nix @@ -26,12 +26,4 @@ in echo "${wrapper}" > $out/bin/t-rex chmod +x $out/bin/t-rex ''; - - meta = with lib; { - homepage = "https://github.com/ISnortPennies/AFKCommands"; - description = ""; - license = licenses.unlicense; - maintainers = with maintainers; []; - platforms = platforms.linux; - }; }