fix
This commit is contained in:
parent
d1fb0b839f
commit
a453e5c0e5
@ -17,7 +17,11 @@
|
||||
modules =
|
||||
baseModules
|
||||
++ [
|
||||
{nixpkgs.pkgs = pkgs;}
|
||||
{
|
||||
nixpkgs = {
|
||||
inherit pkgs;
|
||||
};
|
||||
}
|
||||
(import (./. + "/${name}/default.nix"))
|
||||
];
|
||||
specialArgs = {
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -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
|
||||
|
@ -5,5 +5,7 @@ pkgs: {
|
||||
alejandra
|
||||
rnix-lsp
|
||||
chromium
|
||||
rofi-wayland
|
||||
vscode
|
||||
;
|
||||
}
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user