mirror of
https://github.com/nmasur/dotfiles
synced 2025-07-06 16:40:14 +00:00
more fixes to pkgs
This commit is contained in:
@ -17,7 +17,7 @@ in
|
||||
type = lib.types.package;
|
||||
description = "Terminal application to launch";
|
||||
};
|
||||
wallpaper = {
|
||||
wallpaper = lib.mkOption {
|
||||
type = lib.types.path;
|
||||
description = "Wallpaper background image file";
|
||||
default = "${pkgs.wallpapers}/gruvbox/road.jpg";
|
||||
@ -78,7 +78,7 @@ in
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
xsession.windowManager.i3 = {
|
||||
enable = config.services.xserver.enable;
|
||||
enable = true;
|
||||
config =
|
||||
let
|
||||
modifier = "Mod4"; # Super key
|
||||
@ -315,11 +315,10 @@ in
|
||||
};
|
||||
|
||||
programs.fish.functions = {
|
||||
update-lock-screen =
|
||||
lib.mkIf cfg.commands.updateLockScreen != null {
|
||||
description = "Update lockscreen with wallpaper";
|
||||
body = cfg.commands.updateLockScreen;
|
||||
};
|
||||
update-lock-screen = lib.mkIf (cfg.commands.updateLockScreen != null) {
|
||||
description = "Update lockscreen with wallpaper";
|
||||
body = cfg.commands.updateLockScreen;
|
||||
};
|
||||
};
|
||||
|
||||
# Update lock screen cache only if cache is empty
|
||||
@ -327,7 +326,7 @@ in
|
||||
let
|
||||
cacheDir = "${config.xdg.cacheHome}/betterlockscreen/current";
|
||||
in
|
||||
lib.mkIf cfg.commands.updateLockScreen != null (
|
||||
lib.mkIf (cfg.commands.updateLockScreen != null) (
|
||||
config.lib.dag.entryAfter [ "writeBoundary" ] ''
|
||||
if [ ! -d ${cacheDir} ] || [ -z "$(ls ${cacheDir})" ]; then
|
||||
run ${cfg.commands.updateLockScreen}
|
||||
|
@ -6,7 +6,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (config.nmasur.settings) fullName;
|
||||
inherit (config.nmasur.settings) fullName hostnames;
|
||||
cfg = config.nmasur.presets.services.mbsync;
|
||||
in
|
||||
|
||||
@ -25,10 +25,12 @@ in
|
||||
imapHost = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
description = "Server host for IMAP (reading mail).";
|
||||
default = config.hostnames.imap;
|
||||
};
|
||||
smtpHost = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
description = "Server host for SMTP (sending mail).";
|
||||
default = config.hostnames.smtp;
|
||||
};
|
||||
};
|
||||
|
||||
@ -110,7 +112,7 @@ in
|
||||
notmuch.enable = true;
|
||||
|
||||
# Used to login and send and receive emails
|
||||
passwordCommand = "${lib.getExe pkgs.age} --decrypt --identity ~/.ssh/id_ed25519 ${pkgs.writeText "mailpass.age" (builtins.readFile ../../../private/mailpass.age)}";
|
||||
passwordCommand = "${lib.getExe pkgs.age} --decrypt --identity ~/.ssh/id_ed25519 ${pkgs.writeText "mailpass.age" (builtins.readFile ../../../../../../private/mailpass.age)}";
|
||||
|
||||
smtp = {
|
||||
host = cfg.smtpHost;
|
||||
|
Reference in New Issue
Block a user