flake update with code adjustments

2024-06-03 20:24:22 +02:00
parent 7fe7eeabf9
commit 3500f3d3a8
15 changed files with 38 additions and 301 deletions
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -40,6 +40,7 @@ in
      lanzaboote.nixosModules.lanzaboote
      ./desktop
      ./configuration_desktop.nix
+      ../modules/hardware/hydraCache.nix
      ../modules/hardware/remoteBuilder.nix
      nixos-hardware.nixosModules.common-cpu-amd
      nixos-hardware.nixosModules.common-gpu-amd
--- a/hosts/desktop/default.nix
+++ b/hosts/desktop/default.nix
@@ -68,7 +68,7 @@
    gnupg.agent = {
      enable = true;
      enableSSHSupport = true;
-      pinentryFlavor = "curses";
+      pinentryPackage = pkgs.pinentry-curses;
    };
  };

--- a/hosts/desktop/home.nix
+++ b/hosts/desktop/home.nix
@@ -36,7 +36,6 @@
      #yubioath-flutter
      nitrokey-app
      kicad
-      yuzu-mainline

      # Display
      #light                              # xorg.xbacklight not supported. Other option is just use xrandr.
--- a/hosts/jupiter/default.nix
+++ b/hosts/jupiter/default.nix
@@ -53,7 +53,7 @@
    gnupg.agent = {
      enable = false;
      enableSSHSupport = true;
-      pinentryFlavor = "curses";
+      pinentryPackage = pkgs.pinentry-curses;
    };
  };

--- a/hosts/kabtop/default.nix
+++ b/hosts/kabtop/default.nix
@@ -62,7 +62,7 @@
    gnupg.agent = {
      enable = true;
      enableSSHSupport = true;
-      pinentryFlavor = "curses";
+      pinentryPackage = pkgs.pinentry-curses;
    };
  };

--- a/hosts/laptop/default.nix
+++ b/hosts/laptop/default.nix
@@ -65,7 +65,7 @@
    gnupg.agent = {
      enable = true;
      enableSSHSupport = true;
-      pinentryFlavor = "curses";
+      pinentryPackage = pkgs.pinentry-curses;
    };
  };

--- a/hosts/nas/default.nix
+++ b/hosts/nas/default.nix
@@ -53,7 +53,7 @@
    gnupg.agent = {
      enable = false;
      enableSSHSupport = true;
-      pinentryFlavor = "curses";
+      pinentryPackage = pkgs.pinentry-curses;
    };
  };

--- a/hosts/nasbackup/default.nix
+++ b/hosts/nasbackup/default.nix
@@ -45,7 +45,7 @@
    gnupg.agent = {
      enable = false;
      enableSSHSupport = true;
-      pinentryFlavor = "curses";
+      pinentryPackage = pkgs.pinentry-curses;
    };
  };

--- a/hosts/nasbackup/hardware-configuration.nix
+++ b/hosts/nasbackup/hardware-configuration.nix
@@ -51,7 +51,6 @@
  };

  services.btrbk = {
-      extraPackages = [ pkgs.lz4 ];
      instances = {
          hf = {
              onCalendar = "hourly";
--- a/hosts/server/default.nix
+++ b/hosts/server/default.nix
@@ -57,7 +57,7 @@
    gnupg.agent = {
      enable = true;
      enableSSHSupport = true;
-      pinentryFlavor = "curses";
+      pinentryPackage = pkgs.pinentry-curses;
    };
  };

--- a/hosts/steamdeck/default.nix
+++ b/hosts/steamdeck/default.nix
@@ -66,7 +66,7 @@
    gnupg.agent = {
      enable = true;
      enableSSHSupport = true;
-      #pinentryFlavor = "curses";
+      #pinentryPackage = pkgs.pinentry-curses;
    };
  };