diff --git a/home/programs/ddcbacklight.nix b/home/programs/ddcbacklight.nix index 6842bf86..769ee9e6 100644 --- a/home/programs/ddcbacklight.nix +++ b/home/programs/ddcbacklight.nix @@ -1,3 +1,8 @@ -{pkgs, ...}: { - home.packages = [pkgs.ddcbacklight]; +{ + pkgs, + device, + lib, + ... +}: { + home.packages = lib.optionals (device.name == "ryu") [pkgs.ddcbacklight]; } diff --git a/home/programs/default.nix b/home/programs/default.nix index 70ad111b..1a04f7d9 100644 --- a/home/programs/default.nix +++ b/home/programs/default.nix @@ -15,10 +15,10 @@ ./fzf.nix ./gh.nix ./git.nix - ./goread.nix - ./helix.nix + # ./goread.nix + # ./helix.nix ./mpd.nix - ./newsboat.nix + # ./newsboat.nix ./nh.nix ./nix-index.nix ./nushell.nix @@ -29,10 +29,12 @@ ./tuifeed.nix ./yazi.nix ./zoxide.nix - # ./mpris-scrobbler.nix ./omnix.nix - # ./ddcbacklight.nix ./yt-dlp.nix + ./ryujinx.nix + ./ddcbacklight.nix + # ./neovim.nix + # ./mpris-scrobbler.nix # ./magika.nix # ./ncmpcpp.nix # ./neomutt.nix diff --git a/home/programs/ryujinx.nix b/home/programs/ryujinx.nix new file mode 100644 index 00000000..556a3e95 --- /dev/null +++ b/home/programs/ryujinx.nix @@ -0,0 +1,10 @@ +{ + lib, + pkgs, + device, + ... +}: { + home.packages = lib.optionals (device.name == "ryu") [ + pkgs.ryujinx + ]; +} diff --git a/nixos/mirai/configuration.nix b/nixos/mirai/configuration.nix index 35f7c2c3..9a480b61 100644 --- a/nixos/mirai/configuration.nix +++ b/nixos/mirai/configuration.nix @@ -34,10 +34,12 @@ substituters = [ "https://nix-community.cachix.org" # "https://sh.darksailor.dev" + "https://nixos-raspberrypi.cachix.org" ]; trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" # "mirai:bcVPoFGBZ0i7JAKMXIqLj2GY3CulLC4kP7rQyqes1RM=" + "nixos-raspberrypi.cachix.org-1:4iMO9LXa8BqhU+Rpg6LQKiGa2lsNh/j2oiYLNOQ5sPI=" ]; }; extraOptions = '' diff --git a/nixos/mirai/services/default.nix b/nixos/mirai/services/default.nix index 2cbaa02e..db3034a4 100644 --- a/nixos/mirai/services/default.nix +++ b/nixos/mirai/services/default.nix @@ -12,6 +12,7 @@ ./tailscale.nix ./zerotier.nix ./prowlarr.nix + ./flaresolverr.nix # ./home-assistant.nix # ./jellyfin.nix diff --git a/nixos/mirai/services/flaresolverr.nix b/nixos/mirai/services/flaresolverr.nix new file mode 100644 index 00000000..3372de80 --- /dev/null +++ b/nixos/mirai/services/flaresolverr.nix @@ -0,0 +1,7 @@ +{...}: { + services = { + flaresolverr = { + enable = true; + }; + }; +} diff --git a/nixos/mirai/services/prowlarr.nix b/nixos/mirai/services/prowlarr.nix index 5ad5760b..9efd2a6d 100644 --- a/nixos/mirai/services/prowlarr.nix +++ b/nixos/mirai/services/prowlarr.nix @@ -3,8 +3,5 @@ prowlarr = { enable = true; }; - flaresolverr = { - enable = true; - }; }; } diff --git a/nixos/ryu/configuration.nix b/nixos/ryu/configuration.nix index ef434cca..bb94a3e0 100644 --- a/nixos/ryu/configuration.nix +++ b/nixos/ryu/configuration.nix @@ -39,13 +39,13 @@ auto-optimise-store = true; extra-experimental-features = "nix-command flakes auto-allocate-uids"; trusted-users = ["root" "servius"]; - substituters = [ - # "https://nix-community.cachix.org" - # "https://sh.darksailor.dev" + trusted-substituters = [ + "https://nix-community.cachix.org" + "https://nixos-raspberrypi.cachix.org" ]; trusted-public-keys = [ - # "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - # "mirai:bcVPoFGBZ0i7JAKMXIqLj2GY3CulLC4kP7rQyqes1RM=" + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + "nixos-raspberrypi.cachix.org-1:4iMO9LXa8BqhU+Rpg6LQKiGa2lsNh/j2oiYLNOQ5sPI=" ]; }; extraOptions = '' diff --git a/nixos/tsuba/configuration.nix b/nixos/tsuba/configuration.nix index 4e60fda6..b7a2e045 100644 --- a/nixos/tsuba/configuration.nix +++ b/nixos/tsuba/configuration.nix @@ -17,11 +17,13 @@ auto-optimise-store = true; extra-experimental-features = "nix-command flakes auto-allocate-uids"; trusted-users = ["root" "remotebuilder" device.user]; - substituters = [ + trusted-substituters = [ "https://nix-community.cachix.org" + "https://nixos-raspberrypi.cachix.org" ]; trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + "nixos-raspberrypi.cachix.org-1:4iMO9LXa8BqhU+Rpg6LQKiGa2lsNh/j2oiYLNOQ5sPI=" ]; }; extraOptions = '' diff --git a/nixos/tsuba/services/default.nix b/nixos/tsuba/services/default.nix index 5642890e..ae8af9ce 100644 --- a/nixos/tsuba/services/default.nix +++ b/nixos/tsuba/services/default.nix @@ -9,5 +9,6 @@ ./homeassistant.nix # ./dnscrypt.nix ./resolved.nix + ./flaresolverr.nix ]; } diff --git a/nixos/tsuba/services/flaresolverr.nix b/nixos/tsuba/services/flaresolverr.nix new file mode 100644 index 00000000..3372de80 --- /dev/null +++ b/nixos/tsuba/services/flaresolverr.nix @@ -0,0 +1,7 @@ +{...}: { + services = { + flaresolverr = { + enable = true; + }; + }; +}