fix: Many many infinite recursion errors
This commit is contained in:
parent
042b10abb8
commit
c96bd537d5
GPG key ID:
F016B9E770737A0B
7 changed files with 93 additions and 83 deletions
66
nixos/default.nix
Normal file
66
nixos/default.nix
Normal file
|
|
@ -0,0 +1,66 @@
|
|||
{ stylix }: { config, pkgs, lib, ... }:
|
||||
let
|
||||
cfg = config.jconfig;
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
./options.nix
|
||||
./gui
|
||||
stylix.nixosModules.stylix
|
||||
];
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
boot.plymouth.enable = cfg.styling.enable;
|
||||
stylix = lib.mkIf cfg.styling.enable (import ./stylix-config.nix { inherit config pkgs; });
|
||||
|
||||
# Enable unlocking the gpg-agent at boot (configured through home.nix)
|
||||
security.pam.services.login.gnupg.enable = true;
|
||||
|
||||
environment.systemPackages = [
|
||||
# Dev tools
|
||||
pkgs.gcc
|
||||
pkgs.just
|
||||
pkgs.clang
|
||||
# CLI tools
|
||||
pkgs.fd
|
||||
pkgs.bat
|
||||
pkgs.skim
|
||||
pkgs.ripgrep
|
||||
pkgs.du-dust
|
||||
pkgs.curl
|
||||
pkgs.wget
|
||||
pkgs.eza
|
||||
];
|
||||
|
||||
# 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;
|
||||
};
|
||||
# Default shell
|
||||
programs.zsh.enable = true;
|
||||
users.defaultUserShell = pkgs.zsh;
|
||||
|
||||
# Open ports for spotifyd
|
||||
networking.firewall.allowedUDPPorts = [ 5353 ];
|
||||
networking.firewall.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" ];
|
||||
};
|
||||
}
|
||||
77
nixos/gui/default.nix
Normal file
77
nixos/gui/default.nix
Normal file
|
|
@ -0,0 +1,77 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
cfg = config.jconfig.gui;
|
||||
in
|
||||
{
|
||||
config = lib.mkIf (config.jconfig.enable && cfg.enable)
|
||||
{
|
||||
environment.systemPackages = [
|
||||
pkgs.gnome.adwaita-icon-theme
|
||||
pkgs.adwaita-qt
|
||||
pkgs.nordzy-cursor-theme
|
||||
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;
|
||||
};
|
||||
};
|
||||
|
||||
fonts.fontDir.enable = true;
|
||||
|
||||
# Backlight control
|
||||
programs.light.enable = true;
|
||||
programs.dconf.enable = 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 ];
|
||||
xdg.portal.config.preferred.default = "wlr"; # Default to wlr
|
||||
xdg.portal.config.preferred."org.freedesktop.impl.portal.FileChooser" = "gtk"; # But choose files with "gtk"
|
||||
|
||||
hardware.opengl.enable = true;
|
||||
hardware.uinput.enable = true;
|
||||
hardware.steam-hardware.enable = cfg.steamHardwareSupport;
|
||||
} // lib.mkIf cfg."8bitdoFix" {
|
||||
# Udev rules to start or stop systemd service when controller is connected or disconnected
|
||||
services.udev.extraRules = ''
|
||||
# May vary depending on your controller model, find product id using 'lsusb'
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="2dc8", ATTR{idProduct}=="3106", ATTR{manufacturer}=="8BitDo", RUN+="${pkgs.systemd}/bin/systemctl start 8bitdo-ultimate-xinput@2dc8:3106"
|
||||
# This device (2dc8:3016) is "connected" when the above device disconnects
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="2dc8", ATTR{idProduct}=="3016", ATTR{manufacturer}=="8BitDo", RUN+="${pkgs.systemd}/bin/systemctl stop 8bitdo-ultimate-xinput@2dc8:3106"
|
||||
'';
|
||||
|
||||
# Systemd service which starts xboxdrv in xbox360 mode
|
||||
systemd.services."8bitdo-ultimate-xinput@" = {
|
||||
unitConfig.Description = "8BitDo Ultimate Controller XInput mode xboxdrv daemon";
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
ExecStart = "${pkgs.xboxdrv}/bin/xboxdrv --mimic-xpad --silent --type xbox360 --device-by-id %I --force-feedback";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
66
nixos/options.nix
Normal file
66
nixos/options.nix
Normal file
|
|
@ -0,0 +1,66 @@
|
|||
{ lib, ... }:
|
||||
let
|
||||
inherit (lib) types;
|
||||
# Like mkEnableOption but defaults to true
|
||||
mkDisableOption = option: lib.mkOption {
|
||||
description = lib.mdDoc "Whether to enable ${option}.";
|
||||
type = types.bool;
|
||||
default = true;
|
||||
example = false;
|
||||
};
|
||||
|
||||
gui.options = {
|
||||
enable = lib.mkEnableOption "jalil's default gui configuration.";
|
||||
# Fix for using Xinput mode on 8bitdo Ultimate C controller
|
||||
# Inspired by https://aur.archlinux.org/packages/8bitdo-ultimate-controller-udev
|
||||
# Adapted from: https://gist.github.com/interdependence/28452fbfbe692986934fbe1e54c920d4
|
||||
"8bitdoFix" = mkDisableOption "a fix for 8bitdo controllers";
|
||||
steamHardwareSupport = mkDisableOption "steam hardware support";
|
||||
ydotool = lib.mkOption {
|
||||
description = lib.mdDoc "Jalil's default ydotool configuration.";
|
||||
type = types.submodule {
|
||||
options.enable = mkDisableOption "ydotool";
|
||||
options.autoStart = mkDisableOption "autostarting ydotool at login";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
styling.options = {
|
||||
enable = mkDisableOption "jalil's default styling";
|
||||
wallpaper = lib.mkOption {
|
||||
description = "The wallpaper to use.";
|
||||
type = types.str;
|
||||
default = builtins.fetchurl {
|
||||
url = "https://raw.githubusercontent.com/lunik1/nixos-logo-gruvbox-wallpaper/d4937c424fad79c1136a904599ba689fcf8d0fad/png/gruvbox-dark-rainbow.png";
|
||||
sha256 = "036gqhbf6s5ddgvfbgn6iqbzgizssyf7820m5815b2gd748jw8zc";
|
||||
};
|
||||
};
|
||||
bootLogo = lib.mkOption {
|
||||
description = "The logo used by plymouth at boot.";
|
||||
type = types.str;
|
||||
# http://xenia-linux-site.glitch.me/images/cathodegaytube-splash.png
|
||||
default = builtins.fetchurl {
|
||||
url = "https://efimero.github.io/xenia-images/cathodegaytube-splash.png";
|
||||
sha256 = "qKugUfdRNvMwSNah+YmMepY3Nj6mWlKFh7jlGlAQDo8=";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config.options = {
|
||||
enable = lib.mkEnableOption "jalil's default configuration.";
|
||||
gui = lib.mkOption {
|
||||
description = lib.mdDoc "Jalil's default configuration for a NixOS gui.";
|
||||
type = types.submodule gui;
|
||||
};
|
||||
styling = lib.mkOption {
|
||||
description = "Jalil's styling options";
|
||||
type = types.submodule styling;
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
options.jconfig = lib.mkOption {
|
||||
description = lib.mdDoc "Jalil's default NixOS configuration.";
|
||||
type = types.submodule config;
|
||||
};
|
||||
}
|
||||
27
nixos/stylix-config.nix
Normal file
27
nixos/stylix-config.nix
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
{ config, pkgs }:
|
||||
let
|
||||
cfg = config.jconfig.styling;
|
||||
# nerdFontSymbols = pkgs.nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ]; };
|
||||
# fallbackSymbols = {
|
||||
# name = "Symbols Nerd Font";
|
||||
# package = nerdFontSymbols;
|
||||
# };
|
||||
in
|
||||
{
|
||||
autoEnable = cfg.enable;
|
||||
image = cfg.wallpaper;
|
||||
base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml";
|
||||
polarity = "dark";
|
||||
fonts.monospace.name = "JetBrains Mono";
|
||||
fonts.monospace.package = pkgs.jetbrains-mono;
|
||||
fonts.sansSerif.name = "Noto Sans";
|
||||
fonts.sansSerif.package = pkgs.noto-fonts;
|
||||
fonts.serif.name = "Noto Serif";
|
||||
fonts.serif.package = pkgs.noto-fonts;
|
||||
# fonts.fallbackFonts.monospace = [ fallbackSymbols ];
|
||||
# fonts.fallbackFonts.sansSerif = [ fallbackSymbols ];
|
||||
# fonts.fallbackFonts.serif = [ fallbackSymbols ];
|
||||
fonts.sizes.popups = 12;
|
||||
targets.plymouth.logoAnimated = false;
|
||||
targets.plymouth.logo = cfg.bootLogo;
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue