chore: Update to latest nixos-unstable release

- Removed old hyprlang/hyprlock overlays that are now in nixos-unstable
- Replaced pnpm-shell-completion with the one upstream
- Changed old GPG option to new one
This commit is contained in:
Donovan Glover 2024-03-17 00:18:00 -04:00
parent 319dc3480c
commit 6e23ae9c4c
No known key found for this signature in database
GPG Key ID: EA7408A77AE1BE65
8 changed files with 11 additions and 80 deletions

View File

@ -169,11 +169,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1709988192, "lastModified": 1710532761,
"narHash": "sha256-qxwIkl85P0I1/EyTT+NJwzbXdOv86vgZxcv4UKicjK8=", "narHash": "sha256-SUXGZNrXX05YA9G6EmgupxhOr3swI1gcxLUeDMUhrEY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "b0b0c3d94345050a7f86d1ebc6c56eea4389d030", "rev": "206f457fffdb9a73596a4cb2211a471bd305243d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -184,11 +184,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1709703039, "lastModified": 1710451336,
"narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", "narHash": "sha256-pP86Pcfu3BrAvRO7R64x7hs+GaQrjFes+mEPowCfkxY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", "rev": "d691274a972b3165335d261cc4671335f5c67de9",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -1,3 +1,5 @@
{ pkgs, ... }:
{ {
programs.gpg = { programs.gpg = {
enable = true; enable = true;
@ -16,7 +18,7 @@
services.gpg-agent = { services.gpg-agent = {
enable = true; enable = true;
pinentryFlavor = "curses"; pinentryPackage = pkgs.pinentry-curses;
defaultCacheTtl = 43200; defaultCacheTtl = 43200;
maxCacheTtl = 43200; maxCacheTtl = 43200;
}; };

View File

@ -120,10 +120,11 @@
lutgen lutgen
sudachi-rs sudachi-rs
mgitstatus mgitstatus
pnpm-shell-completion
]; ];
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
"osu-lazer-bin-2024.302.1" "osu-lazer-bin-2024.312.0"
]; ];
nixpkgs.config.permittedInsecurePackages = [ nixpkgs.config.permittedInsecurePackages = [

View File

@ -4,8 +4,6 @@
./base16-schemes.nix ./base16-schemes.nix
./eza.nix ./eza.nix
./hyprland.nix ./hyprland.nix
./hyprlang.nix
./hyprlock.nix
./kitty.nix ./kitty.nix
./srb2.nix ./srb2.nix
./zola.nix ./zola.nix

View File

@ -1,16 +0,0 @@
{
nixpkgs.overlays = [
(final: prev: {
hyprlang = prev.hyprlang.overrideAttrs (oldAttrs: rec {
version = "0.5.0";
src = prev.fetchFromGitHub {
owner = "hyprwm";
repo = "hyprlang";
rev = "v${version}";
hash = "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=";
};
});
})
];
}

View File

@ -1,16 +0,0 @@
{
nixpkgs.overlays = [
(final: prev: {
hyprlock = prev.hyprlock.overrideAttrs (oldAttrs: rec {
version = "0.2.0";
src = prev.fetchFromGitHub {
owner = "hyprwm";
repo = "hyprlock";
rev = "v${version}";
hash = "sha256-1p6Y/8+ETaz7GQ8wsXLUTrk2dD0YN9ySOfwjRp2TSG4=";
};
});
})
];
}

View File

@ -12,7 +12,6 @@
(callPackage ./aleo-fonts.nix { }) (callPackage ./aleo-fonts.nix { })
(callPackage ./fluent-icons.nix { }) (callPackage ./fluent-icons.nix { })
(callPackage ./osu-backgrounds.nix { }) (callPackage ./osu-backgrounds.nix { })
(callPackage ./pnpm-shell-completion.nix { })
(callPackage ./webp-thumbnailer.nix { }) (callPackage ./webp-thumbnailer.nix { })
]; ];
} }

View File

@ -1,37 +0,0 @@
{ rustPlatform
, fetchFromGitHub
, lib
, installShellFiles
}:
rustPlatform.buildRustPackage rec {
pname = "pnpm-shell-completion";
version = "0.5.3";
src = fetchFromGitHub {
owner = "g-plane";
repo = "pnpm-shell-completion";
rev = "v${version}";
hash = "sha256-UKuAUN1uGNy/1Fm4vXaTWBClHgda+Vns9C4ugfHm+0s=";
};
cargoHash = "sha256-Kf28hQ5PUHeH5ZSRSRdfHljlqIYU8MN0zQsyT0Sa2+4=";
nativeBuildInputs = [
installShellFiles
];
postInstall = /* bash */ ''
installShellCompletion --cmd pnpm \
--fish pnpm.fish \
--zsh pnpm-shell-completion.plugin.zsh
'';
meta = with lib; {
homepage = "https://github.com/g-plane/pnpm-shell-completion";
description = "Complete your pnpm command fastly";
license = licenses.mit;
maintainers = with maintainers; [ donovanglover ];
mainProgram = "pnpm-shell-completion";
};
}