mirror of
https://codeberg.org/jopejoe1/nix-conf.git
synced 2025-06-07 13:29:22 +02:00
Clean up
This commit is contained in:
parent
673524b947
commit
9ad1975f72
33 changed files with 358 additions and 471 deletions
|
|
@ -1,26 +1,39 @@
|
|||
{ ... }:
|
||||
{ modulesPath, lib, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
];
|
||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||
|
||||
boot = {
|
||||
initrd = { availableKernelModules = [ "xhci_pci" ]; };
|
||||
loader = { generic-extlinux-compatible.enable = true; };
|
||||
};
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
hardware.raspberry-pi."4".fkms-3d.enable = true;
|
||||
|
||||
jopejoe1 = {
|
||||
audio = {
|
||||
enable = true;
|
||||
};
|
||||
audio.enable = true;
|
||||
bluetooth.enable = true;
|
||||
local.enable = true;
|
||||
nix.enable = true;
|
||||
root.enable = true;
|
||||
};
|
||||
|
||||
boot.loader = {
|
||||
grub.enable = false;
|
||||
generic-extlinux-compatible.enable = true;
|
||||
networking = {
|
||||
hostName = "inugami";
|
||||
useDHCP = lib.mkDefault true;
|
||||
};
|
||||
|
||||
networking.hostName = "inugami";
|
||||
nixpkgs.hostPlatform = {
|
||||
system = "aarch64-linux";
|
||||
config = "aarch64-unknown-linux-gnu";
|
||||
};
|
||||
|
||||
powerManagement.cpuFreqGovernor = "ondemand";
|
||||
|
||||
programs = {
|
||||
git = {
|
||||
|
|
@ -28,6 +41,4 @@
|
|||
lfs.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
hardware.raspberry-pi."4".fkms-3d.enable = true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,23 +0,0 @@
|
|||
{ modulesPath, lib, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot = {
|
||||
initrd = {
|
||||
availableKernelModules = [ "xhci_pci"];
|
||||
};
|
||||
};
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
nixpkgs.hostPlatform = "aarch64-linux";
|
||||
powerManagement.cpuFreqGovernor = "ondemand";
|
||||
}
|
||||
|
||||
|
|
@ -1,10 +1,7 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ # Include the results of the hardware scan.
|
||||
./hardware.nix
|
||||
];
|
||||
imports = [ ./hardware.nix ];
|
||||
|
||||
jopejoe1 = {
|
||||
audio = {
|
||||
|
|
@ -24,75 +21,71 @@
|
|||
root.enable = true;
|
||||
};
|
||||
|
||||
networking.hostName = "kami";
|
||||
networking.hostId = "16c22faf";
|
||||
services.hardware.openrgb.enable = true;
|
||||
services.fwupd.enable = true;
|
||||
|
||||
nixpkgs.config = {
|
||||
cudaSupport = true;
|
||||
allowAliases = false;
|
||||
allowUnfree = true;
|
||||
networking = {
|
||||
hostName = "kami";
|
||||
hostId = "16c22faf";
|
||||
};
|
||||
|
||||
services.xserver.desktopManager.kodi.enable = true;
|
||||
services = {
|
||||
hardware.openrgb.enable = true;
|
||||
fwupd.enable = true;
|
||||
xserver = {
|
||||
videoDrivers = [ "nvidia" ];
|
||||
layout = "de";
|
||||
};
|
||||
};
|
||||
|
||||
boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
|
||||
nixpkgs = {
|
||||
config = { cudaSupport = true; };
|
||||
hostPlatform = {
|
||||
system = "x86_64-linux";
|
||||
config = "x86_64-unknown-linux-gnu";
|
||||
# gcc.arch = "alderlake";
|
||||
};
|
||||
};
|
||||
|
||||
#boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
|
||||
boot.kernelPackages = pkgs.linuxPackages_testing;
|
||||
networking.networkmanager.enable = true;
|
||||
boot = {
|
||||
kernelPackages = pkgs.linuxPackages_testing;
|
||||
loader = {
|
||||
systemd-boot = {
|
||||
enable = true;
|
||||
configurationLimit = 10;
|
||||
editor = false;
|
||||
};
|
||||
efi = {
|
||||
canTouchEfiVariables = true;
|
||||
efiSysMountPoint = "/boot/efi";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
time.timeZone = "Europe/Berlin";
|
||||
|
||||
services.xserver.videoDrivers = [ "nvidia" ];
|
||||
hardware.opengl.enable = true;
|
||||
hardware.opengl.driSupport32Bit = true;
|
||||
|
||||
hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.stable;
|
||||
|
||||
services.logmein-hamachi.enable = true;
|
||||
programs.haguichi.enable = true;
|
||||
|
||||
#boot.kernelParams = [ "module_blacklist=i915" ];
|
||||
|
||||
fonts.packages = with pkgs; [
|
||||
google-fonts
|
||||
noto-fonts
|
||||
noto-fonts-color-emoji
|
||||
noto-fonts-cjk-sans
|
||||
noto-fonts-cjk-serif
|
||||
noto-fonts-emoji-blob-bin
|
||||
nerdfonts
|
||||
league-of-moveable-type
|
||||
twitter-color-emoji
|
||||
];
|
||||
hardware = {
|
||||
opengl = {
|
||||
enable = true;
|
||||
driSupport32Bit = true;
|
||||
};
|
||||
nvidia = {
|
||||
package = config.boot.kernelPackages.nvidiaPackages.stable;
|
||||
modesetting.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
mcrcon
|
||||
prismlauncher
|
||||
libsForQt5.discover
|
||||
skypeforlinux
|
||||
jetbrains.pycharm-community
|
||||
jetbrains.idea-community
|
||||
carla
|
||||
#devolo-dlan-cockpit
|
||||
libsForQt5.qtstyleplugin-kvantum
|
||||
mixxx
|
||||
picard
|
||||
mangohud
|
||||
goverlay
|
||||
strawberry
|
||||
whatsapp-for-linux
|
||||
qdirstat
|
||||
teams-for-linux
|
||||
webex
|
||||
discord
|
||||
element-desktop
|
||||
mumble
|
||||
|
||||
(python3.withPackages(ps: with ps; [ beautifulsoup4 requests]))
|
||||
|
||||
# Theming
|
||||
catppuccin-kvantum
|
||||
catppuccin-kde
|
||||
|
|
@ -100,19 +93,10 @@
|
|||
tela-icon-theme
|
||||
];
|
||||
|
||||
programs.java = {
|
||||
enable = true;
|
||||
binfmt = true;
|
||||
};
|
||||
|
||||
hardware.nvidia.modesetting.enable = true;
|
||||
|
||||
services.flatpak.enable = true;
|
||||
|
||||
programs = {
|
||||
dconf.enable = true;
|
||||
droidcam.enable = true;
|
||||
#sysdig.enable = true;
|
||||
sysdig.enable = true;
|
||||
xwayland.enable = true;
|
||||
kdeconnect.enable = true;
|
||||
gamemode.enable = true;
|
||||
|
|
@ -125,31 +109,9 @@
|
|||
enable = true;
|
||||
keyMap = "de";
|
||||
};
|
||||
services.xserver = {
|
||||
layout = "de";
|
||||
};
|
||||
|
||||
#boot.plymouth = {
|
||||
# enable = true;
|
||||
#themePackages = [ pkgs.catppuccin-plymouth ];
|
||||
#theme = "catppuccin-frappe";
|
||||
# };
|
||||
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
boot.loader.efi.efiSysMountPoint = "/boot/efi";
|
||||
|
||||
boot.loader.systemd-boot.configurationLimit = 10;
|
||||
|
||||
# https://github.com/NixOS/nixpkgs/blob/c32c39d6f3b1fe6514598fa40ad2cf9ce22c3fb7/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix#L66
|
||||
boot.loader.systemd-boot.editor = false;
|
||||
|
||||
# Re-Compile everything for my specific cpu
|
||||
nix.settings.system-features = ["gccarch-alderlake" "benchmark" "big-parallel" "kvm" "nixos-test"];
|
||||
systemd.services.nix-daemon.serviceConfig.LimitNOFILE = lib.mkForce 1048576000;
|
||||
nixpkgs.hostPlatform = {
|
||||
system = "x86_64-linux";
|
||||
config = "x86_64-unknown-linux-gnu";
|
||||
# gcc.arch = "alderlake";
|
||||
};
|
||||
nix.settings.system-features =
|
||||
[ "gccarch-alderlake" "benchmark" "big-parallel" "kvm" "nixos-test" ];
|
||||
systemd.services.nix-daemon.serviceConfig.LimitNOFILE =
|
||||
lib.mkForce 1048576000;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,8 +4,7 @@
|
|||
{ config, lib, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||
|
||||
hardware.nvidia.prime = {
|
||||
offload.enable = false;
|
||||
|
|
@ -18,7 +17,8 @@
|
|||
nvidiaBusId = "PCI:1:0:0";
|
||||
};
|
||||
|
||||
boot.initrd.availableKernelModules = [ "vmd" "xhci_pci" "ahci" "nvme" "usbhid" "sd_mod" "sr_mod" ];
|
||||
boot.initrd.availableKernelModules =
|
||||
[ "vmd" "xhci_pci" "ahci" "nvme" "usbhid" "sd_mod" "sr_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
|
@ -26,16 +26,16 @@
|
|||
zramSwap.enable = true;
|
||||
|
||||
fileSystems = {
|
||||
# "/" = {
|
||||
# "/" = {
|
||||
# device = "/dev/disk/by-uuid/99a47ace-7e69-4520-b914-d4fe5b31dc79";
|
||||
# fsType = "btrfs";
|
||||
# options = [ "subvol=@" "compress=zstd:8" ];
|
||||
# fsType = "btrfs";
|
||||
# options = [ "subvol=@" "compress=zstd:8" ];
|
||||
#};
|
||||
# "/" = {
|
||||
# "/" = {
|
||||
# device = "none";
|
||||
# fsType = "tmpfs";
|
||||
# options = [ "size=4G" "mode=755" ]; # mode=755 so only root can write to those files
|
||||
# };
|
||||
# fsType = "tmpfs";
|
||||
# options = [ "size=4G" "mode=755" ]; # mode=755 so only root can write to those files
|
||||
# };
|
||||
"/" = {
|
||||
device = "/dev/nvme0n1p2";
|
||||
fsType = "bcachefs";
|
||||
|
|
@ -51,12 +51,12 @@
|
|||
"/media/gaming" = {
|
||||
device = "/dev/disk/by-uuid/4038F97238F966F6";
|
||||
fsType = "ntfs";
|
||||
options = [ "rw" "uid=1000"];
|
||||
options = [ "rw" "uid=1000" ];
|
||||
};
|
||||
#"/media/zfs" = {
|
||||
# device = "jopejoe1";
|
||||
# fsType = "zfs";
|
||||
# };
|
||||
# device = "jopejoe1";
|
||||
# fsType = "zfs";
|
||||
# };
|
||||
};
|
||||
|
||||
swapDevices = [ ];
|
||||
|
|
@ -71,5 +71,6 @@
|
|||
|
||||
#nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
|
||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
hardware.cpu.intel.updateMicrocode =
|
||||
lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,14 +1,10 @@
|
|||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
];
|
||||
imports = [ ./hardware-configuration.nix ];
|
||||
|
||||
jopejoe1 = {
|
||||
audio = {
|
||||
enable = true;
|
||||
};
|
||||
audio = { enable = true; };
|
||||
bluetooth.enable = true;
|
||||
local.enable = true;
|
||||
jopejoe1.enable = true;
|
||||
|
|
@ -16,7 +12,7 @@
|
|||
root.enable = true;
|
||||
};
|
||||
|
||||
networking.hostName = "tuny";
|
||||
networking = { hostName = "tuny"; };
|
||||
boot.loader.grub.device = "/dev/sda";
|
||||
|
||||
programs = {
|
||||
|
|
@ -26,35 +22,7 @@
|
|||
};
|
||||
};
|
||||
|
||||
users.users.musicp = {
|
||||
isNormalUser = true;
|
||||
description = "Music Player";
|
||||
extraGroups = [ "networkmanager" "wheel" ];
|
||||
packages = with pkgs; [
|
||||
firefox
|
||||
];
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
mixxx
|
||||
];
|
||||
|
||||
networking.networkmanager.enable = true;
|
||||
environment.systemPackages = with pkgs; [ mixxx ];
|
||||
|
||||
time.timeZone = "Europe/Berlin";
|
||||
|
||||
# Enable the X11 windowing system.
|
||||
services.xserver.enable = true;
|
||||
|
||||
# Enable the GNOME Desktop Environment.
|
||||
services.xserver.displayManager.gdm.enable = true;
|
||||
services.xserver.desktopManager.gnome.enable = true;
|
||||
|
||||
# Enable automatic login for the user.
|
||||
services.xserver.displayManager.autoLogin.enable = true;
|
||||
services.xserver.displayManager.autoLogin.user = "musicp";
|
||||
|
||||
# Workaround for GNOME autologin: https://github.com/NixOS/nixpkgs/issues/103746#issuecomment-945091229
|
||||
systemd.services."getty@tty1".enable = false;
|
||||
systemd.services."autovt@tty1".enable = false;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,26 +1,32 @@
|
|||
# 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, ... }:
|
||||
{ config, lib, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "sr_mod" "sdhci_pci" "rtsx_pci_sdmmc" ];
|
||||
boot.initrd.availableKernelModules = [
|
||||
"xhci_pci"
|
||||
"ehci_pci"
|
||||
"ahci"
|
||||
"usb_storage"
|
||||
"sd_mod"
|
||||
"sr_mod"
|
||||
"sdhci_pci"
|
||||
"rtsx_pci_sdmmc"
|
||||
];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/1cae8f88-5db6-4c97-88e4-350c35275d5c";
|
||||
fsType = "ext4";
|
||||
};
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/1cae8f88-5db6-4c97-88e4-350c35275d5c";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
swapDevices =
|
||||
[ { device = "/dev/disk/by-uuid/8569ee66-b939-4ce8-a94a-dca7df5e301b"; }
|
||||
];
|
||||
[{ device = "/dev/disk/by-uuid/8569ee66-b939-4ce8-a94a-dca7df5e301b"; }];
|
||||
|
||||
# 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
|
||||
|
|
@ -31,5 +37,6 @@
|
|||
# networking.interfaces.wlp5s0.useDHCP = lib.mkDefault true;
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
hardware.cpu.intel.updateMicrocode =
|
||||
lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,16 +1,10 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[
|
||||
# Include the results of the hardware scan.
|
||||
./hardware.nix
|
||||
];
|
||||
imports = [ ./hardware.nix ];
|
||||
|
||||
jopejoe1 = {
|
||||
audio = {
|
||||
enable = true;
|
||||
};
|
||||
audio = { enable = true; };
|
||||
bluetooth.enable = true;
|
||||
local.enable = true;
|
||||
nix.enable = true;
|
||||
|
|
@ -20,75 +14,22 @@
|
|||
root.enable = true;
|
||||
};
|
||||
|
||||
networking.hostName = "yokai";
|
||||
networking.hostId = "af13bbec";
|
||||
|
||||
boot.supportedFilesystems = [ "ntfs" "btrfs" "zfs" ];
|
||||
|
||||
boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
|
||||
|
||||
hardware.opengl.enable = true;
|
||||
|
||||
networking.networkmanager.enable = true;
|
||||
|
||||
networking.networkmanager.ensureProfiles.profiles = {
|
||||
"37C3" = {
|
||||
connection = {
|
||||
id = "37C3";
|
||||
type = "wifi";
|
||||
interface-name = "wlan0";
|
||||
};
|
||||
wifi = {
|
||||
mode = "infrastructure";
|
||||
ssid = "37C3";
|
||||
};
|
||||
wifi-security = {
|
||||
auth-alg = "open";
|
||||
key-mgmt = "wpa-eap";
|
||||
};
|
||||
"802-1x" = {
|
||||
anonymous-identity = "37C3";
|
||||
eap = "ttls;";
|
||||
identity = "37C3";
|
||||
password = "37C3";
|
||||
phase2-auth = "mschapv2";
|
||||
};
|
||||
ipv4 = {
|
||||
method = "auto";
|
||||
};
|
||||
ipv6 = {
|
||||
addr-gen-mode = "default";
|
||||
method = "auto";
|
||||
};
|
||||
};
|
||||
networking = {
|
||||
hostName = "yokai";
|
||||
hostId = "af13bbec";
|
||||
};
|
||||
|
||||
hardware.opengl.enable = true;
|
||||
|
||||
time.timeZone = "Europe/Berlin";
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
git
|
||||
|
||||
# Theming
|
||||
catppuccin-kvantum
|
||||
catppuccin-kde
|
||||
catppuccin-gtk
|
||||
tela-icon-theme
|
||||
|
||||
# Fonts
|
||||
#google-fonts
|
||||
noto-fonts
|
||||
noto-fonts-emoji
|
||||
noto-fonts-cjk-sans
|
||||
noto-fonts-cjk-serif
|
||||
noto-fonts-emoji-blob-bin
|
||||
#nerdfonts
|
||||
#league-of-moveable-type
|
||||
twitter-color-emoji
|
||||
];
|
||||
|
||||
services.flatpak.enable = true;
|
||||
|
||||
programs = {
|
||||
droidcam.enable = true;
|
||||
dconf.enable = true;
|
||||
|
|
@ -99,15 +40,16 @@
|
|||
enable = true;
|
||||
keyMap = "us";
|
||||
};
|
||||
services.xserver = {
|
||||
layout = "us";
|
||||
};
|
||||
services.xserver = { layout = "us"; };
|
||||
|
||||
boot.loader = {
|
||||
grub.enable = false;
|
||||
generic-extlinux-compatible.enable = true;
|
||||
systemd-boot.configurationLimit = 10;
|
||||
systemd-boot.editor = false;
|
||||
boot = {
|
||||
supportedFilesystems = [ "ntfs" "btrfs" "zfs" ];
|
||||
kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
|
||||
loader = {
|
||||
generic-extlinux-compatible.enable = true;
|
||||
systemd-boot.configurationLimit = 10;
|
||||
systemd-boot.editor = false;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -4,26 +4,25 @@
|
|||
{ lib, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "usbhid" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-label/NIXROOT";
|
||||
fsType = "ext4";
|
||||
};
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-label/NIXROOT";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-label/NIXBOOT";
|
||||
fsType = "vfat";
|
||||
};
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-label/NIXBOOT";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
swapDevices = [ {
|
||||
swapDevices = [{
|
||||
device = "/var/lib/swapfile";
|
||||
size = (4*1024)+(2*1024);
|
||||
} ];
|
||||
size = (4 * 1024) + (2 * 1024);
|
||||
}];
|
||||
|
||||
# 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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue