[fix] *.nix: statix checks
This commit is contained in:
parent
15a60141ad
commit
c19ceb54b7
GPG key ID:
F016B9E770737A0B
18 changed files with 728 additions and 626 deletions
|
|
@ -36,80 +36,84 @@ in {
|
|||
++ lib.optional flatpakEnabled flatpak;
|
||||
|
||||
fonts.fontconfig.enable = true;
|
||||
|
||||
# Browser
|
||||
programs.firefox.enable = true;
|
||||
# Dynamic Menu
|
||||
programs.fuzzel = {
|
||||
enable = true;
|
||||
settings.main = {
|
||||
icon-theme = "Papirus-Dark";
|
||||
terminal = cfg.terminal;
|
||||
programs = {
|
||||
firefox.enable = true;
|
||||
# Dynamic Menu
|
||||
fuzzel = {
|
||||
enable = true;
|
||||
settings.main = {
|
||||
icon-theme = "Papirus-Dark";
|
||||
inherit (cfg) terminal;
|
||||
layer = "overlay";
|
||||
};
|
||||
};
|
||||
# Video player
|
||||
mpv = {
|
||||
enable = true;
|
||||
scripts = builtins.attrValues {inherit (pkgs.mpvScripts) uosc thumbfast;};
|
||||
};
|
||||
# Status bar
|
||||
waybar = {
|
||||
enable = true;
|
||||
systemd.enable = true;
|
||||
settings = import ./waybar-settings.nix {inherit config lib;};
|
||||
style = ''
|
||||
.modules-left #workspaces button {
|
||||
border-bottom: 3px solid @base01;
|
||||
}
|
||||
.modules-left #workspaces button.persistent {
|
||||
border-bottom: 3px solid transparent;
|
||||
}
|
||||
'';
|
||||
};
|
||||
# Terminal
|
||||
wezterm = {
|
||||
enable = cfg.terminal == "wezterm";
|
||||
extraConfig = ''
|
||||
config = {}
|
||||
config.hide_tab_bar_if_only_one_tab = true
|
||||
config.window_padding = { left = 1, right = 1, top = 1, bottom = 1 }
|
||||
return config
|
||||
'';
|
||||
};
|
||||
alacritty.enable = cfg.terminal == "alacritty";
|
||||
zellij.enable = cfg.terminal == "alacritty"; # alacritty has no terminal multiplexerr built in
|
||||
# PDF reader
|
||||
zathura.enable = true;
|
||||
# Auto start sway
|
||||
zsh.loginExtra = lib.optionalString cfg.sway.autostart ''
|
||||
# Start Sway on login to TTY 1
|
||||
if [ "$TTY" = /dev/tty1 ]; then
|
||||
exec sway
|
||||
fi
|
||||
'';
|
||||
};
|
||||
services = {
|
||||
# Volume/Backlight control and notifications
|
||||
avizo = {
|
||||
enable = true;
|
||||
settings.default = {
|
||||
time = 0.8;
|
||||
border-width = 0;
|
||||
height = 176;
|
||||
y-offset = 0.1;
|
||||
block-spacing = 1;
|
||||
};
|
||||
};
|
||||
# Sound tuning
|
||||
easyeffects.enable = true;
|
||||
# Auto configure displays
|
||||
kanshi.enable = lib.mkDefault true;
|
||||
# Notifications
|
||||
mako = {
|
||||
enable = true;
|
||||
layer = "overlay";
|
||||
borderRadius = 8;
|
||||
defaultTimeout = 15000;
|
||||
};
|
||||
};
|
||||
# Video player
|
||||
programs.mpv = {
|
||||
enable = true;
|
||||
scripts = builtins.attrValues {inherit (pkgs.mpvScripts) uosc thumbfast;};
|
||||
};
|
||||
# Status bar
|
||||
programs.waybar = {
|
||||
enable = true;
|
||||
systemd.enable = true;
|
||||
settings = import ./waybar-settings.nix {inherit config lib;};
|
||||
style = ''
|
||||
.modules-left #workspaces button {
|
||||
border-bottom: 3px solid @base01;
|
||||
}
|
||||
.modules-left #workspaces button.persistent {
|
||||
border-bottom: 3px solid transparent;
|
||||
}
|
||||
'';
|
||||
};
|
||||
# Terminal
|
||||
programs.wezterm = {
|
||||
enable = cfg.terminal == "wezterm";
|
||||
extraConfig = ''
|
||||
config = {}
|
||||
config.hide_tab_bar_if_only_one_tab = true
|
||||
config.window_padding = { left = 1, right = 1, top = 1, bottom = 1 }
|
||||
return config
|
||||
'';
|
||||
};
|
||||
programs.alacritty.enable = cfg.terminal == "alacritty";
|
||||
programs.zellij.enable = cfg.terminal == "alacritty"; # alacritty has no terminal multiplexerr built in
|
||||
# PDF reader
|
||||
programs.zathura.enable = true;
|
||||
# Auto start sway
|
||||
programs.zsh.loginExtra = lib.optionalString cfg.sway.autostart ''
|
||||
# Start Sway on login to TTY 1
|
||||
if [ "$TTY" = /dev/tty1 ]; then
|
||||
exec sway
|
||||
fi
|
||||
'';
|
||||
# Volume/Backlight control and notifications
|
||||
services.avizo = {
|
||||
enable = true;
|
||||
settings.default = {
|
||||
time = 0.8;
|
||||
border-width = 0;
|
||||
height = 176;
|
||||
y-offset = 0.1;
|
||||
block-spacing = 1;
|
||||
};
|
||||
};
|
||||
# Sound tuning
|
||||
services.easyeffects.enable = true;
|
||||
# Auto configure displays
|
||||
services.kanshi.enable = lib.mkDefault true;
|
||||
# Notifications
|
||||
services.mako = {
|
||||
enable = true;
|
||||
layer = "overlay";
|
||||
borderRadius = 8;
|
||||
defaultTimeout = 15000;
|
||||
};
|
||||
|
||||
# Window Manager
|
||||
wayland.windowManager.sway = {
|
||||
enable = true;
|
||||
|
|
@ -123,7 +127,7 @@ in {
|
|||
# Set Gtk theme
|
||||
gtk = {
|
||||
enable = true;
|
||||
iconTheme = iconTheme;
|
||||
inherit iconTheme;
|
||||
gtk3.extraConfig.gtk-application-prefer-dark-theme = 1;
|
||||
gtk4.extraConfig.gtk-application-prefer-dark-theme = 1;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
}: let
|
||||
cfg = config.jhome.gui.sway;
|
||||
modifier = "Mod4";
|
||||
terminal = config.jhome.gui.terminal;
|
||||
inherit (config.jhome.gui) terminal;
|
||||
termCmd =
|
||||
if terminal == "wezterm"
|
||||
then "wezterm start"
|
||||
|
|
|
|||
|
|
@ -4,103 +4,96 @@
|
|||
}: let
|
||||
cfg = config.jhome.gui;
|
||||
in {
|
||||
mainBar.layer = "top";
|
||||
mainBar.position = "top";
|
||||
mainBar.margin = "2 2 2 2";
|
||||
# Choose the order of the modules
|
||||
mainBar.modules-left = ["sway/workspaces"];
|
||||
mainBar.modules-center = ["clock"];
|
||||
mainBar.modules-right =
|
||||
[
|
||||
"pulseaudio"
|
||||
"backlight"
|
||||
"battery"
|
||||
"sway/language"
|
||||
"memory"
|
||||
]
|
||||
++ lib.optional (cfg.tempInfo != null) "temperature"
|
||||
++ ["tray"];
|
||||
mainBar."sway/workspaces".disable-scroll = true;
|
||||
mainBar."sway/workspaces".persistent-workspaces."1" = [];
|
||||
mainBar."sway/workspaces".persistent-workspaces."2" = [];
|
||||
mainBar."sway/workspaces".persistent-workspaces."3" = [];
|
||||
mainBar."sway/workspaces".persistent-workspaces."4" = [];
|
||||
mainBar."sway/workspaces".persistent-workspaces."5" = [];
|
||||
mainBar."sway/workspaces".persistent-workspaces."6" = [];
|
||||
mainBar."sway/workspaces".persistent-workspaces."7" = [];
|
||||
mainBar."sway/workspaces".persistent-workspaces."8" = [];
|
||||
mainBar."sway/workspaces".persistent-workspaces."9" = [];
|
||||
mainBar."sway/language".format = "{} ";
|
||||
mainBar."sway/language".min-length = 5;
|
||||
mainBar."sway/language".tooltip = false;
|
||||
mainBar.memory.format = "{used:0.1f}/{total:0.1f}GiB ";
|
||||
mainBar.memory.interval = 3;
|
||||
mainBar.clock.timezone = "Europe/Berlin";
|
||||
mainBar.clock.tooltip-format = "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>";
|
||||
mainBar.clock.format = "{:%a, %d %b, %H:%M}";
|
||||
mainBar.pulseaudio.reverse-scrolling = 1;
|
||||
mainBar.pulseaudio.format = "{volume}% {icon} {format_source}";
|
||||
mainBar.pulseaudio.format-bluetooth = "{volume}% {icon} {format_source}";
|
||||
mainBar.pulseaudio.format-bluetooth-muted = "{volume}% {icon} {format_source}";
|
||||
mainBar.pulseaudio.format-muted = "{volume}% {format_source}";
|
||||
mainBar.pulseaudio.format-source = "{volume}% ";
|
||||
mainBar.pulseaudio.format-source-muted = "{volume}% ";
|
||||
mainBar.pulseaudio.format-icons.headphone = "";
|
||||
mainBar.pulseaudio.format-icons.hands-free = "";
|
||||
mainBar.pulseaudio.format-icons.headset = "";
|
||||
mainBar.pulseaudio.format-icons.phone = "";
|
||||
mainBar.pulseaudio.format-icons.portable = "";
|
||||
mainBar.pulseaudio.format-icons.car = "";
|
||||
mainBar.pulseaudio.format-icons.default = [
|
||||
""
|
||||
""
|
||||
""
|
||||
];
|
||||
mainBar.pulseaudio.on-click = "pavucontrol";
|
||||
mainBar.pulseaudio.min-length = 13;
|
||||
mainBar.temperature = lib.optionalAttrs (cfg.tempInfo != null) {
|
||||
inherit (cfg.tempInfo) hwmon-path;
|
||||
critical-threshold = 80;
|
||||
format = "{temperatureC}°C {icon}";
|
||||
format-icons = [
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
];
|
||||
tooltip = false;
|
||||
mainBar = {
|
||||
layer = "top";
|
||||
position = "top";
|
||||
margin = "2 2 2 2";
|
||||
# Choose the order of the modules
|
||||
modules-left = ["sway/workspaces"];
|
||||
modules-center = ["clock"];
|
||||
modules-right =
|
||||
[
|
||||
"pulseaudio"
|
||||
"backlight"
|
||||
"battery"
|
||||
"sway/language"
|
||||
"memory"
|
||||
]
|
||||
++ lib.optional (cfg.tempInfo != null) "temperature"
|
||||
++ ["tray"];
|
||||
"sway/workspaces" = {
|
||||
disable-scroll = true;
|
||||
persistent-workspaces = {
|
||||
"1" = [];
|
||||
"2" = [];
|
||||
"3" = [];
|
||||
"4" = [];
|
||||
"5" = [];
|
||||
"6" = [];
|
||||
"7" = [];
|
||||
"8" = [];
|
||||
"9" = [];
|
||||
};
|
||||
};
|
||||
"sway/language" = {
|
||||
format = "{} ";
|
||||
min-length = 5;
|
||||
tooltip = false;
|
||||
};
|
||||
memory = {
|
||||
format = "{used:0.1f}/{total:0.1f}GiB ";
|
||||
interval = 3;
|
||||
};
|
||||
clock = {
|
||||
timezone = "Europe/Berlin";
|
||||
tooltip-format = "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>";
|
||||
format = "{:%a, %d %b, %H:%M}";
|
||||
};
|
||||
pulseaudio = {
|
||||
reverse-scrolling = 1;
|
||||
format = "{volume}% {icon} {format_source}";
|
||||
format-bluetooth = "{volume}% {icon} {format_source}";
|
||||
format-bluetooth-muted = "{volume}% {icon} {format_source}";
|
||||
format-muted = "{volume}% {format_source}";
|
||||
format-source = "{volume}% ";
|
||||
format-source-muted = "{volume}% ";
|
||||
format-icons = {
|
||||
headphone = "";
|
||||
hands-free = "";
|
||||
headset = "";
|
||||
phone = "";
|
||||
portable = "";
|
||||
car = "";
|
||||
default = ["" "" ""];
|
||||
};
|
||||
on-click = "pavucontrol";
|
||||
min-length = 13;
|
||||
};
|
||||
temperature = lib.optionalAttrs (cfg.tempInfo != null) {
|
||||
inherit (cfg.tempInfo) hwmon-path;
|
||||
critical-threshold = 80;
|
||||
format = "{temperatureC}°C {icon}";
|
||||
format-icons = ["" "" "" "" ""];
|
||||
tooltip = false;
|
||||
};
|
||||
backlight = {
|
||||
device = "intel_backlight";
|
||||
format = "{percent}% {icon}";
|
||||
format-icons = ["" "" "" "" "" "" ""];
|
||||
min-length = 7;
|
||||
};
|
||||
battery = {
|
||||
states.warning = 30;
|
||||
states.critical = 15;
|
||||
format = "{capacity}% {icon}";
|
||||
format-charging = "{capacity}% ";
|
||||
format-plugged = "{capacity}% ";
|
||||
format-alt = "{time} {icon}";
|
||||
format-icons = ["" "" "" "" "" "" "" "" "" ""];
|
||||
};
|
||||
tray = {
|
||||
icon-size = 16;
|
||||
spacing = 0;
|
||||
};
|
||||
};
|
||||
mainBar.backlight.device = "intel_backlight";
|
||||
mainBar.backlight.format = "{percent}% {icon}";
|
||||
mainBar.backlight.format-icons = [
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
];
|
||||
mainBar.backlight.min-length = 7;
|
||||
mainBar.battery.states.warning = 30;
|
||||
mainBar.battery.states.critical = 15;
|
||||
mainBar.battery.format = "{capacity}% {icon}";
|
||||
mainBar.battery.format-charging = "{capacity}% ";
|
||||
mainBar.battery.format-plugged = "{capacity}% ";
|
||||
mainBar.battery.format-alt = "{time} {icon}";
|
||||
mainBar.battery.format-icons = [
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
];
|
||||
mainBar.tray.icon-size = 16;
|
||||
mainBar.tray.spacing = 0;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue