Refactoring and addition of mpd
This commit is contained in:
parent
fc5a17714d
commit
5a7ab0fc05
GPG key ID:
55A1D803917CF39A
12 changed files with 253 additions and 231 deletions
|
|
@ -1,7 +1,20 @@
|
|||
{ pkgs, lib, ... }:
|
||||
{ pkgs, lib, nix-flatpak, nixpkgs, ... }:
|
||||
|
||||
let
|
||||
calamares-auto-start = pkgs.makeAutostartItem { name = "io.calamares.calamares"; package = pkgs.calamares-nixos; };
|
||||
in {
|
||||
import =
|
||||
[
|
||||
../../modules
|
||||
../../modules/desktop
|
||||
../../modules/gaming
|
||||
../../modules/nvidia
|
||||
|
||||
nix-flatpak.nixosModules.nix-flatpak
|
||||
"${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix"
|
||||
"${nixpkgs}/nixos/modules/installer/cd-dvd/channel.nix"
|
||||
];
|
||||
|
||||
# VMs
|
||||
services.spice-vdagentd.enable = true;
|
||||
services.qemuGuest.enable = true;
|
||||
|
|
|
|||
|
|
@ -1,8 +1,26 @@
|
|||
{ pkgs, ... }:
|
||||
{ config, nix-flatpak, nixos-hardware, disko, agenix, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
imports =
|
||||
[
|
||||
# Hosts
|
||||
./hardware-configuration.nix
|
||||
./hardware.nix
|
||||
./disko-config.nix
|
||||
|
||||
../../users/lyes
|
||||
../../users/lyes/desktop
|
||||
|
||||
../../modules
|
||||
../../modules/desktop
|
||||
../../modules/gaming
|
||||
../../modules/gnome
|
||||
../../modules/sway
|
||||
|
||||
nix-flatpak.nixosModules.nix-flatpak
|
||||
nixos-hardware.nixosModules.framework-16-7040-amd
|
||||
disko.nixosModules.disko
|
||||
agenix.nixosModules.default
|
||||
];
|
||||
|
||||
# Networking
|
||||
|
|
@ -11,113 +29,12 @@
|
|||
hostId = "ed183b8f";
|
||||
};
|
||||
|
||||
# Kernel
|
||||
boot.kernelPackages = pkgs.linuxPackages_6_15;
|
||||
|
||||
# Boot
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.systemd-boot.configurationLimit = 10;
|
||||
# boot.loader.efi.canTouchEfiVariables = true;
|
||||
# boot.kernelParams = [ "quiet" ];
|
||||
boot.initrd.systemd = {
|
||||
enable = true;
|
||||
# network.enable = true;
|
||||
};
|
||||
|
||||
# Reboot Timeout
|
||||
systemd.extraConfig = ''
|
||||
DefaultTimeoutStopSec=10s
|
||||
'';
|
||||
|
||||
# Swap
|
||||
zramSwap.enable = true;
|
||||
|
||||
# Wake Up issues
|
||||
services.udev.extraRules =
|
||||
''
|
||||
ACTION=="add", SUBSYSTEM=="acpi", DRIVERS=="button", ATTRS{hid}=="PNP0C0D", ATTR{power/wakeup}="disabled"
|
||||
ACTION=="add", SUBSYSTEM=="i2c", DRIVERS=="i2c_hid_acpi", ATTRS{name}=="PIXA3854:00", ATTR{power/wakeup}="disabled"
|
||||
|
||||
ACTION=="add", SUBSYSTEM=="usb", DRIVERS=="usb", ATTRS{idVendor}=="32ac", ATTRS{idProduct}=="0018", ATTR{power/wakeup}="disabled", ATTR{driver/1-1.1.1.4/power/wakeup}="disabled"
|
||||
ACTION=="add", SUBSYSTEM=="usb", DRIVERS=="usb", ATTRS{idVendor}=="32ac", ATTRS{idProduct}=="0014", ATTR{power/wakeup}="disabled", ATTR{driver/1-1.1.1.4/power/wakeup}="disabled"
|
||||
'';
|
||||
|
||||
# Optimisation
|
||||
|
||||
# nixpkgs.hostPlatform = {
|
||||
# gcc.arch = "tigerlake";
|
||||
# gcc.tune = "tigerlake";
|
||||
# system = "x86_64-linux";
|
||||
# };
|
||||
|
||||
# nix.settings.system-features = [ "gccarch-tigerlake" "nixos-test" "benchmark" "big-parallel" "kvm" ];
|
||||
|
||||
# # Increasing the limit of files to help with compilation
|
||||
# security.pam.loginLimits = [{
|
||||
# domain = "*";
|
||||
# type = "soft";
|
||||
# item = "nofile";
|
||||
# value = "8192";
|
||||
# }];
|
||||
|
||||
# # Resources Limit
|
||||
# nix.settings = {
|
||||
# max-jobs = 7;
|
||||
# cores = 2;
|
||||
# };
|
||||
|
||||
# # OOM configuration
|
||||
# systemd = {
|
||||
# # Create a separate slice for nix-daemon that is
|
||||
# # memory-managed by the userspace systemd-oomd killer
|
||||
# slices."nix-daemon".sliceConfig = {
|
||||
# ManagedOOMMemoryPressure = "kill";
|
||||
# ManagedOOMMemoryPressureLimit = "50%";
|
||||
# };
|
||||
# services."nix-daemon".serviceConfig.Slice = "nix-daemon.slice";
|
||||
|
||||
# # If a kernel-level OOM event does occur anyway,
|
||||
# # strongly prefer killing nix-daemon child processes
|
||||
# services."nix-daemon".serviceConfig.OOMScoreAdjust = 1000;
|
||||
|
||||
# services."nix-daemon".serviceConfig.MemoryHigh = "16G";
|
||||
# services."nix-daemon".serviceConfig.MemoryMax = "20G";
|
||||
# };
|
||||
|
||||
# Disabling failing test
|
||||
nixpkgs.overlays = [ (final: prev: {
|
||||
upower = prev.upower.overrideAttrs (_: { doCheck = false; });
|
||||
gxml = prev.gxml.overrideAttrs (_: { doCheck = false; });
|
||||
# # orc = prev.orc.overrideAttrs (_: { doCheck = false; });
|
||||
# # gsl = prev.gsl.overrideAttrs (_: { doCheck = false; });
|
||||
# fprintd = prev.fprintd.overrideAttrs (super: {
|
||||
# # doCheck = false;
|
||||
# # buildInputs = super.buildInputs or [ ] ++ (with pkgs; [ libpam-wrapper (pkgs.python3.withPackages (python-pkgs: [ python-pkgs.pycairo python-pkgs.dbus-python python-pkgs.python-dbusmock ])) ]);
|
||||
# mesonCheckFlags = [
|
||||
# # PAM related checks are timing out
|
||||
# "--no-suite" "fprintd"
|
||||
# ];
|
||||
# });
|
||||
# libsrtp = prev.libsrtp.overrideAttrs (_: {
|
||||
# mesonFlags = [
|
||||
# "-Dcrypto-library=openssl"
|
||||
# "-Dcrypto-library-kdf=disabled"
|
||||
# "-Ddoc=disabled"
|
||||
# "-Dtests=disabled"
|
||||
# ];
|
||||
# });
|
||||
# # # haskellPackages.crypton = pkgs.haskell.lib.overrideCabal prev.crypton (_: { doCheck = false; });
|
||||
# # # haskellPackages.cryptonite = pkgs.haskell.lib.overrideCabal prev.cryptonite (_: { doCheck = false; });
|
||||
}) ];
|
||||
|
||||
# nixpkgs.config.packageOverrides = pkgs: {
|
||||
# haskellPackages = pkgs.haskellPackages.override {
|
||||
# overrides = hsSelf: hsSuper: {
|
||||
# crypton = pkgs.haskell.lib.overrideCabal hsSuper.crypton (_: { doCheck = false; });
|
||||
# cryptonite = pkgs.haskell.lib.overrideCabal hsSuper.cryptonite (_: { doCheck = false; });
|
||||
# crypton-x509-validation = pkgs.haskell.lib.overrideCabal hsSuper.crypton-x509-validation (oa: { doCheck = false; });
|
||||
# tls = pkgs.haskell.lib.overrideCabal hsSuper.tls (oa: { doCheck = false; });
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
# This value determines the NixOS release from which the default
|
||||
# settings for stateful data, like file locations and database versions
|
||||
# on your system were taken. It‘s perfectly fine and recommended to leave
|
||||
# this value at the release version of the first install of this system.
|
||||
# Before changing this value read the documentation for this option
|
||||
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
||||
system.stateVersion = "22.11"; # Did you read the comment?
|
||||
home-manager.users.lyes.home.stateVersion = config.system.stateVersion;
|
||||
}
|
||||
|
|
|
|||
113
hosts/lyes-pc/hardware.nix
Normal file
113
hosts/lyes-pc/hardware.nix
Normal file
|
|
@ -0,0 +1,113 @@
|
|||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
# Kernel
|
||||
boot.kernelPackages = pkgs.linuxPackages_6_15;
|
||||
|
||||
# Boot
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.systemd-boot.configurationLimit = 10;
|
||||
# boot.loader.efi.canTouchEfiVariables = true;
|
||||
# boot.kernelParams = [ "quiet" ];
|
||||
boot.initrd.systemd = {
|
||||
enable = true;
|
||||
# network.enable = true;
|
||||
};
|
||||
|
||||
# Reboot Timeout
|
||||
systemd.extraConfig = ''
|
||||
DefaultTimeoutStopSec=10s
|
||||
'';
|
||||
|
||||
# Swap
|
||||
zramSwap.enable = true;
|
||||
|
||||
# Wake Up issues
|
||||
services.udev.extraRules =
|
||||
''
|
||||
ACTION=="add", SUBSYSTEM=="acpi", DRIVERS=="button", ATTRS{hid}=="PNP0C0D", ATTR{power/wakeup}="disabled"
|
||||
ACTION=="add", SUBSYSTEM=="i2c", DRIVERS=="i2c_hid_acpi", ATTRS{name}=="PIXA3854:00", ATTR{power/wakeup}="disabled"
|
||||
|
||||
ACTION=="add", SUBSYSTEM=="usb", DRIVERS=="usb", ATTRS{idVendor}=="32ac", ATTRS{idProduct}=="0018", ATTR{power/wakeup}="disabled", ATTR{driver/1-1.1.1.4/power/wakeup}="disabled"
|
||||
ACTION=="add", SUBSYSTEM=="usb", DRIVERS=="usb", ATTRS{idVendor}=="32ac", ATTRS{idProduct}=="0014", ATTR{power/wakeup}="disabled", ATTR{driver/1-1.1.1.4/power/wakeup}="disabled"
|
||||
'';
|
||||
|
||||
# Optimisation
|
||||
|
||||
# nixpkgs.hostPlatform = {
|
||||
# gcc.arch = "tigerlake";
|
||||
# gcc.tune = "tigerlake";
|
||||
# system = "x86_64-linux";
|
||||
# };
|
||||
|
||||
# nix.settings.system-features = [ "gccarch-tigerlake" "nixos-test" "benchmark" "big-parallel" "kvm" ];
|
||||
|
||||
# # Increasing the limit of files to help with compilation
|
||||
# security.pam.loginLimits = [{
|
||||
# domain = "*";
|
||||
# type = "soft";
|
||||
# item = "nofile";
|
||||
# value = "8192";
|
||||
# }];
|
||||
|
||||
# # Resources Limit
|
||||
# nix.settings = {
|
||||
# max-jobs = 7;
|
||||
# cores = 2;
|
||||
# };
|
||||
|
||||
# # OOM configuration
|
||||
# systemd = {
|
||||
# # Create a separate slice for nix-daemon that is
|
||||
# # memory-managed by the userspace systemd-oomd killer
|
||||
# slices."nix-daemon".sliceConfig = {
|
||||
# ManagedOOMMemoryPressure = "kill";
|
||||
# ManagedOOMMemoryPressureLimit = "50%";
|
||||
# };
|
||||
# services."nix-daemon".serviceConfig.Slice = "nix-daemon.slice";
|
||||
|
||||
# # If a kernel-level OOM event does occur anyway,
|
||||
# # strongly prefer killing nix-daemon child processes
|
||||
# services."nix-daemon".serviceConfig.OOMScoreAdjust = 1000;
|
||||
|
||||
# services."nix-daemon".serviceConfig.MemoryHigh = "16G";
|
||||
# services."nix-daemon".serviceConfig.MemoryMax = "20G";
|
||||
# };
|
||||
|
||||
# Disabling failing test
|
||||
nixpkgs.overlays = [ (final: prev: {
|
||||
upower = prev.upower.overrideAttrs (_: { doCheck = false; });
|
||||
gxml = prev.gxml.overrideAttrs (_: { doCheck = false; });
|
||||
# # orc = prev.orc.overrideAttrs (_: { doCheck = false; });
|
||||
# # gsl = prev.gsl.overrideAttrs (_: { doCheck = false; });
|
||||
# fprintd = prev.fprintd.overrideAttrs (super: {
|
||||
# # doCheck = false;
|
||||
# # buildInputs = super.buildInputs or [ ] ++ (with pkgs; [ libpam-wrapper (pkgs.python3.withPackages (python-pkgs: [ python-pkgs.pycairo python-pkgs.dbus-python python-pkgs.python-dbusmock ])) ]);
|
||||
# mesonCheckFlags = [
|
||||
# # PAM related checks are timing out
|
||||
# "--no-suite" "fprintd"
|
||||
# ];
|
||||
# });
|
||||
# libsrtp = prev.libsrtp.overrideAttrs (_: {
|
||||
# mesonFlags = [
|
||||
# "-Dcrypto-library=openssl"
|
||||
# "-Dcrypto-library-kdf=disabled"
|
||||
# "-Ddoc=disabled"
|
||||
# "-Dtests=disabled"
|
||||
# ];
|
||||
# });
|
||||
# # # haskellPackages.crypton = pkgs.haskell.lib.overrideCabal prev.crypton (_: { doCheck = false; });
|
||||
# # # haskellPackages.cryptonite = pkgs.haskell.lib.overrideCabal prev.cryptonite (_: { doCheck = false; });
|
||||
}) ];
|
||||
|
||||
# nixpkgs.config.packageOverrides = pkgs: {
|
||||
# haskellPackages = pkgs.haskellPackages.override {
|
||||
# overrides = hsSelf: hsSuper: {
|
||||
# crypton = pkgs.haskell.lib.overrideCabal hsSuper.crypton (_: { doCheck = false; });
|
||||
# cryptonite = pkgs.haskell.lib.overrideCabal hsSuper.cryptonite (_: { doCheck = false; });
|
||||
# crypton-x509-validation = pkgs.haskell.lib.overrideCabal hsSuper.crypton-x509-validation (oa: { doCheck = false; });
|
||||
# tls = pkgs.haskell.lib.overrideCabal hsSuper.tls (oa: { doCheck = false; });
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue