Config
This commit is contained in:
parent
e371dbf6e6
commit
3be02a1783
9 changed files with 264 additions and 819 deletions
|
|
@ -297,7 +297,6 @@
|
|||
title = "btop";
|
||||
}
|
||||
];
|
||||
open-on-output = "DP-4";
|
||||
open-on-workspace = "System";
|
||||
open-maximized = true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -45,7 +45,6 @@
|
|||
"rd.systemd.show_status=false" # unsure ?
|
||||
"rd.udev.log_level=0" # more minimising of output on boot
|
||||
"boot.shell_on_fail" # reboots to basic uefi shell on boot failure
|
||||
"i915.fastboot=1" # unsure ?
|
||||
"plymouth.debug" # I NEED ANSWERS
|
||||
"plymouth.use-simpledrm" # tweak to allow plymouth animations to run smoother
|
||||
"plymouth.ignore-serial-consoles" # unsure ?
|
||||
|
|
@ -84,7 +83,7 @@
|
|||
|
||||
# locale settings
|
||||
i18n = {
|
||||
defaultLocale = "en_AU.UTF-8";
|
||||
defaultLocale = "en_US.UTF-8";
|
||||
supportedLocales = [
|
||||
"en_AU.UTF-8/UTF-8"
|
||||
"en_US.UTF-8/UTF-8"
|
||||
|
|
|
|||
139
modules/system/hosts/fractal/default.nix
Normal file
139
modules/system/hosts/fractal/default.nix
Normal file
|
|
@ -0,0 +1,139 @@
|
|||
{ self, inputs, ... }:
|
||||
|
||||
{
|
||||
|
||||
flake.nixosConfigurations.fractal = inputs.nixpkgs.lib.nixosSystem {
|
||||
modules = with self.nixosModules; [
|
||||
# user and shared system modules
|
||||
serenity
|
||||
core
|
||||
user-parts
|
||||
|
||||
# machine hardware and settings
|
||||
fractal-configuration
|
||||
fractal-hardware
|
||||
|
||||
# selected features for this desktop
|
||||
network-proxy
|
||||
terminal
|
||||
terminal-emulator
|
||||
desktop
|
||||
gaming
|
||||
multimedia
|
||||
];
|
||||
};
|
||||
|
||||
flake.nixosModules.fractal-configuration =
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
user-parts,
|
||||
...
|
||||
}:
|
||||
{
|
||||
networking.hostName = "fractal";
|
||||
networking.networkmanager.enable = true;
|
||||
|
||||
boot = {
|
||||
loader = {
|
||||
systemd-boot.enable = true;
|
||||
efi.canTouchEfiVariables = true;
|
||||
timeout = lib.mkDefault 5;
|
||||
};
|
||||
initrd.systemd.enable = true;
|
||||
};
|
||||
|
||||
hardware.enableRedistributableFirmware = true;
|
||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
hardware.graphics = {
|
||||
enable = true;
|
||||
enable32Bit = true;
|
||||
};
|
||||
|
||||
# RTX 5060 Ti (Blackwell) uses NVIDIA's open kernel modules.
|
||||
services.xserver.videoDrivers = [ "nvidia" ];
|
||||
hardware.nvidia = {
|
||||
modesetting.enable = true;
|
||||
open = true;
|
||||
nvidiaSettings = true;
|
||||
package = config.boot.kernelPackages.nvidiaPackages.stable;
|
||||
};
|
||||
|
||||
hardware.bluetooth = {
|
||||
enable = true;
|
||||
powerOnBoot = true;
|
||||
};
|
||||
|
||||
services.pulseaudio.enable = false;
|
||||
security.rtkit.enable = true;
|
||||
services.pipewire = {
|
||||
enable = true;
|
||||
alsa = {
|
||||
enable = true;
|
||||
support32Bit = true;
|
||||
};
|
||||
pulse.enable = true;
|
||||
wireplumber.enable = true;
|
||||
};
|
||||
|
||||
services.fstrim.enable = true;
|
||||
|
||||
# Display arrangement detected on fractal: HDMI-A-1 is primary,
|
||||
# with DP-2 immediately to its right.
|
||||
home-manager.users.${user-parts.user.username} = {
|
||||
programs.niri.settings = {
|
||||
outputs = lib.mkForce {
|
||||
"HDMI-A-1" = {
|
||||
focus-at-startup = true;
|
||||
mode = {
|
||||
width = 1920;
|
||||
height = 1080;
|
||||
refresh = 179.98;
|
||||
};
|
||||
position = {
|
||||
x = 0;
|
||||
y = 0;
|
||||
};
|
||||
};
|
||||
"DP-2" = {
|
||||
mode = {
|
||||
width = 1920;
|
||||
height = 1080;
|
||||
refresh = 59.96;
|
||||
};
|
||||
position = {
|
||||
x = 1920;
|
||||
y = 0;
|
||||
};
|
||||
};
|
||||
};
|
||||
workspaces."01sys".open-on-output = lib.mkForce "HDMI-A-1";
|
||||
};
|
||||
|
||||
programs.noctalia.settings.bar.monitors = lib.mkForce [
|
||||
"HDMI-A-1"
|
||||
"DP-2"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
flake.nixosModules.fractal-hardware =
|
||||
{ modulesPath, ... }:
|
||||
{
|
||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||
|
||||
boot.initrd.availableKernelModules = [
|
||||
"xhci_pci"
|
||||
"ahci"
|
||||
"nvme"
|
||||
"usbhid"
|
||||
"usb_storage"
|
||||
"sd_mod"
|
||||
];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.supportedFilesystems = [ "btrfs" ];
|
||||
|
||||
# Add fileSystems and swapDevices here once the NixOS target layout is chosen.
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -1,102 +0,0 @@
|
|||
{ self, inputs, ... }:
|
||||
|
||||
{
|
||||
# defines the template specific configuration
|
||||
# copy this directory and rename for new hosts
|
||||
flake.nixosConfigurations.template =
|
||||
inputs.nixpkgs.lib.nixosSystem
|
||||
{
|
||||
modules = with self.nixosModules; [
|
||||
# user modules
|
||||
serenity # user module declaration
|
||||
|
||||
# shared system modules
|
||||
core # shared configuration options
|
||||
user-parts # user variables
|
||||
|
||||
# host-specific modules
|
||||
template-configuration # host specific configuration options below
|
||||
|
||||
# feature modules
|
||||
terminal # most terminal programs
|
||||
network-proxy # basic dns crypt proxy
|
||||
|
||||
# desktop features (uncomment as needed)
|
||||
# desktop # most desktop programs
|
||||
# terminal-emulator # terminal program for desktops
|
||||
# gaming # gaming modules, steam, osu, etc.
|
||||
# media-server # remote mediashare configuration
|
||||
# music # music consumption
|
||||
# music-production # music creation
|
||||
# multimedia # image and video programs
|
||||
# virtual-reality # configuration for vr setup
|
||||
# kde-connect # phone <-> desktop connectivity
|
||||
];
|
||||
};
|
||||
|
||||
# host module declaration
|
||||
flake.nixosModules.template-configuration =
|
||||
{ pkgs, lib, ... }:
|
||||
{
|
||||
# set hostname
|
||||
networking.hostName = "template";
|
||||
|
||||
# bootloader settings
|
||||
boot = {
|
||||
loader = {
|
||||
systemd-boot.enable = true;
|
||||
efi.canTouchEfiVariables = true;
|
||||
timeout = lib.mkDefault 5;
|
||||
};
|
||||
initrd.systemd.enable = true;
|
||||
};
|
||||
|
||||
# CPU microcode (uncomment for your CPU vendor)
|
||||
# hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
# hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
|
||||
# fstrim for ssd
|
||||
services.fstrim.enable = true;
|
||||
|
||||
# GPU support (uncomment as needed)
|
||||
# hardware.graphics.enable = true;
|
||||
# hardware.graphics.enable32Bit = true;
|
||||
|
||||
# NVIDIA GPU (uncomment if needed)
|
||||
# services.xserver.videoDrivers = [ "nvidia" ];
|
||||
# hardware.nvidia = {
|
||||
# modesetting.enable = true;
|
||||
# open = true;
|
||||
# nvidiaSettings = true;
|
||||
# package = config.boot.kernelPackages.nvidiaPackages.stable;
|
||||
# };
|
||||
# boot.kernelModules = [ "nvidia" "nvidia_modeset" "nvidia_uvm" "nvidia_drm" ];
|
||||
|
||||
# AMD GPU (uncomment if needed)
|
||||
# hardware.amdgpu = {
|
||||
# initrd.enable = true;
|
||||
# overdrive = {
|
||||
# enable = true;
|
||||
# ppfeaturemask = "0xffffffff";
|
||||
# };
|
||||
# };
|
||||
# boot = {
|
||||
# initrd.kernelModules = [ "amdgpu" ];
|
||||
# kernelModules = [ "amdgpu" "kvm-amd" ];
|
||||
# };
|
||||
|
||||
# Bluetooth (uncomment if needed)
|
||||
# hardware.bluetooth = {
|
||||
# enable = true;
|
||||
# powerOnBoot = true;
|
||||
# };
|
||||
|
||||
# Printing support (uncomment if needed)
|
||||
# services.printing.enable = true;
|
||||
|
||||
# Add host-specific packages here
|
||||
environment.systemPackages = with pkgs; [
|
||||
# Add host-specific packages
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
@ -30,24 +30,20 @@
|
|||
# configure user here
|
||||
nixos.user-parts = {
|
||||
user = {
|
||||
username = "serenity";
|
||||
username = "porta";
|
||||
avatar = "../../assets/media/avatars/carpet.jpg";
|
||||
home-directory = "/home/serenity/";
|
||||
default-locale = "en_AU.UTF-8";
|
||||
home-directory = "/home/porta/";
|
||||
default-locale = "en_US.UTF-8";
|
||||
};
|
||||
git = {
|
||||
username = "serenity-F";
|
||||
email = "serenity-F@noreply.codeberg.org";
|
||||
username = "Porta";
|
||||
email = "portalmaster137@gmail.com";
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
# nixos user declaration
|
||||
users.users.${user-parts.user.username} = {
|
||||
|
||||
# remember to change this
|
||||
initialPassword = "password";
|
||||
|
||||
# permissions management
|
||||
isNormalUser = true;
|
||||
extraGroups = [
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue