separated out the bits of my config so I can have two computers
This commit is contained in:
+10
@@ -0,0 +1,10 @@
|
||||
{ ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
./configuration.nix
|
||||
./artemis-hardware-configuration.nix
|
||||
];
|
||||
|
||||
networking.hostName = "artemis";
|
||||
}
|
||||
+10
@@ -0,0 +1,10 @@
|
||||
{ ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
./configuration.nix
|
||||
./athena-hardware-configuration.nix
|
||||
];
|
||||
|
||||
networking.hostName = "athena";
|
||||
}
|
||||
+13
-7
@@ -5,19 +5,12 @@
|
||||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ # Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
];
|
||||
|
||||
# Bootloader.
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
|
||||
# Use latest kernel.
|
||||
boot.kernelPackages = pkgs.linuxPackages_zen;
|
||||
|
||||
networking.hostName = "artemis"; # Define your hostname.
|
||||
networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
|
||||
|
||||
# Configure network proxy if necessary
|
||||
@@ -83,6 +76,9 @@
|
||||
};
|
||||
|
||||
musnix.enable = true;
|
||||
musnix.kernel.realtime = false; # force non-RT while we tune everything else
|
||||
musnix.rtirq.enable = true; # IRQ thread priority tuning — helps USB audio specifically
|
||||
musnix.rtirq.nameList = "snd usb"; # prioritize sound + USB IRQs
|
||||
|
||||
# realtime audio shenanigans
|
||||
security.pam.loginLimits = [
|
||||
@@ -100,6 +96,12 @@
|
||||
}
|
||||
];
|
||||
|
||||
systemd.user.services.pipewire.serviceConfig.CPUAffinity = "8-15";
|
||||
systemd.user.services.wireplumber.serviceConfig.CPUAffinity = "8-15";
|
||||
systemd.services.rtkit-daemon.serviceConfig.CPUAffinity = "8-15";
|
||||
|
||||
programs.nix-ld.enable = true;
|
||||
|
||||
# Enable touchpad support (enabled default in most desktopManager).
|
||||
# services.xserver.libinput.enable = true;
|
||||
|
||||
@@ -132,6 +134,7 @@
|
||||
hydrapaper
|
||||
nextcloud-client
|
||||
fastfetch
|
||||
epson-escpr2
|
||||
];
|
||||
|
||||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
||||
@@ -158,6 +161,9 @@
|
||||
})
|
||||
];
|
||||
|
||||
services.udev.extraRules = ''
|
||||
ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="1235", ATTR{power/control}="on"
|
||||
'';
|
||||
|
||||
# Enable the OpenSSH daemon.
|
||||
# services.openssh.enable = true;
|
||||
|
||||
@@ -15,13 +15,8 @@
|
||||
outputs = { self, nixpkgs, home-manager, nix-flatpak, musnix, ... }:
|
||||
let
|
||||
system = "x86_64-linux";
|
||||
in {
|
||||
nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
|
||||
inherit system;
|
||||
|
||||
modules = [
|
||||
./configuration.nix
|
||||
|
||||
commonModules = [
|
||||
musnix.nixosModules.musnix
|
||||
|
||||
home-manager.nixosModules.home-manager
|
||||
@@ -29,6 +24,7 @@
|
||||
{
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
|
||||
home-manager.users.cybrneko = { pkgs, ... }: {
|
||||
imports = [
|
||||
nix-flatpak.homeManagerModules.nix-flatpak
|
||||
@@ -38,6 +34,24 @@
|
||||
};
|
||||
}
|
||||
];
|
||||
in {
|
||||
nixosConfigurations = {
|
||||
artemis = nixpkgs.lib.nixosSystem {
|
||||
inherit system;
|
||||
|
||||
modules = [
|
||||
./artemis.nix
|
||||
] ++ commonModules;
|
||||
};
|
||||
|
||||
athena = nixpkgs.lib.nixosSystem {
|
||||
inherit system;
|
||||
|
||||
modules = [
|
||||
./athena.nix
|
||||
] ++ commonModules;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user