diff --git a/flake.lock b/flake.lock index 2f71976..969163e 100644 --- a/flake.lock +++ b/flake.lock @@ -282,22 +282,6 @@ "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1788405554, - "narHash": "sha256-r2f1oUwixlgq9zOdYLqJLfS/lWBT60/IITjhTKI59JU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a5cc6f2c37bf518436dc8d1c288ccd0c43c2f4c4", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-26.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1767892417, @@ -324,22 +308,11 @@ "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz" } }, - "nixpkgs_4": { - "locked": { - "lastModified": 1787900134, - "narHash": "sha256-5GWj0FI2uOwKNpXkmpWrSFDe1rCaNBCUQ8d+HDtFQPI=", - "rev": "83199d0d373dd3ac2b9a1996b1d0263f76ab7a4c", - "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1063296.83199d0d373d/nixexprs.tar.zst" - }, - "original": { - "type": "tarball", - "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.zst" - } - }, "noctalia": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1788600693, @@ -368,7 +341,6 @@ "nix-wrapper-modules": "nix-wrapper-modules", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_3", - "nixpkgs-stable": "nixpkgs-stable", "noctalia": "noctalia", "sops-nix": "sops-nix", "walker": "walker" diff --git a/flake.nix b/flake.nix index f4dc38a..46edbbe 100644 --- a/flake.nix +++ b/flake.nix @@ -23,8 +23,10 @@ }; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixpkgs.url = "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz"; - nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-26.05"; - noctalia.url = "github:noctalia-dev/noctalia"; + noctalia = { + url = "github:noctalia-dev/noctalia"; + inputs.nixpkgs.follows = "nixpkgs"; + }; sops-nix = { url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/modules/capabilities/dev-tools.nix b/modules/capabilities/dev-tools.nix index 3480dd4..1b04c4e 100644 --- a/modules/capabilities/dev-tools.nix +++ b/modules/capabilities/dev-tools.nix @@ -1,15 +1,7 @@ -{ inputs, ... }: +{ ... }: { flake.modules.homeManager.dev-tools = { config, pkgs, ... }: - let - stablePkgs = import inputs.nixpkgs-stable { - inherit (pkgs.stdenv.hostPlatform) system; - config = { - inherit (pkgs.config) allowUnfree; - }; - }; - in { home.sessionVariables.CARGO_HOME = "${config.xdg.dataHome}/cargo"; home.packages = with pkgs; [ @@ -23,6 +15,7 @@ scc nodejs mariadb + just ]; programs.lazygit = { diff --git a/modules/capabilities/podman.nix b/modules/capabilities/podman.nix index ab5e9d4..fb03e43 100644 --- a/modules/capabilities/podman.nix +++ b/modules/capabilities/podman.nix @@ -3,11 +3,16 @@ let homeModules = config.flake.modules.homeManager; in { - flake.modules.nixos.podman = { - home-manager.sharedModules = [ homeModules.podman ]; + flake.modules.nixos.podman = + { lib, pkgs, ... }: + { + home-manager.sharedModules = [ homeModules.podman ]; - virtualisation.podman.enable = true; - }; + virtualisation.podman.enable = true; + virtualisation.containers.containersConf.settings.engine.compose_providers = [ + (lib.getExe pkgs.podman-compose) + ]; + }; flake.modules.homeManager.podman = { osConfig, pkgs, ... }: