chayleaf/dotfiles
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

update waybar to my fork; change display scale

Browse source
This commit is contained in:
chayleaf 2023-02-16 23:55:50 +07:00
parent b7bf0a19c8
commit 9e0ce8df9f
3 changed files with 28 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
home/common/i3-sway.nix
View file

@ -192,16 +192,31 @@ in
services.playerctld.enable = true; services.playerctld.enable = true;
programs.waybar = { programs.waybar = {
enable = true; enable = true;
package = pkgs.waybar.override { withMediaPlayer = true; }; package = (pkgs.waybar.override {
withMediaPlayer = true;
}).overrideAttrs (old: {
src = pkgs.fetchFromGitHub {
owner = "chayleaf";
repo = "Waybar";
rev = "cc955294c2213a33b63638831dcbc422975fa9ca";
sha256 = "sha256-HKkgEgXdRJKLucXCH6dH5hu4VJOOrDUeLd/5fcmlUbo=";
};
});
settings = [{ settings = [{
layer = "bottom"; layer = "bottom";
# position = "bottom"; # position = "bottom";
ipc = true; ipc = true;
height = 40; height = 40;
modules-left = [ "tray" "cpu" "memory" "sway/workspaces" "sway/mode" ]; modules-left = [ "sway/workspaces" "sway/mode" "mpris" ];
mpris = { mpris = {
format = "{player_icon} {title}"; tooltip = true;
format-paused = "{status_icon} <i>{title}</i>"; format = "{player_icon} {dynamic}";
format-paused = "{status_icon} <i>{dynamic}</i>";
# tooltip-format = "{dynamic}";
album-len = 32;
artist-len = 32;
title-len = 32;
dynamic-len = 32;
player-icons = { player-icons = {
default = "▶"; default = "▶";
mpd = "🎵"; mpd = "🎵";
@ -243,7 +258,7 @@ in
"(.*) - KeePassXC" = "$1"; "(.*) - KeePassXC" = "$1";
}; };
}; };
modules-right = [ "mpris" "wireplumber" "clock" "sway/language" ]; modules-right = [ "memory" "cpu" "tray" "wireplumber" "clock" "sway/language" ];
cpu = { cpu = {
# format = "{usage}% "; # format = "{usage}% ";
format = " {icon0}{icon1}{icon2}{icon3}{icon4}{icon5}{icon6}{icon7}{icon8}{icon9}{icon10}{icon11}{icon12}{icon13}{icon14}{icon15}"; format = " {icon0}{icon1}{icon2}{icon3}{icon4}{icon5}{icon6}{icon7}{icon8}{icon9}{icon10}{icon11}{icon12}{icon13}{icon14}{icon15}";
@ -373,6 +388,7 @@ in
bg = "~/var/wallpaper.jpg fill"; bg = "~/var/wallpaper.jpg fill";
# improved screen latency, apparently # improved screen latency, apparently
max_render_time = "2"; max_render_time = "2";
scale = builtins.toString config.displayScale;
}; };
}; };
input = { input = {

5
home/common/options.nix
View file

@ -1,5 +1,10 @@
{ lib, ... }: { lib, ... }:
with lib; { with lib; {
options.displayScale = mkOption {
type = types.float;
description = "display scale";
default = 1;
};
options.terminals = mkOption { options.terminals = mkOption {
type = with types; listOf str; type = with types; listOf str;
description = "terminal kinds (possible values are alacritty, urxvt, kitty, foot)"; description = "terminal kinds (possible values are alacritty, urxvt, kitty, foot)";

3
home/hosts/nixmsi.nix
View file

@ -11,6 +11,7 @@
home.stateVersion = "22.11"; home.stateVersion = "22.11";
home.username = "user"; home.username = "user";
home.homeDirectory = "/home/user"; home.homeDirectory = "/home/user";
displayScale = 1.1;
termShell = { termShell = {
enable = true; enable = true;
path = "${pkgs.zsh}/bin/zsh"; path = "${pkgs.zsh}/bin/zsh";
@ -39,7 +40,7 @@
home.sessionVariables = let sources = (import ../_sources/generated.nix { home.sessionVariables = let sources = (import ../_sources/generated.nix {
inherit (pkgs) fetchgit fetchurl fetchFromGitHub dockerTools; inherit (pkgs) fetchgit fetchurl fetchFromGitHub dockerTools;
}); });
proton-ge = pkgs.stdenv.mkDerivation { proton-ge = pkgs.stdenvNoCC.mkDerivation {
inherit (sources.proton-ge) pname version src; inherit (sources.proton-ge) pname version src;
nativeBuildInputs = []; nativeBuildInputs = [];
installPhase = '' installPhase = ''