[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
|
|
@ -51,20 +51,29 @@ in {
|
|||
|
||||
# Enable dev documentation
|
||||
documentation.dev.enable = cfg.dev.enable;
|
||||
|
||||
# Shell prompt
|
||||
programs.starship.enable = true;
|
||||
programs.starship.settings = lib.mkIf cfg.styling.enable {
|
||||
format = "$time$all";
|
||||
add_newline = false;
|
||||
cmd_duration.min_time = 500;
|
||||
cmd_duration.show_milliseconds = true;
|
||||
time.format = "[$time](bold yellow) ";
|
||||
time.disabled = false;
|
||||
status.format = "[$signal_name$common_meaning$maybe_int](red)";
|
||||
status.symbol = "[✗](bold red)";
|
||||
status.disabled = false;
|
||||
sudo.disabled = false;
|
||||
programs = {
|
||||
# Shell prompt
|
||||
starship = {
|
||||
enable = true;
|
||||
settings = lib.mkIf cfg.styling.enable {
|
||||
format = "$time$all";
|
||||
add_newline = false;
|
||||
cmd_duration.min_time = 500;
|
||||
cmd_duration.show_milliseconds = true;
|
||||
time = {
|
||||
format = "[$time](bold yellow) ";
|
||||
disabled = false;
|
||||
};
|
||||
status = {
|
||||
format = "[$signal_name$common_meaning$maybe_int](red)";
|
||||
symbol = "[✗](bold red)";
|
||||
disabled = false;
|
||||
};
|
||||
sudo.disabled = false;
|
||||
};
|
||||
};
|
||||
# Default shell
|
||||
zsh.enable = true;
|
||||
};
|
||||
|
||||
environment.etc = keysFromGithub;
|
||||
|
|
@ -74,29 +83,32 @@ in {
|
|||
|
||||
# Enable printer autodiscovery if printing is enabled
|
||||
services.avahi = {
|
||||
enable = config.services.printing.enable;
|
||||
inherit (config.services.printing) enable;
|
||||
nssmdns4 = true;
|
||||
openFirewall = true;
|
||||
};
|
||||
|
||||
# Default shell
|
||||
programs.zsh.enable = true;
|
||||
users.defaultUserShell = pkgs.zsh;
|
||||
|
||||
# Open ports for spotifyd
|
||||
networking.firewall.allowedUDPPorts = [5353];
|
||||
networking.firewall.allowedTCPPorts = [2020];
|
||||
|
||||
networking.firewall = {
|
||||
allowedUDPPorts = [5353];
|
||||
allowedTCPPorts = [2020];
|
||||
};
|
||||
# Nix Settings
|
||||
nix.gc.automatic = true;
|
||||
nix.gc.dates = "weekly";
|
||||
nix.gc.options = "--delete-older-than 30d";
|
||||
# run between 0 and 45min after boot if run was missed
|
||||
nix.gc.randomizedDelaySec = "45min";
|
||||
nix.settings.auto-optimise-store = true;
|
||||
nix.settings.experimental-features = [
|
||||
"nix-command"
|
||||
"flakes"
|
||||
];
|
||||
nix = {
|
||||
gc = {
|
||||
automatic = true;
|
||||
dates = "weekly";
|
||||
options = "--delete-older-than 30d";
|
||||
# run between 0 and 45min after boot if run was missed
|
||||
randomizedDelaySec = "45min";
|
||||
};
|
||||
settings = {
|
||||
auto-optimise-store = true;
|
||||
experimental-features = [
|
||||
"nix-command"
|
||||
"flakes"
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,65 +17,80 @@ in {
|
|||
pkgs.pinentry-qt
|
||||
]
|
||||
++ lib.optional cfg.ydotool.enable pkgs.ydotool;
|
||||
|
||||
systemd.user.services.ydotool = lib.mkIf cfg.ydotool.enable {
|
||||
enable = cfg.ydotool.autoStart;
|
||||
wantedBy = ["default.target"];
|
||||
description = "Generic command-line automation tool";
|
||||
documentation = [
|
||||
"man:ydotool(1)"
|
||||
"man:ydotoold(8)"
|
||||
];
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
Restart = "always";
|
||||
ExecStart = "${pkgs.ydotool}/bin/ydotoold";
|
||||
ExecReload = "${pkgs.util-linux}/bin/kill -HUP $MAINPID";
|
||||
KillMode = "process";
|
||||
TimeoutSec = 180;
|
||||
systemd = {
|
||||
user.services.ydotool = lib.mkIf cfg.ydotool.enable {
|
||||
enable = cfg.ydotool.autoStart;
|
||||
wantedBy = ["default.target"];
|
||||
description = "Generic command-line automation tool";
|
||||
documentation = [
|
||||
"man:ydotool(1)"
|
||||
"man:ydotoold(8)"
|
||||
];
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
Restart = "always";
|
||||
ExecStart = "${pkgs.ydotool}/bin/ydotoold";
|
||||
ExecReload = "${pkgs.util-linux}/bin/kill -HUP $MAINPID";
|
||||
KillMode = "process";
|
||||
TimeoutSec = 180;
|
||||
};
|
||||
};
|
||||
# Fix xdg-portals issue issue: https://github.com/NixOS/nixpkgs/issues/189851
|
||||
user.extraConfig = ''
|
||||
DefaultEnvironment="PATH=/run/wrappers/bin:/etc/profiles/per-user/%u/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin"
|
||||
'';
|
||||
};
|
||||
# Fix xdg-portals issue issue: https://github.com/NixOS/nixpkgs/issues/189851
|
||||
systemd.user.extraConfig = ''
|
||||
DefaultEnvironment="PATH=/run/wrappers/bin:/etc/profiles/per-user/%u/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin"
|
||||
'';
|
||||
|
||||
fonts.fontDir.enable = true;
|
||||
|
||||
programs.dconf.enable = true;
|
||||
|
||||
programs.sway.enable = cfg.sway;
|
||||
programs.sway.extraPackages = []; # No extra packages (by default it adds foot, dmenu, and other stuff)
|
||||
programs.sway.wrapperFeatures.base = true;
|
||||
programs.sway.wrapperFeatures.gtk = true;
|
||||
|
||||
security.polkit.enable = true;
|
||||
security.rtkit.enable = true; # Recommended for pipewire
|
||||
|
||||
services.flatpak.enable = true;
|
||||
# Audio
|
||||
services.pipewire.enable = true;
|
||||
services.pipewire.alsa.enable = true;
|
||||
services.pipewire.alsa.support32Bit = true;
|
||||
services.pipewire.pulse.enable = true;
|
||||
services.pipewire.wireplumber.enable = true;
|
||||
# Dbus
|
||||
services.dbus.enable = true;
|
||||
|
||||
# XDG portals
|
||||
xdg.portal.enable = true;
|
||||
xdg.portal.wlr.enable = true;
|
||||
xdg.portal.extraPortals = [pkgs.xdg-desktop-portal-gtk];
|
||||
# Default to the gtk portal
|
||||
xdg.portal.config.preferred.default = "gtk";
|
||||
# Use wlr for screenshots and screen recording
|
||||
xdg.portal.config.preferred."org.freedesktop.impl.portal.Screenshot" = "wlr";
|
||||
xdg.portal.config.preferred."org.freedesktop.impl.portal.ScreenCast" = "wlr";
|
||||
# Consider using darkman like upstream
|
||||
|
||||
hardware.opengl.enable = true;
|
||||
hardware.uinput.enable = true;
|
||||
hardware.steam-hardware.enable = cfg.steamHardwareSupport;
|
||||
programs = {
|
||||
dconf.enable = true;
|
||||
sway = {
|
||||
enable = cfg.sway;
|
||||
# No extra packages (by default it adds foot, dmenu, and other stuff)
|
||||
extraPackages = [];
|
||||
wrapperFeatures = {
|
||||
base = true;
|
||||
gtk = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
security = {
|
||||
polkit.enable = true;
|
||||
rtkit.enable = true; # Recommended for pipewire
|
||||
};
|
||||
services = {
|
||||
flatpak.enable = true;
|
||||
# Audio
|
||||
pipewire = {
|
||||
enable = true;
|
||||
alsa = {
|
||||
enable = true;
|
||||
support32Bit = true;
|
||||
};
|
||||
pulse.enable = true;
|
||||
wireplumber.enable = true;
|
||||
};
|
||||
# Dbus
|
||||
dbus.enable = true;
|
||||
};
|
||||
xdg.portal = {
|
||||
# XDG portals
|
||||
enable = true;
|
||||
wlr.enable = true;
|
||||
extraPortals = [pkgs.xdg-desktop-portal-gtk];
|
||||
config.preferred = {
|
||||
# Default to the gtk portal
|
||||
default = "gtk";
|
||||
# Use wlr for screenshots and screen recording
|
||||
"org.freedesktop.impl.portal.Screenshot" = "wlr";
|
||||
};
|
||||
# Consider using darkman like upstream
|
||||
};
|
||||
hardware = {
|
||||
opengl.enable = true;
|
||||
uinput.enable = true;
|
||||
steam-hardware.enable = cfg.steamHardwareSupport;
|
||||
};
|
||||
})
|
||||
(lib.mkIf (enable && cfg."8bitdoFix") {
|
||||
# Udev rules to start or stop systemd service when controller is connected or disconnected
|
||||
|
|
|
|||
|
|
@ -13,32 +13,36 @@ in {
|
|||
image = cfg.wallpaper;
|
||||
base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml";
|
||||
polarity = "dark";
|
||||
fonts.monospace = [
|
||||
{
|
||||
name = "JetBrains Mono";
|
||||
package = pkgs.jetbrains-mono;
|
||||
}
|
||||
fallbackSymbols
|
||||
];
|
||||
fonts.sansSerif = [
|
||||
{
|
||||
name = "Noto Sans";
|
||||
package = pkgs.noto-fonts;
|
||||
}
|
||||
fallbackSymbols
|
||||
];
|
||||
fonts.serif = [
|
||||
{
|
||||
name = "Noto Serif";
|
||||
package = pkgs.noto-fonts;
|
||||
}
|
||||
fallbackSymbols
|
||||
];
|
||||
fonts.emoji = {
|
||||
package = pkgs.noto-fonts-emoji;
|
||||
name = "Noto Color Emoji";
|
||||
fonts = {
|
||||
monospace = [
|
||||
{
|
||||
name = "JetBrains Mono";
|
||||
package = pkgs.jetbrains-mono;
|
||||
}
|
||||
fallbackSymbols
|
||||
];
|
||||
sansSerif = [
|
||||
{
|
||||
name = "Noto Sans";
|
||||
package = pkgs.noto-fonts;
|
||||
}
|
||||
fallbackSymbols
|
||||
];
|
||||
serif = [
|
||||
{
|
||||
name = "Noto Serif";
|
||||
package = pkgs.noto-fonts;
|
||||
}
|
||||
fallbackSymbols
|
||||
];
|
||||
emoji = {
|
||||
package = pkgs.noto-fonts-emoji;
|
||||
name = "Noto Color Emoji";
|
||||
};
|
||||
sizes.popups = 12;
|
||||
};
|
||||
targets.plymouth = {
|
||||
logoAnimated = false;
|
||||
logo = cfg.bootLogo;
|
||||
};
|
||||
fonts.sizes.popups = 12;
|
||||
targets.plymouth.logoAnimated = false;
|
||||
targets.plymouth.logo = cfg.bootLogo;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue