william/nix-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

nixfmt everything

Browse source
This commit is contained in:
rotterdam 2023-04-03 11:01:56 -03:00
parent dbf843d70f
commit d92420451d
30 changed files with 383 additions and 330 deletions
Download patch file Download diff file Expand all files Collapse all files

4
hosts/desktops/common/boot.nix
View file

@ -10,9 +10,7 @@
extraModprobeConfig = ''
options bluetooth disable_ertm=1
'';
kernel.sysctl = {
"net.ipv4.tcp_mtu_probing" = 1;
};
kernel.sysctl = { "net.ipv4.tcp_mtu_probing" = 1; };
kernelParams = [
"quiet"
"splash"

3
hosts/desktops/common/hardware.nix
View file

@ -11,5 +11,6 @@
sound.enable = true;
security.rtkit.enable = true; # Needed for pipewire to acquire realtime priority
security.rtkit.enable =
true; # Needed for pipewire to acquire realtime priority
}

19
hosts/desktops/common/packages.nix
View file

@ -19,10 +19,10 @@
fzf
gimp
gocryptfs
# helvum
# helvum
heroic
inkscape
# itch # Currently using unsafe electron version
# itch # Currently using unsafe electron version
jellyfin-media-player
junction
kolourpaint
@ -42,7 +42,7 @@
prismlauncher-qt5
protontricks
protonup
# prusa-slicer
# prusa-slicer
qbittorrent
quickemu
qview
@ -62,9 +62,7 @@
wezterm
yubikey-personalization-gui
# Package overrides
(appimage-run.override {
extraPkgs = pkgs: [ libthai ];
})
(appimage-run.override { extraPkgs = pkgs: [ libthai ]; })
# Packages from 3rd party overlays
agenix
chatterino7
@ -95,11 +93,6 @@
];
};
environment.plasma5.excludePackages = ( with pkgs.plasma5Packages; [
elisa
gwenview
oxygen
khelpcenter
konsole
]);
environment.plasma5.excludePackages =
(with pkgs.plasma5Packages; [ elisa gwenview oxygen khelpcenter konsole ]);
}

8
hosts/desktops/common/services.nix
View file

