major refactor and reorg
This commit is contained in:
parent
fd3cedfa93
commit
3c69cf9c74
86 changed files with 811 additions and 984 deletions
547
hosts/eddie/configuration.nix
Normal file
547
hosts/eddie/configuration.nix
Normal file
|
|
@ -0,0 +1,547 @@
|
|||
# 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, lib, inputs, musnix, outputs, ... }:
|
||||
|
||||
{
|
||||
|
||||
# imports =
|
||||
# [ # Include the results of the hardware scan.
|
||||
# ./hardware-configuration.nix
|
||||
# ./razer-speaker-fix.nix
|
||||
# ];
|
||||
|
||||
nixpkgs = {
|
||||
config = {
|
||||
allowUnfree = true;
|
||||
};
|
||||
};
|
||||
|
||||
nix = {
|
||||
settings = {
|
||||
experimental-features = [ "nix-command" "flakes" ];
|
||||
substituters = [ "https://nix-community.cachix.org" ];
|
||||
trusted-public-keys = [
|
||||
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
||||
];
|
||||
# Workaround for https://github.com/NixOS/nix/issues/9574
|
||||
nix-path = config.nix.nixPath;
|
||||
};
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
wget
|
||||
libGL
|
||||
home-manager
|
||||
curl
|
||||
git-lfs
|
||||
tailscale
|
||||
rsync
|
||||
gnupg
|
||||
clinfo
|
||||
alsa-utils
|
||||
psutils
|
||||
alsa-tools
|
||||
util-linux
|
||||
libgtop
|
||||
ulauncher
|
||||
fontconfig
|
||||
freetype
|
||||
egl-wayland
|
||||
glfw-wayland
|
||||
openssl
|
||||
appimage-run
|
||||
xwayland-satellite
|
||||
xwayland-run
|
||||
];
|
||||
|
||||
# Bootloader.
|
||||
boot = {
|
||||
loader = {
|
||||
systemd-boot.enable = true;
|
||||
systemd-boot.configurationLimit = 8;
|
||||
efi.canTouchEfiVariables = true;
|
||||
};
|
||||
kernelPackages = pkgs.unstable.linuxPackages_latest;
|
||||
initrd.systemd.enable = true;
|
||||
initrd.kernelModules = [ "nvidia" "nvidia_modeset" "nvidia_uvm" "nvidia_drm" "snd-virmidi" ];
|
||||
kernelParams = [ "nvidia_drm.fbdev=1" "nvidia_drm.modeset=1" ];
|
||||
};
|
||||
|
||||
systemd.services.tailscaled.after = ["NetworkManager-wait-online.service"];
|
||||
systemd.sleep.extraConfig = ''
|
||||
HibernateDelaySec=2h
|
||||
'';
|
||||
|
||||
documentation = {
|
||||
dev.enable = true;
|
||||
man.generateCaches = true;
|
||||
};
|
||||
|
||||
hardware = {
|
||||
openrazer = {
|
||||
enable = true;
|
||||
users = [ "emenel" ];
|
||||
};
|
||||
|
||||
graphics = {
|
||||
enable = true;
|
||||
enable32Bit = true;
|
||||
extraPackages = [
|
||||
pkgs.rocmPackages.clr.icd
|
||||
pkgs.amdvlk
|
||||
];
|
||||
|
||||
extraPackages32 = [
|
||||
pkgs.driversi686Linux.amdvlk
|
||||
];
|
||||
};
|
||||
|
||||
enableAllFirmware = true;
|
||||
firmware = [
|
||||
pkgs.sof-firmware
|
||||
pkgs.alsa-firmware
|
||||
];
|
||||
|
||||
nvidia = {
|
||||
open = true;
|
||||
# Modesetting is required.
|
||||
modesetting.enable = true;
|
||||
powerManagement.enable = true;
|
||||
powerManagement.finegrained = true;
|
||||
|
||||
# forceFullCompositionPipeline = true;
|
||||
|
||||
package = config.boot.kernelPackages.nvidiaPackages.beta;
|
||||
|
||||
prime = {
|
||||
amdgpuBusId = "PCI:101:0:0";
|
||||
nvidiaBusId = "PCI:1:0:0";
|
||||
offload = {
|
||||
enable = true;
|
||||
enableOffloadCmd = true;
|
||||
};
|
||||
|
||||
#reverseSync.enable = true;
|
||||
#sync.enable = true;
|
||||
};
|
||||
nvidiaSettings = true;
|
||||
};
|
||||
};
|
||||
|
||||
# specialisation = {
|
||||
# gpupower.configuration = {
|
||||
# system.nixos.tags = [ "gpupower" ];
|
||||
# hardware.nvidia = {
|
||||
# prime.offload.enable = lib.mkForce false;
|
||||
# prime.offload.enableOffloadCmd = lib.mkForce false;
|
||||
# prime.sync.enable = lib.mkForce true;
|
||||
# powerManagement.finegrained = lib.mkForce false;
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
|
||||
musnix = {
|
||||
enable = true;
|
||||
alsaSeq.enable = true;
|
||||
rtcqs.enable = true;
|
||||
};
|
||||
|
||||
services.fstrim.enable = true;
|
||||
|
||||
services.samba = {
|
||||
enable = true;
|
||||
package = pkgs.sambaFull;
|
||||
};
|
||||
|
||||
services.logind = {
|
||||
extraConfig = ''
|
||||
IdleAction=lock
|
||||
IdleActionSec=5m
|
||||
'';
|
||||
};
|
||||
services.udev = {
|
||||
extraRules = ''
|
||||
DEVPATH=="/devices/virtual/misc/cpu_dma_latency", OWNER="root", GROUP="audio", MODE="0660"
|
||||
'';
|
||||
packages = [
|
||||
pkgs.via
|
||||
pkgs.vial
|
||||
(pkgs.writeTextFile {
|
||||
name = "on-battery";
|
||||
text = ''
|
||||
# Rule for when switching to battery
|
||||
SUBSYSTEM=="power_supply", ENV{POWER_SUPPLY_ONLINE}=="0", RUN+="${pkgs.power-profiles-daemon}/bin/powerprofilesctl set balanced"
|
||||
'';
|
||||
destination = "/etc/udev/rules.d/60-onbattery.rules";
|
||||
})
|
||||
(pkgs.writeTextFile {
|
||||
name = "on-power";
|
||||
text = ''
|
||||
# Rule for when switching to ac
|
||||
SUBSYSTEM=="power_supply", ENV{POWER_SUPPLY_ONLINE}=="1", RUN+="${pkgs.power-profiles-daemon}/bin/powerprofilesctl set performance"
|
||||
'';
|
||||
destination = "/etc/udev/rules.d/61-onpower.rules";
|
||||
})
|
||||
(pkgs.writeTextFile {
|
||||
name = "hibernate-low-battery";
|
||||
text = ''
|
||||
# Suspend the system when battery level drops to 5% or lower
|
||||
SUBSYSTEM=="power_supply", ATTR{status}=="Discharging", ATTR{capacity}=="[0-5]", RUN+="${pkgs.systemd}/bin/systemctl hibernate"
|
||||
'';
|
||||
destination = "/etc/udev/rules.d/99-hibernate-low-battery.rules";
|
||||
})
|
||||
(pkgs.writeTextFile {
|
||||
name = "on-battery-power-saver";
|
||||
text = ''
|
||||
# Switch to power-saver when battery below 50%
|
||||
SUBSYSTEM=="power_supply", ATTR{status}=="Discharging", ATTR{capacity}=="[0-5][0-9]", RUN+="${pkgs.power-profiles-daemon}/bin/powerprofilesctl set power-saver"
|
||||
'';
|
||||
destination = "/etc/udev/rules.d/62-power-save-battery.rules";
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
security.polkit.enable = true;
|
||||
security.rtkit.enable = true;
|
||||
security.pam.services.swaylock = {};
|
||||
security.pam.services.hyprlock = {};
|
||||
|
||||
services.xserver.videoDrivers = [ "nvidia" "modesetting" ];
|
||||
|
||||
programs.nm-applet.enable = true;
|
||||
|
||||
networking = {
|
||||
hostName = "eddie";
|
||||
domain = "local";
|
||||
nameservers = [ "1.1.1.1" "1.0.0.1" ];
|
||||
networkmanager = {
|
||||
enable = true;
|
||||
wifi.powersave = true;
|
||||
# wifi.backend = "iwd";
|
||||
};
|
||||
# wireless = {
|
||||
# iwd = {
|
||||
# enable = true;
|
||||
# package = pkgs.unstable.iwd;
|
||||
# settings = {
|
||||
# IPv6 = {
|
||||
# enabled = true;
|
||||
# };
|
||||
# Settings = {
|
||||
# AutoConnect = true;
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
};
|
||||
|
||||
services.resolved = {
|
||||
enable = true;
|
||||
extraConfig = ''
|
||||
LLMNR=no
|
||||
ReadEtcHosts=no
|
||||
DNSSEC=no
|
||||
'';
|
||||
};
|
||||
|
||||
# Set your time zone.
|
||||
time.timeZone = "America/Toronto";
|
||||
|
||||
# Select internationalisation properties.
|
||||
i18n.defaultLocale = "en_CA.UTF-8";
|
||||
|
||||
services.xserver.enable = true;
|
||||
|
||||
# Enable the GNOME Desktop Environment.
|
||||
services.xserver.displayManager.gdm.enable = true;
|
||||
services.xserver.desktopManager.gnome.enable = true;
|
||||
services.xserver.deviceSection = ''Option "TearFree" "true"''; # For amdgpu.
|
||||
# services.xserver.enableTearFree = true;
|
||||
services.gnome.gnome-keyring.enable = true;
|
||||
services.gnome.gnome-settings-daemon.enable = true;
|
||||
|
||||
services.picom = {
|
||||
enable = true;
|
||||
vSync = true;
|
||||
};
|
||||
|
||||
programs.nh = {
|
||||
enable = true;
|
||||
clean = {
|
||||
enable = true;
|
||||
dates = "daily";
|
||||
extraArgs = "--keep-since 4d --keep 3";
|
||||
};
|
||||
flake = "/home/emenel/source/nixos-config";
|
||||
package = pkgs.unstable.nh;
|
||||
};
|
||||
|
||||
programs.dconf.enable = true;
|
||||
programs.gpaste.enable = true;
|
||||
programs.xwayland.enable = true;
|
||||
|
||||
services.xserver.xkb = {
|
||||
layout = "us";
|
||||
variant = "";
|
||||
};
|
||||
|
||||
services.printing = {
|
||||
enable = true;
|
||||
drivers = [
|
||||
pkgs.epson-escpr
|
||||
pkgs.epson-escpr2
|
||||
];
|
||||
};
|
||||
services.tailscale.enable = true;
|
||||
services.envfs.enable = true;
|
||||
|
||||
services.gnome.sushi.enable = true;
|
||||
|
||||
xdg.portal = {
|
||||
enable = true;
|
||||
extraPortals = [
|
||||
pkgs.xdg-desktop-portal-gnome
|
||||
pkgs.xdg-desktop-portal-gtk
|
||||
pkgs.xdg-desktop-portal
|
||||
pkgs.xdg-desktop-portal-wlr
|
||||
pkgs.gnome-keyring
|
||||
];
|
||||
};
|
||||
|
||||
# Enable sound with pipewire.
|
||||
hardware.pulseaudio.enable = false;
|
||||
|
||||
services.pipewire = {
|
||||
enable = true;
|
||||
|
||||
alsa = {
|
||||
enable = true;
|
||||
support32Bit = true;
|
||||
};
|
||||
|
||||
pulse.enable = true;
|
||||
jack.enable = true;
|
||||
|
||||
wireplumber = {
|
||||
enable = true;
|
||||
};
|
||||
|
||||
extraConfig = {
|
||||
pipewire."91-null-sinks" = {
|
||||
"context.modules" = [
|
||||
{
|
||||
name = "libpipewire-module-loopback";
|
||||
args = {
|
||||
"node.description" = "Default Playback";
|
||||
"capture.props" = {
|
||||
"node.name" = "BixSix_or_fallback_Playback";
|
||||
"media.class" = "Audio/Sink";
|
||||
"audio.position" = "[FL FR]";
|
||||
};
|
||||
"playback.props" = {
|
||||
"node.name" = "playback.BixSixWithFallbackPlayback";
|
||||
"audio.position" = "[AUX14 AUX15]";
|
||||
"target.object" = "alsa_output.usb-Solid_State_Logic_BiG_SiX-00.pro-output-0";
|
||||
"stream.dont-remix" = true;
|
||||
"node.passive" = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
];
|
||||
};
|
||||
pipewire."92-low-latency" = {
|
||||
context.properties = {
|
||||
default.clock.rate = 48000;
|
||||
default.clock.quantum = 32;
|
||||
default.clock.min-quantum = 32;
|
||||
default.clock.max-quantum = 32;
|
||||
};
|
||||
};
|
||||
pipewire-pulse."92-low-latency" = {
|
||||
context.modules = [
|
||||
{
|
||||
name = "libpipewire-module-protocol-pulse";
|
||||
args = {
|
||||
pulse.min.req = "32/48000";
|
||||
pulse.default.req = "32/48000";
|
||||
pulse.max.req = "32/48000";
|
||||
pulse.min.quantum = "32/48000";
|
||||
pulse.max.quantum = "32/48000";
|
||||
};
|
||||
}
|
||||
];
|
||||
stream.properties = {
|
||||
node.latency = "32/48000";
|
||||
resample.quality = 1;
|
||||
};
|
||||
};
|
||||
pipewire."10-airplay" = {
|
||||
"context.modules" = [
|
||||
{
|
||||
name = "libpipewire-module-raop-discover";
|
||||
|
||||
# increase the buffer size if you get dropouts/glitches
|
||||
# args = {
|
||||
# "raop.latency.ms" = 500;
|
||||
# };
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
programs.light.enable = true;
|
||||
|
||||
programs.steam = {
|
||||
enable = true;
|
||||
protontricks.enable = true;
|
||||
extraCompatPackages = [ pkgs.proton-ge-bin ];
|
||||
};
|
||||
|
||||
# enable fish and launch it from bash for interactive shells
|
||||
programs.fish.enable = true;
|
||||
environment.pathsToLink = [ "/share/fish" ];
|
||||
programs.bash = {
|
||||
interactiveShellInit = ''
|
||||
if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]
|
||||
then
|
||||
shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
|
||||
exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
|
||||
fi
|
||||
'';
|
||||
};
|
||||
|
||||
services.flatpak.enable = true;
|
||||
services.dbus.implementation = "broker";
|
||||
|
||||
#programs.gnupg.enable = true;
|
||||
programs.git.enable = true;
|
||||
|
||||
services.gnome.core-developer-tools.enable = true;
|
||||
environment.gnome.excludePackages = with pkgs; [
|
||||
cheese
|
||||
geary
|
||||
gnome-music
|
||||
gnome-tour
|
||||
];
|
||||
|
||||
services.accounts-daemon.enable = true;
|
||||
services.gnome.gnome-online-accounts.enable = true;
|
||||
|
||||
services.kmonad = {
|
||||
enable = true;
|
||||
keyboards = {
|
||||
sinc = {
|
||||
device = "/dev/input/by-id/usb-Keebio_Sinc_Rev._4-event-kbd";
|
||||
config = builtins.readFile ../../dotfiles/dot_config/kmonad/sinc.kbd;
|
||||
};
|
||||
razer = {
|
||||
extraGroups = [ "openrazer" ];
|
||||
device = "/dev/input/by-id/usb-Razer_Razer_Blade-if01-event-kbd";
|
||||
config = builtins.readFile ../../dotfiles/dot_config/kmonad/razer.kbd;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
# programs.virt-manager.enable = true;
|
||||
|
||||
# virtualisation = {
|
||||
# libvirtd = {
|
||||
# enable = true;
|
||||
# qemu = {
|
||||
# package = pkgs.qemu_kvm;
|
||||
# swtpm.enable = true;
|
||||
# ovmf.enable = true;
|
||||
# ovmf.packages = [ pkgs.OVMFFull.fd ];
|
||||
# };
|
||||
# };
|
||||
# spiceUSBRedirection.enable = true;
|
||||
# };
|
||||
|
||||
# services.qemuGuest.enable = true;
|
||||
# services.spice-vdagentd.enable = true;
|
||||
|
||||
programs.appimage = {
|
||||
enable = true;
|
||||
binfmt = true;
|
||||
package = pkgs.appimage-run.override {
|
||||
extraPkgs = pkgs: [ pkgs.libxcrypt.out ];
|
||||
};
|
||||
};
|
||||
|
||||
programs.nix-ld.enable = true;
|
||||
programs.nix-ld.libraries = with pkgs; [
|
||||
zlib
|
||||
zstd
|
||||
stdenv.cc.cc
|
||||
curlFull
|
||||
openssl.out
|
||||
attr
|
||||
libssh
|
||||
libxcrypt.out
|
||||
bzip2
|
||||
libxml2
|
||||
acl
|
||||
libsodium
|
||||
util-linux
|
||||
xz
|
||||
systemd
|
||||
fontconfig
|
||||
freetype
|
||||
gnutls
|
||||
util-linux
|
||||
libGL.dev
|
||||
psutils
|
||||
egl-wayland
|
||||
eglexternalplatform
|
||||
glfw-wayland
|
||||
glfw
|
||||
libGLU.dev
|
||||
libuv.out
|
||||
libressl.out
|
||||
libudev-zero.out
|
||||
];
|
||||
|
||||
fonts.fontconfig = {
|
||||
enable = true;
|
||||
useEmbeddedBitmaps = true;
|
||||
};
|
||||
|
||||
powerManagement = {
|
||||
enable = true;
|
||||
};
|
||||
|
||||
services.power-profiles-daemon = {
|
||||
enable = true;
|
||||
package = pkgs.unstable.power-profiles-daemon;
|
||||
};
|
||||
|
||||
# enable the OpenSSH daemon.
|
||||
services.openssh.enable = true;
|
||||
|
||||
services.avahi = {
|
||||
enable = true;
|
||||
publish.enable = true;
|
||||
publish.userServices = true;
|
||||
openFirewall = true;
|
||||
nssmdns4 = true;
|
||||
};
|
||||
|
||||
# add user accounts
|
||||
users.users.emenel = {
|
||||
isNormalUser = true;
|
||||
description = "emenel";
|
||||
extraGroups = [ "networkmanager" "network" "wheel" "uinput" "uucp" "dialout" "input" "audio" "video" "libvirtd" "nvidia" "cups" "openrazer" "plugdev" ];
|
||||
packages = with pkgs; [
|
||||
git
|
||||
];
|
||||
};
|
||||
|
||||
#do not change
|
||||
system.stateVersion = "24.05";
|
||||
|
||||
|
||||
|
||||
}
|
||||
40
hosts/eddie/hardware-configuration.nix
Normal file
40
hosts/eddie/hardware-configuration.nix
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usbhid" "usb_storage" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/f5d53811-b478-4d20-91e0-4504c33848b4";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/E3CE-0A6E";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0077" "dmask=0077" ];
|
||||
};
|
||||
|
||||
swapDevices =
|
||||
[ { device = "/dev/disk/by-uuid/f8a9a852-3ccb-4d00-8e2d-db0d68e688b2"; }
|
||||
];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
# still possible to use this option, but it's recommended to use it in conjunction
|
||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
}
|
||||
2019
hosts/eddie/razer-speaker-fix.nix
Normal file
2019
hosts/eddie/razer-speaker-fix.nix
Normal file
File diff suppressed because it is too large
Load diff
33
hosts/thegibson/hardware-configuration.nix
Normal file
33
hosts/thegibson/hardware-configuration.nix
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/91f25a2d-0d73-4d51-a798-e6c7bc88abee";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
swapDevices = [ ];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
# still possible to use this option, but it's recommended to use it in conjunction
|
||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true;
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue