assorted fixups

This commit is contained in:
notgne2 2022-01-09 13:01:33 -07:00
parent 194ce633af
commit abc1ad3ae3
No known key found for this signature in database
GPG Key ID: BB661E172B42A7F8
2 changed files with 5 additions and 10 deletions

View File

@ -4,7 +4,7 @@ with lib;
let let
cfg = config.ezpcusr; cfg = config.ezpcusr;
lockCommand = "${pkgs.swaylock-effects}/bin/swaylock --clock --indicator --screenshots --effect-scale 0.8 --effect-blur 5x2 --effect-vignette 0.2:0.5 --fade-in 0.5 --datestr %Y-%m-%e --timestr '%I:%M %p'"; lockCommand = "${pkgs.swaylock-effects}/bin/swaylock --clock --indicator --screenshots --effect-scale 0.8 --effect-blur 8x3 --effect-vignette 0.2:0.5 --fade-in 0.5 --text-color ${config.colors.base16.base08} --inside-color ${config.colors.base16.base00} --ring-color ${config.colors.base16.base01} --datestr \"%Y-%m-%e\" --timestr \"%I:%M %p\"";
selshot = pkgs.writeScript "selshot.sh" '' selshot = pkgs.writeScript "selshot.sh" ''
#!${pkgs.zsh}/bin/zsh #!${pkgs.zsh}/bin/zsh
@ -200,7 +200,7 @@ in
wrapperFeatures.gtk = lib.mkDefault true; wrapperFeatures.gtk = lib.mkDefault true;
extraConfig = '' extraConfig = ''
exec swayidle -w \ exec ${pkgs.swayidle}/bin/swayidle -w \
timeout ${toString cfg.screensaver.lockTime} '${lockCommand}' \ timeout ${toString cfg.screensaver.lockTime} '${lockCommand}' \
timeout ${toString cfg.screensaver.offTime} '${pkgs.sway}/bin/swaymsg "output * dpms off"' \ timeout ${toString cfg.screensaver.offTime} '${pkgs.sway}/bin/swaymsg "output * dpms off"' \
resume '${pkgs.sway}/bin/swaymsg "output * dpms on"' \ resume '${pkgs.sway}/bin/swaymsg "output * dpms on"' \
@ -444,12 +444,12 @@ in
}; };
memory = { memory = {
interval = 10; interval = 20;
format = " {}%"; format = " {}%";
}; };
cpu = { cpu = {
interval = 10; interval = 20;
format = " {usage}%"; format = " {usage}%";
}; };
@ -609,7 +609,7 @@ in
programs.kitty = { programs.kitty = {
enable = lib.mkDefault true; enable = lib.mkDefault true;
settings = { settings = {
background_opacity = lib.mkDefault "0.80"; background_opacity = lib.mkDefault "0.90";
dynamic_background_opacity = lib.mkDefault true; dynamic_background_opacity = lib.mkDefault true;
}; };
}; };
@ -649,7 +649,6 @@ in
bitwarden-cli bitwarden-cli
kitty kitty
pavucontrol pavucontrol
mpv
yt-dlp yt-dlp
maim maim
slop slop

View File

@ -11,10 +11,6 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
# Enable CUPS and SANE for printing and scanning # Enable CUPS and SANE for printing and scanning
services.printing.enable = true; services.printing.enable = true;
services.printing.browsing = true;
services.printing.listenAddresses = [ "*:631" ];
services.printing.allowFrom = [ "all" ];
services.printing.defaultShared = true;
services.printing.drivers = with pkgs; [ services.printing.drivers = with pkgs; [
gutenprint gutenprint
gutenprintBin gutenprintBin