fix
This commit is contained in:
parent
d1fb0b839f
commit
a453e5c0e5
@ -17,7 +17,11 @@
|
|||||||
modules =
|
modules =
|
||||||
baseModules
|
baseModules
|
||||||
++ [
|
++ [
|
||||||
{nixpkgs.pkgs = pkgs;}
|
{
|
||||||
|
nixpkgs = {
|
||||||
|
inherit pkgs;
|
||||||
|
};
|
||||||
|
}
|
||||||
(import (./. + "/${name}/default.nix"))
|
(import (./. + "/${name}/default.nix"))
|
||||||
];
|
];
|
||||||
specialArgs = {
|
specialArgs = {
|
||||||
|
@ -7,10 +7,10 @@
|
|||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
inherit (lib) fileContents mkIf;
|
inherit (lib) fileContents mkIf;
|
||||||
inherit (tlib) pkgBin;
|
|
||||||
|
|
||||||
coreBin = v: "${pkgs.coreutils}/bin/${v}";
|
coreBin = v: "${pkgs.coreutils}/bin/${v}";
|
||||||
nixBin = "${config.nix.package}/bin/nix";
|
nixBin = "${config.nix.package}/bin/nix";
|
||||||
|
pkgBin = tlib.pkgBin pkgs;
|
||||||
in {
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
./nix.nix
|
./nix.nix
|
||||||
@ -144,4 +144,5 @@ in {
|
|||||||
'';
|
'';
|
||||||
users.mutableUsers = false;
|
users.mutableUsers = false;
|
||||||
programs.command-not-found.enable = false;
|
programs.command-not-found.enable = false;
|
||||||
|
nixpkgs.config.allowUnfree = true;
|
||||||
}
|
}
|
||||||
|
@ -10,9 +10,11 @@
|
|||||||
(lib.readDir ./overlays);
|
(lib.readDir ./overlays);
|
||||||
unstablePkgs = import unstable {
|
unstablePkgs = import unstable {
|
||||||
inherit system;
|
inherit system;
|
||||||
|
config.allowUnfree = true;
|
||||||
};
|
};
|
||||||
pkgs = import stable {
|
pkgs = import stable {
|
||||||
inherit system;
|
inherit system;
|
||||||
|
config.allowUnfree = true;
|
||||||
overlays = [(_: _: import ./from-unstable.nix unstablePkgs)] ++ overlays;
|
overlays = [(_: _: import ./from-unstable.nix unstablePkgs)] ++ overlays;
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
|
@ -5,5 +5,7 @@ pkgs: {
|
|||||||
alejandra
|
alejandra
|
||||||
rnix-lsp
|
rnix-lsp
|
||||||
chromium
|
chromium
|
||||||
|
rofi-wayland
|
||||||
|
vscode
|
||||||
;
|
;
|
||||||
}
|
}
|
||||||
|
@ -308,7 +308,7 @@ in {
|
|||||||
};
|
};
|
||||||
wayland.windowManager = {
|
wayland.windowManager = {
|
||||||
sway = let
|
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 {
|
in {
|
||||||
enable = true;
|
enable = true;
|
||||||
extraSessionCommands = extraEnv;
|
extraSessionCommands = extraEnv;
|
||||||
|
Loading…
Reference in New Issue
Block a user