treewide: cleanup config with enable options
This commit is contained in:
parent
d469c5fa79
commit
0a387960a2
28 changed files with 420 additions and 358 deletions
17
system/android.nix
Normal file
17
system/android.nix
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{
|
||||
options.my.android.enable = lib.mkEnableOption { };
|
||||
|
||||
config = lib.mkIf config.my.android.enable {
|
||||
# Open kde connect ports
|
||||
programs.kdeconnect.enable = true;
|
||||
|
||||
programs.adb.enable = true;
|
||||
services.udev.packages = [ pkgs.android-udev-rules ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,7 +2,6 @@
|
|||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
inputs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,15 +1,11 @@
|
|||
# Edit this configuration file to define what should be installed on
|
||||
# your system. Help is available in the configuration.nix(5) man page
|
||||
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
...
|
||||
}:
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
imports = [
|
||||
./gamemode.nix
|
||||
./android.nix
|
||||
./gaming.nix
|
||||
./media-packages.nix
|
||||
./boot.nix
|
||||
./thunar.nix
|
||||
|
|
@ -25,39 +21,27 @@
|
|||
../settings
|
||||
];
|
||||
|
||||
my = import ../user/variables.nix;
|
||||
my = import ../user/variables.nix // {
|
||||
android.enable = true;
|
||||
media-packages.enable = true;
|
||||
containers.enable = true;
|
||||
};
|
||||
|
||||
zramSwap.enable = true;
|
||||
|
||||
programs.adb.enable = true;
|
||||
services.udev.packages = [ pkgs.android-udev-rules ];
|
||||
|
||||
# Enable touchpad support (enabled default in most desktopManager).
|
||||
services.libinput.enable = true;
|
||||
|
||||
packages.media-packages.enable = true;
|
||||
environment.systemPackages = with pkgs; [
|
||||
pavucontrol
|
||||
|
||||
glib # gsettings
|
||||
usbutils
|
||||
# dracula-theme # gtk theme
|
||||
adwaita-icon-theme # default gnome cursors
|
||||
|
||||
nix-output-monitor
|
||||
];
|
||||
|
||||
services.geoclue2.enable = true;
|
||||
|
||||
# Workaround for nm-wait-online hanging??
|
||||
# Ref: https://github.com/NixOS/nixpkgs/issues/180175
|
||||
systemd.services.NetworkManager-wait-online = {
|
||||
serviceConfig.ExecStart = [
|
||||
""
|
||||
"${pkgs.networkmanager}/bin/nm-online -q"
|
||||
];
|
||||
};
|
||||
|
||||
systemd.extraConfig = ''
|
||||
DefaultTimeoutStopSec=10s
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -1,30 +1,39 @@
|
|||
{ pkgs, lib, ... }:
|
||||
{
|
||||
services.flatpak.enable = true;
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
{
|
||||
options.my.containers.enable = lib.mkEnableOption { };
|
||||
|
||||
virtualisation.docker = {
|
||||
enable = true;
|
||||
autoPrune = {
|
||||
config = lib.mkIf config.my.containers.enable {
|
||||
services.flatpak.enable = true;
|
||||
|
||||
virtualisation.docker = {
|
||||
enable = true;
|
||||
dates = "monthly";
|
||||
flags = [
|
||||
"--all"
|
||||
"--volumes"
|
||||
];
|
||||
};
|
||||
daemon.settings = {
|
||||
# needed by bitbucket runner ???
|
||||
log-driver = "json-file";
|
||||
log-opts = {
|
||||
max-size = "10m";
|
||||
max-file = "3";
|
||||
autoPrune = {
|
||||
enable = true;
|
||||
dates = "monthly";
|
||||
flags = [
|
||||
"--all"
|
||||
"--volumes"
|
||||
];
|
||||
};
|
||||
daemon.settings = {
|
||||
# needed by bitbucket runner ???
|
||||
log-driver = "json-file";
|
||||
log-opts = {
|
||||
max-size = "10m";
|
||||
max-file = "3";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
networking.firewall.extraCommands = lib.getExe pkgs._docker-block-external-connections;
|
||||
|
||||
programs.extra-container.enable = true;
|
||||
|
||||
programs.firejail.enable = true;
|
||||
};
|
||||
|
||||
networking.firewall.extraCommands = lib.getExe pkgs._docker-block-external-connections;
|
||||
|
||||
programs.extra-container.enable = true;
|
||||
|
||||
programs.firejail.enable = true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,27 +0,0 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
programs.gamemode.enable = true;
|
||||
programs.gamemode.enableRenice = true;
|
||||
programs.gamemode.settings = {
|
||||
general = {
|
||||
renice = 10;
|
||||
};
|
||||
|
||||
# Warning: GPU optimisations have the potential to damage hardware
|
||||
gpu = {
|
||||
apply_gpu_optimisations = "accept-responsibility";
|
||||
gpu_device = 0;
|
||||
amd_performance_level = "high";
|
||||
};
|
||||
|
||||
custom = {
|
||||
start = "${pkgs.libnotify}/bin/notify-send 'GameMode started'";
|
||||
end = "${pkgs.libnotify}/bin/notify-send 'GameMode ended'";
|
||||
};
|
||||
};
|
||||
}
|
||||
63
system/gaming.nix
Normal file
63
system/gaming.nix
Normal file
|
|
@ -0,0 +1,63 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
inputs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
options.my.gaming.enable = lib.mkEnableOption { };
|
||||
|
||||
config = lib.mkIf config.my.gaming.enable {
|
||||
programs.steam.enable = true;
|
||||
programs.steam.extraPackages =
|
||||
config.fonts.packages
|
||||
++ (with pkgs; [
|
||||
capitaine-cursors
|
||||
bibata-cursors
|
||||
mangohud
|
||||
xdg-user-dirs
|
||||
gamescope
|
||||
|
||||
# gamescope compatibility??
|
||||
xorg.libXcursor
|
||||
xorg.libXi
|
||||
xorg.libXinerama
|
||||
xorg.libXScrnSaver
|
||||
libpng
|
||||
libpulseaudio
|
||||
libvorbis
|
||||
stdenv.cc.cc.lib
|
||||
libkrb5
|
||||
keyutils
|
||||
]);
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
protontricks
|
||||
bottles
|
||||
inputs.dzgui-nix.packages.${pkgs.system}.default
|
||||
];
|
||||
|
||||
programs.gamemode = {
|
||||
enable = true;
|
||||
enableRenice = true;
|
||||
settings = {
|
||||
general = {
|
||||
renice = 10;
|
||||
};
|
||||
|
||||
# Warning: GPU optimisations have the potential to damage hardware
|
||||
gpu = {
|
||||
apply_gpu_optimisations = "accept-responsibility";
|
||||
gpu_device = 0;
|
||||
amd_performance_level = "high";
|
||||
};
|
||||
|
||||
custom = {
|
||||
start = "${pkgs.libnotify}/bin/notify-send 'GameMode started'";
|
||||
end = "${pkgs.libnotify}/bin/notify-send 'GameMode ended'";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -5,10 +5,10 @@
|
|||
...
|
||||
}:
|
||||
let
|
||||
cfg = config.packages.media-packages;
|
||||
cfg = config.my.media-packages;
|
||||
in
|
||||
{
|
||||
options.packages.media-packages = {
|
||||
options.my.media-packages = {
|
||||
enable = lib.mkEnableOption "media packages";
|
||||
};
|
||||
config = lib.mkIf cfg.enable {
|
||||
|
|
|
|||
|
|
@ -6,8 +6,6 @@
|
|||
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
|
||||
# Enable networking
|
||||
networking.networkmanager.enable = true;
|
||||
# Open kde connect ports
|
||||
programs.kdeconnect.enable = true;
|
||||
|
||||
networking.firewall = {
|
||||
enable = true;
|
||||
|
|
@ -15,7 +13,7 @@
|
|||
};
|
||||
|
||||
# Enable CUPS to print documents.
|
||||
# services.printing.enable = true;
|
||||
services.printing.enable = true;
|
||||
|
||||
security.rtkit.enable = true;
|
||||
services.openssh = {
|
||||
|
|
@ -27,4 +25,13 @@
|
|||
KbdInteractiveAuthentication = false;
|
||||
};
|
||||
};
|
||||
|
||||
# Workaround for nm-wait-online hanging??
|
||||
# Ref: https://github.com/NixOS/nixpkgs/issues/180175
|
||||
systemd.services.NetworkManager-wait-online = {
|
||||
serviceConfig.ExecStart = [
|
||||
""
|
||||
"${pkgs.networkmanager}/bin/nm-online -q"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,36 +0,0 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
programs.steam.enable = true;
|
||||
programs.steam.extraPackages =
|
||||
config.fonts.packages
|
||||
++ (with pkgs; [
|
||||
capitaine-cursors
|
||||
bibata-cursors
|
||||
mangohud
|
||||
xdg-user-dirs
|
||||
gamescope
|
||||
|
||||
# gamescope compatibility??
|
||||
xorg.libXcursor
|
||||
xorg.libXi
|
||||
xorg.libXinerama
|
||||
xorg.libXScrnSaver
|
||||
libpng
|
||||
libpulseaudio
|
||||
libvorbis
|
||||
stdenv.cc.cc.lib
|
||||
libkrb5
|
||||
keyutils
|
||||
]);
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
protontricks
|
||||
bottles
|
||||
inputs.dzgui-nix.packages.${pkgs.system}.default
|
||||
];
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue