diff --git a/flake.nix b/flake.nix index fe93489..fb5f402 100644 --- a/flake.nix +++ b/flake.nix @@ -3,6 +3,7 @@ home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.url = "github:nix-community/home-manager"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs-2311.url = "github:nixos/nixpkgs/nixos-23.11"; opdavies-nvim.inputs.nixpkgs.follows = "nixpkgs"; opdavies-nvim.url = "github:opdavies/opdavies.nvim"; }; diff --git a/lib/nixos/default.nix b/lib/nixos/default.nix index ad2718b..0976f68 100644 --- a/lib/nixos/default.nix +++ b/lib/nixos/default.nix @@ -14,7 +14,7 @@ in inputs.home-manager.nixosModules.home-manager { home-manager = { - extraSpecialArgs = {inherit inputs desktop self username;}; + extraSpecialArgs = {inherit inputs desktop self system username;}; useGlobalPkgs = true; useUserPackages = true; users."${username}" = import ./home-manager; diff --git a/lib/nixos/home-manager/default.nix b/lib/nixos/home-manager/default.nix index 880c9f9..6554fca 100644 --- a/lib/nixos/home-manager/default.nix +++ b/lib/nixos/home-manager/default.nix @@ -4,12 +4,15 @@ inputs, pkgs, self, + system, username, ... }: let desktop-config = import ./desktop.nix {inherit config inputs pkgs username;}; shared-config = import ../../shared/home-manager.nix {inherit inputs pkgs self username;}; shared-packages = import ../../shared/home-manager-packages.nix {inherit inputs pkgs;}; + + pkgs-2311 = inputs.nixpkgs-2311.legacyPackages.${system}; in { imports = if desktop @@ -22,7 +25,7 @@ in { pkgs.discord pkgs.gimp pkgs.gscan2pdf - pkgs.kdenlive + pkgs-2311.kdenlive pkgs.meslo-lg pkgs.obs-studio pkgs.okular