Fix some deprecation warnings

This commit is contained in:
notgne2 2021-08-14 14:17:56 -07:00
parent 48282bcea5
commit 5a37a4d482
No known key found for this signature in database
GPG Key ID: BB661E172B42A7F8
4 changed files with 28 additions and 24 deletions

View File

@ -54,7 +54,10 @@ in
programs.mako.font = "${cfg.favFont.name} ${toString cfg.favFont.size}"; programs.mako.font = "${cfg.favFont.name} ${toString cfg.favFont.size}";
wayland.windowManager.sway.config.fonts = [ cfg.favFont.name ]; wayland.windowManager.sway.config.fonts = {
names = [ cfg.favFont.name ];
size = cfg.favFont.size + 0.0;
};
xsession.windowManager.i3.config.fonts = [ cfg.favFont.name ]; xsession.windowManager.i3.config.fonts = [ cfg.favFont.name ];
programs.neovim.extraConfig = '' programs.neovim.extraConfig = ''

View File

@ -17,28 +17,27 @@
programs.htop = { programs.htop = {
enable = true; enable = true;
meters.left = [ settings = {
"LeftCPUs" cpu_count_from_zero = true;
"Blank" delay = 10;
"Memory" fields = [
{ "USER"
kind = "Uptime"; "PRIORITY"
mode = 4; "NICE"
} "M_RESIDENT"
]; "PERCENT_MEM"
meters.right = [ "RightCPUs" "Blank" "CPU" ]; "PERCENT_CPU"
fields = [ "TIME"
"USER" "COMM"
"PRIORITY" ];
"NICE" left_meters = [
"M_RESIDENT" "LeftCPUs"
"PERCENT_MEM" "Blank"
"PERCENT_CPU" "Memory"
"TIME" "Uptime"
"COMM" ];
]; right_meters = [ "RightCPUs" "Blank" "CPU" ];
delay = 10; };
cpuCountFromZero = true;
}; };
programs.git = { programs.git = {

View File

@ -91,6 +91,8 @@ in
utsushi utsushi
epkowa epkowa
hplipWithPlugin hplipWithPlugin
brscan4
dsseries
]; ];
}; };
} }

View File

@ -115,6 +115,6 @@ in
services.blueman.enable = true; services.blueman.enable = true;
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;
hardware.pulseaudio.extraModules = [ pkgs.pulseaudio-modules-bt ]; hardware.pulseaudio.extraModules = [ pkgs.pulseaudio-modules-bt ];
hardware.bluetooth.config.General.Enable = "Source,Sink,Media,Socket"; hardware.bluetooth.settings.General.Enable = "Source,Sink,Media,Socket";
}; };
} }