Merge branch 'wip/sway2'
This commit is contained in:
commit
ac25909a10
File diff suppressed because it is too large
Load Diff
|
@ -23,12 +23,6 @@ in
|
||||||
default = {};
|
default = {};
|
||||||
type = types.attrs;
|
type = types.attrs;
|
||||||
};
|
};
|
||||||
|
|
||||||
# extra attributes to include in home-manager's `programs` option
|
|
||||||
sane.home-manager.programs = mkOption {
|
|
||||||
default = {};
|
|
||||||
type = types.attrs;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
|
@ -49,13 +43,10 @@ in
|
||||||
home.username = "colin";
|
home.username = "colin";
|
||||||
home.homeDirectory = "/home/colin";
|
home.homeDirectory = "/home/colin";
|
||||||
|
|
||||||
programs = lib.mkMerge [
|
programs = {
|
||||||
{
|
# XXX: unsure what this does?
|
||||||
# XXX: unsure what this does?
|
home-manager.enable = true;
|
||||||
home-manager.enable = true;
|
};
|
||||||
}
|
|
||||||
cfg.programs
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user