diff --git a/hosts/default.nix b/hosts/default.nix index 02e5a55..6e221c6 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -17,7 +17,11 @@ modules = baseModules ++ [ - {nixpkgs.pkgs = pkgs;} + { + nixpkgs = { + inherit pkgs; + }; + } (import (./. + "/${name}/default.nix")) ]; specialArgs = { diff --git a/modules/base/default.nix b/modules/base/default.nix index f716dd6..2369c43 100644 --- a/modules/base/default.nix +++ b/modules/base/default.nix @@ -7,10 +7,10 @@ ... }: let inherit (lib) fileContents mkIf; - inherit (tlib) pkgBin; coreBin = v: "${pkgs.coreutils}/bin/${v}"; nixBin = "${config.nix.package}/bin/nix"; + pkgBin = tlib.pkgBin pkgs; in { imports = [ ./nix.nix @@ -144,4 +144,5 @@ in { ''; users.mutableUsers = false; programs.command-not-found.enable = false; + nixpkgs.config.allowUnfree = true; } diff --git a/pkgs-set/default.nix b/pkgs-set/default.nix index 4e8b95a..26ba60c 100644 --- a/pkgs-set/default.nix +++ b/pkgs-set/default.nix @@ -10,9 +10,11 @@ (lib.readDir ./overlays); unstablePkgs = import unstable { inherit system; + config.allowUnfree = true; }; pkgs = import stable { inherit system; + config.allowUnfree = true; overlays = [(_: _: import ./from-unstable.nix unstablePkgs)] ++ overlays; }; in diff --git a/pkgs-set/from-unstable.nix b/pkgs-set/from-unstable.nix index 77662fd..6c861f8 100644 --- a/pkgs-set/from-unstable.nix +++ b/pkgs-set/from-unstable.nix @@ -5,5 +5,7 @@ pkgs: { alejandra rnix-lsp chromium + rofi-wayland + vscode ; } diff --git a/users/patriot/default.nix b/users/patriot/default.nix index 33d9474..bcd2c29 100644 --- a/users/patriot/default.nix +++ b/users/patriot/default.nix @@ -308,7 +308,7 @@ in { }; wayland.windowManager = { sway = let - mkRofiCmd = args: "${config.programs.rofi.finalPackage}/bin/rofi ${lib.concatStringsSep " " args} | ${pkgs.sway}/bin/swaymsg --"; + mkRofiCmd = args: "${config.programs.rofi.package}/bin/rofi ${lib.concatStringsSep " " args} | ${pkgs.sway}/bin/swaymsg --"; in { enable = true; extraSessionCommands = extraEnv;