From e5d05c1a2df5ccac70ade9e99fe16d40b0f79787 Mon Sep 17 00:00:00 2001 From: Dominik Polakovics Date: Tue, 25 Jul 2023 21:03:40 +0200 Subject: [PATCH] pin docker --- hosts/git.cloonar.com/configuration.nix | 7 ------- utils/modules/sway/sway.nix | 3 ++- utils/overlays/packages.nix | 9 +++++++++ 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/hosts/git.cloonar.com/configuration.nix b/hosts/git.cloonar.com/configuration.nix index a6910a8..c41ee9c 100644 --- a/hosts/git.cloonar.com/configuration.nix +++ b/hosts/git.cloonar.com/configuration.nix @@ -21,13 +21,6 @@ nixpkgs.overlays = [ (import ./utils/overlays/packages.nix) ]; - - nix.nixPath = [ - "nixpkgs=https://github.com/NixOS/nixpkgs/archive/b6bbc53029a31f788ffed9ea2d459f0bb0f0fbfc.tar.gz" - "nixos-config=/etc/nixos/configuration.nix" - "/nix/var/nix/profiles/per-user/root/channels" - ]; - sops.defaultSopsFile = ./secrets.yaml; sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; diff --git a/utils/modules/sway/sway.nix b/utils/modules/sway/sway.nix index 8f36752..0051802 100644 --- a/utils/modules/sway/sway.nix +++ b/utils/modules/sway/sway.nix @@ -22,7 +22,7 @@ in { ./social.nix ./signal-work.nix - ./thunderbird.nix + # ./thunderbird.nix ./parsec.nix ]; @@ -83,6 +83,7 @@ in { swayidle swaylock # thunderbird + thunderbirdPackages.thunderbird-115 tor-browser-bundle-bin unzip vlc diff --git a/utils/overlays/packages.nix b/utils/overlays/packages.nix index 249800b..4a92f0d 100644 --- a/utils/overlays/packages.nix +++ b/utils/overlays/packages.nix @@ -1,5 +1,14 @@ +let + pinnedPkgs = import(pkgs.fetchFromGitHub { + owner = "NixOS"; + repo = "nixpkgs"; + rev = "b6bbc53029a31f788ffed9ea2d459f0bb0f0fbfc"; + sha256 = "sha256-JVFoTY3rs1uDHbh0llRb1BcTNx26fGSLSiPmjojT+KY="; + }) {}; +in self: super: { bento = (super.callPackage ../pkgs/bento { }); howdy = (super.callPackage ../pkgs/howdy { }); linux-enable-ir-emitter = (super.callPackage ../pkgs/linux-enable-ir-emitter { }); + docker = pinnedPkgs.docker; }