diff --git a/common/home/neovim/default.nix b/common/home/neovim/default.nix index d3990cdd..7de00769 100644 --- a/common/home/neovim/default.nix +++ b/common/home/neovim/default.nix @@ -100,15 +100,15 @@ plugin = pkgs.vimPlugins.nvim-config-local; type = "lua"; config = - # lua - '' - require('config-local').setup({ - config_files = { '.nvim.lua', '.nvimrc', '.exrc' }, + # lua + '' + require('config-local').setup({ + config_files = { '.nvim.lua', '.nvimrc', '.exrc' }, - -- Where the plugin keeps files data - hashfile = '${config.xdg.cacheHome}/nvim/config-local', - }); - ''; + -- Where the plugin keeps files data + hashfile = '${config.xdg.cacheHome}/nvim/config-local', + }); + ''; } ]; }; diff --git a/devices/nos/modules/docker/media/radarr/images/radarr.nix b/devices/nos/modules/docker/media/radarr/images/radarr.nix index dcca43ca..c5123e19 100644 --- a/devices/nos/modules/docker/media/radarr/images/radarr.nix +++ b/devices/nos/modules/docker/media/radarr/images/radarr.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "ghcr.io/linuxserver/radarr"; - imageDigest = "sha256:1a50d4f08e283aa9ff4c723b940dceb4e8aeff7946e1993213efd0de3d5a4adb"; - sha256 = "0nz04zxvaq6xm7rx90n1d9639jqbw3n69b74g4a6nnjrac55n7g9"; + imageDigest = "sha256:d758c5a5edc4cda1263260948b3f460f511430bccea505dca3cb70af01332ff8"; + sha256 = "08q1fi21l3m0nsdncwc19qi3vgpzgswr2581x6a8kj9c3s1yh057"; finalImageName = "ghcr.io/linuxserver/radarr"; finalImageTag = "latest"; } diff --git a/flake.lock b/flake.lock index b4eeee55..37c3e24e 100644 Binary files a/flake.lock and b/flake.lock differ diff --git a/flake.nix b/flake.nix index ebb96927..b85a2f21 100644 Binary files a/flake.nix and b/flake.nix differ diff --git a/inputs.nix b/inputs.nix index cf7c8145..f713604b 100644 --- a/inputs.nix +++ b/inputs.nix @@ -24,6 +24,15 @@ let owner = "numtide"; repo = "flake-utils"; }; + flake-parts = mkInput { + owner = "hercules-ci"; + repo = "flake-parts"; + inputs.nixpkgs-lib.follows = "nixpkgs"; + }; + treefmt-nix = mkDep { + owner = "numtide"; + repo = "treefmt-nix"; + }; lib-aggregate = mkInput { owner = "nix-community"; repo = "lib-aggregate"; @@ -109,9 +118,8 @@ let desktopInputs = { hyprlandInputs = { hyprland = mkDep { - type = "git"; - url = "https://github.com/hyprwm/Hyprland"; - submodules = true; + owner = "hyprwm"; + repo = "Hyprland"; }; hyprland-plugins = mkHyprDep { @@ -130,6 +138,14 @@ let hyprpaper = mkDep { owner = "hyprwm"; repo = "hyprpaper"; + + inputs = { + hyprlang.follows = "hyprland/hyprlang"; + hyprutils.follows = "hyprland/hyprutils"; + hyprwayland-scanner.follows = "hyprland/hyprwayland-scanner"; + nixpkgs.follows = "hyprland/nixpkgs"; + systems.follows = "hyprland/systems"; + }; }; grim-hyprland = mkDep { @@ -153,6 +169,8 @@ let owner = "Aylur"; repo = "ags"; ref = "v2"; + + inputs.astal.follows = "astal"; }; astal = mkDep { diff --git a/legacyPackages/hass-components/spotifyplus/default.nix b/legacyPackages/hass-components/spotifyplus/default.nix index 33cdf338..da864dac 100644 --- a/legacyPackages/hass-components/spotifyplus/default.nix +++ b/legacyPackages/hass-components/spotifyplus/default.nix @@ -25,9 +25,10 @@ in platformdirs requests requests_oauthlib + soco + urllib3 zeroconf smartinspect # overridden in this python3Packages spotifywebapi # overridden in this python3Packages - urllib3 ]; } diff --git a/lib/inputs.nix b/lib/inputs.nix index d44130af..253fa9c4 100644 --- a/lib/inputs.nix +++ b/lib/inputs.nix @@ -29,6 +29,8 @@ in rec { {inherit type;} (mkOverride "systems") (mkOverride "flake-utils") + (mkOverride "flake-parts") + (mkOverride "treefmt-nix") (mkOverride "lib-aggregate") ];