@ -4,9 +4,8 @@ let
plasma = pkgs.writeScriptBin "plasma" ''
${pkgs.plasma-workspace}/bin/startplasma-wayland &> /dev/null
'';
in
{
in {
services = {
printing.enable = true;
pipewire = {
@ -23,14 +22,15 @@ in
layout = "us";
xkbVariant = "altgr-intl";
exportConfiguration = true;
excludePackages = ( with pkgs; [ xterm ]);
excludePackages = (with pkgs; [ xterm ]);
displayManager.startx.enable = true;
desktopManager.plasma5.enable = true;
};
greetd = {
enable = true;
settings = {
default_session.command = "${pkgs.greetd.tuigreet}/bin/tuigreet --remember --user-menu --asterisks --time --greeting \"Welcome to NixOS\" --cmd ${plasma}/bin/plasma";
default_session.command = ''
${pkgs.greetd.tuigreet}/bin/tuigreet --remember --user-menu --asterisks --time --greeting "Welcome to NixOS" --cmd ${plasma}/bin/plasma'';
initial_session = {
command = "${plasma}/bin/plasma";
user = "user";

6
hosts/desktops/common/users.nix
View file

@ -2,8 +2,10 @@
{
environment.sessionVariables = rec {
KDEHOME = "$XDG_CONFIG_HOME/kde4"; # Stops kde from placing a .kde4 folder in the home dir
NIXOS_OZONE_WL = "1"; # Forces chromium and most electron apps to run in wayland
KDEHOME =
"$XDG_CONFIG_HOME/kde4"; # Stops kde from placing a .kde4 folder in the home dir
NIXOS_OZONE_WL =
"1"; # Forces chromium and most electron apps to run in wayland
};
users.users.user = {

6
hosts/desktops/io.nix
View file

@ -20,11 +20,7 @@
};
boot = {
kernelParams = [
"nosgx"
"i915.fastboot=1"
"mem_sleep_default=deep"
];
kernelParams = [ "nosgx" "i915.fastboot=1" "mem_sleep_default=deep" ];
kernelModules = [
"i2c-dev" # Required for arduino dev
"i2c-piix4" # Required for arduino dev

4
hosts/desktops/io/default.nix
View file

@ -1,7 +1,5 @@
{ ... }:
{
imports = [
./hardware-configuration.nix
];
imports = [ ./hardware-configuration.nix ];
}

29
hosts/desktops/io/hardware-configuration.nix
View file

@ -4,26 +4,26 @@
{ config, lib, pkgs, modulesPath, ... }:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ];
boot.initrd.availableKernelModules =
[ "xhci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/2321ee32-a952-4a4b-bba0-bb25f616a4a5";
fsType = "ext4";
};
fileSystems."/" = {
device = "/dev/disk/by-uuid/2321ee32-a952-4a4b-bba0-bb25f616a4a5";
fsType = "ext4";
};
boot.initrd.luks.devices."luks-008bb7cb-917c-4dda-93fe-542c2285bafb".device = "/dev/disk/by-uuid/008bb7cb-917c-4dda-93fe-542c2285bafb";
boot.initrd.luks.devices."luks-008bb7cb-917c-4dda-93fe-542c2285bafb".device =
"/dev/disk/by-uuid/008bb7cb-917c-4dda-93fe-542c2285bafb";
fileSystems."/boot/efi" =
{ device = "/dev/disk/by-uuid/36B4-C473";
fsType = "vfat";
};
fileSystems."/boot/efi" = {
device = "/dev/disk/by-uuid/36B4-C473";
fsType = "vfat";
};
swapDevices = [ ];
@ -35,5 +35,6 @@
# networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true;
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
hardware.cpu.intel.updateMicrocode =
lib.mkDefault config.hardware.enableRedistributableFirmware;
}

17
hosts/desktops/rotterdam.nix
View file

@ -18,13 +18,9 @@
systemd.targets.hibernate.enable = false; # disable non-functional hibernate
nix.nixPath = [
"nixos-config=${./rotterdam.nix}"
];
nix.nixPath = [ "nixos-config=${./rotterdam.nix}" ];
users.users.user.extraGroups = [
"corectrl"
];
users.users.user.extraGroups = [ "corectrl" ];
boot.kernelParams = [
"processor.max_cstate=1" # Fixes bug where ryzen cpus freeze when in highest C state
@ -32,7 +28,8 @@
];
environment.sessionVariables = rec {
KWIN_DRM_NO_AMS = "1"; # RDNA2 colour/gamma modesetting bug workaround for kwin wayland
KWIN_DRM_NO_AMS =
"1"; # RDNA2 colour/gamma modesetting bug workaround for kwin wayland
};
programs = {
@ -45,17 +42,17 @@
cemu
retroarchFull
rpcs3
# yuzu-ea
# yuzu-ea
# Packages from 3rd party overlays
emulationstation-de
];
networking.firewall = {
allowedTCPPorts =[
allowedTCPPorts = [
27036 # Steam remote play
27037 # Steam remote play
];
allowedUDPPorts =[
allowedUDPPorts = [
27031 # Steam remote play
27036 # Steam remote play
];

4
hosts/desktops/rotterdam/default.nix
View file

@ -1,7 +1,5 @@
{ ... }:
{
imports = [
./hardware-configuration.nix
];
imports = [ ./hardware-configuration.nix ];
}

29
hosts/desktops/rotterdam/hardware-configuration.nix
View file

@ -4,28 +4,26 @@
{ config, lib, pkgs, modulesPath, ... }:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.availableKernelModules =
[ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/9ccbb9e3-addc-42a3-b5d8-1e81eed37548";
fsType = "ext4";
};
fileSystems."/" = {
device = "/dev/disk/by-uuid/9ccbb9e3-addc-42a3-b5d8-1e81eed37548";
fsType = "ext4";
};
fileSystems."/boot/efi" =
{ device = "/dev/disk/by-uuid/7707-0E25";
fsType = "vfat";
};
fileSystems."/boot/efi" = {
device = "/dev/disk/by-uuid/7707-0E25";
fsType = "vfat";
};
swapDevices =
[ { device = "/dev/disk/by-uuid/39005453-0ac9-4fee-bdd3-7ea9bb6f9ca6"; }
];
[{ device = "/dev/disk/by-uuid/39005453-0ac9-4fee-bdd3-7ea9bb6f9ca6"; }];
# 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
@ -35,5 +33,6 @@
# networking.interfaces.enp34s0.useDHCP = lib.mkDefault true;
# networking.interfaces.wlo1.useDHCP = lib.mkDefault true;
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
hardware.cpu.amd.updateMicrocode =
lib.mkDefault config.hardware.enableRedistributableFirmware;
}