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

Ran nix fmt against nixfmt-rfc-style

Browse source
This commit is contained in:
William 2024-09-23 11:54:59 -03:00
parent 43e53f8fb2
commit 8bcd4fc6b8
62 changed files with 784 additions and 287 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,10 @@
{ inputs, config, pkgs, lib, ... }:
{
inputs,
config,
pkgs,
lib,
...
}:
{
boot = {
@ -9,7 +15,9 @@
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"

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

@ -1,4 +1,10 @@
{ inputs, config, pkgs, lib, ... }:
{
inputs,
config,
pkgs,
lib,
...
}:
{
hardware = {
@ -10,6 +16,5 @@
i2c.enable = true;
};
security.rtkit.enable =
true; # Needed for pipewire to acquire realtime priority
security.rtkit.enable = true; # Needed for pipewire to acquire realtime priority
}

8
hosts/desktops/common/home-manager.nix
View file

@ -1,4 +1,10 @@
{ inputs, config, pkgs, lib, ... }:
{
inputs,
config,
pkgs,
lib,
...
}:
{
home-manager = {

7
hosts/desktops/common/impermanence.nix
View file

@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }:
{
config,
lib,
pkgs,
...
}:
{
environment.persistence.main = {

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

@ -1,4 +1,10 @@
{ inputs, config, pkgs, lib, ... }:
{
inputs,
config,
pkgs,
lib,
...
}:
{
environment.etc."channels/nixpkgs".source = inputs.nixpkgs.outPath;

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

@ -1,4 +1,10 @@
{ inputs, config, pkgs, lib, ... }:
{
inputs,
config,
pkgs,
lib,
...
}:
let
kdepkgs = with pkgs.kdePackages; [
ark
@ -9,8 +15,10 @@ let
merkuro
kdepim-addons
];
in {
environment.systemPackages = with pkgs;
in
{
environment.systemPackages =
with pkgs;
[
aspell
aspellDicts.de
@ -64,7 +72,8 @@ in {
ventoy
virt-manager
wezterm
] ++ kdepkgs;
]
++ kdepkgs;
services.flatpak = {
enable = true;
@ -100,9 +109,22 @@ in {
fonts = {
fontDir.enable = true;
packages = with pkgs; [ corefonts maple-mono noto-fonts-cjk roboto ];
packages = with pkgs; [
corefonts
maple-mono
noto-fonts-cjk
roboto
];
};
environment.plasma6.excludePackages =
(with pkgs.kdePackages; [ elisa gwenview khelpcenter konsole oxygen ]);
environment.plasma6.excludePackages = (
with pkgs.kdePackages;
[
elisa
gwenview
khelpcenter
konsole
oxygen
]
);
}

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

@ -1,4 +1,10 @@
{ inputs, config, pkgs, lib, ... }:
{
inputs,
config,
pkgs,
lib,
...
}:
{
services = {
@ -20,19 +26,19 @@
greetd = {
enable = true;
settings = {
default_session.command = let
xSessions =
"${config.services.displayManager.sessionData.desktops}/share/xsessions";
wlSessions =
"${config.services.displayManager.sessionData.desktops}/share/wayland-sessions";
in ''
${pkgs.greetd.tuigreet}/bin/tuigreet \
--remember \
--asterisks \
--time \
--greeting "NixOS" \
--sessions ${xSessions}:${wlSessions}
'';
default_session.command =
let
xSessions = "${config.services.displayManager.sessionData.desktops}/share/xsessions";
wlSessions = "${config.services.displayManager.sessionData.desktops}/share/wayland-sessions";
in
''
${pkgs.greetd.tuigreet}/bin/tuigreet \
--remember \
--asterisks \
--time \
--greeting "NixOS" \
--sessions ${xSessions}:${wlSessions}
'';
initial_session = {
command = ''
${pkgs.kdePackages.plasma-workspace}/bin/startplasma-wayland &> /dev/null
@ -46,6 +52,9 @@
xdg.portal = {
enable = true;
xdgOpenUsePortal = true;
extraPortals = with pkgs; [ xdg-desktop-portal-kde xdg-desktop-portal-gtk ];
extraPortals = with pkgs; [
xdg-desktop-portal-kde
xdg-desktop-portal-gtk
];
};
}

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

@ -4,8 +4,7 @@
stylix = {
enable = true;
image = pkgs.fetchurl {
url =
"https://github.com/notAxon/wallpapers/blob/main/Nature/Pink_Flowers_Photograph_by_Lisa_Fotios.jpeg?raw=true";
url = "https://github.com/notAxon/wallpapers/blob/main/Nature/Pink_Flowers_Photograph_by_Lisa_Fotios.jpeg?raw=true";
sha256 = "sha256-PyK/LuR7IR+FpGFZXdpYkShjKrwaqCtu64SY/wl/RvY=";
};
base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";

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

@ -1,11 +1,15 @@
{ inputs, config, pkgs, lib, ... }:
{
inputs,
config,
pkgs,
lib,
...
}:
{
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 = {

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

@ -1,4 +1,10 @@
{ inputs, config, pkgs, lib, ... }:
{
inputs,
config,
pkgs,
lib,
...
}:
{
virtualisation = {

20
hosts/desktops/io.nix
View file

@ -1,4 +1,9 @@
{ config, pkgs, lib, ... }:
{
config,
pkgs,
lib,
...
}:
let
cml-ucm-conf = pkgs.alsa-ucm-conf.overrideAttrs {
@ -14,7 +19,8 @@ let
cp -R $wttsrc/{cml,sof-rt5682} $out/share/alsa/ucm2/conf.d
'';
};
in {
in
{
imports = [
# Host-common imports
../common
@ -34,7 +40,11 @@ in {
};
boot = {
kernelParams = [ "nosgx" "i915.fastboot=1" "mem_sleep_default=deep" ];
kernelParams = [
"nosgx"
"i915.fastboot=1"
"mem_sleep_default=deep"
];
extraModprobeConfig = ''
options snd-intel-dspcfg dsp_driver=3
'';
@ -51,7 +61,9 @@ in {
# TODO: remove once gmodena/nix-flatpak/issues/45 fixed
systemd.services."flatpak-managed-install" = {
serviceConfig = { ExecStartPre = "${pkgs.coreutils}/bin/sleep 5"; };
serviceConfig = {
ExecStartPre = "${pkgs.coreutils}/bin/sleep 5";
};
};
services = {

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

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

12
hosts/desktops/io/ephermal.nix
View file

@ -1,10 +1,18 @@
{ config, lib, pkgs, ... }:
{
config,
lib,
pkgs,
...
}:
{
boot.initrd.systemd.services.recreate-root = {
description = "Rolling over and creating new filesystem root";
requires = [ "initrd-root-device.target" ];
after = [ "local-fs-pre.target" "initrd-root-device.target" ];
after = [
"local-fs-pre.target"
"initrd-root-device.target"
];
requiredBy = [ "initrd-root-fs.target" ];
before = [ "sysroot.mount" ];
unitConfig = {

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

@ -1,14 +1,24 @@
{ config, lib, pkgs, modulesPath, ... }:
{
config,
lib,
pkgs,
modulesPath,
...
}:
{
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot = {
initrd = {
availableKernelModules =
[ "xhci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ];
luks.devices."enc".device =
"/dev/disk/by-uuid/8018720e-42dd-453c-b374-adaa02eb48c9";
availableKernelModules = [
"xhci_pci"
"ahci"
"usb_storage"
"sd_mod"
"sdhci_pci"
];
luks.devices."enc".device = "/dev/disk/by-uuid/8018720e-42dd-453c-b374-adaa02eb48c9";
};
kernelModules = [ "kvm-intel" ];
extraModulePackages = [ ];
@ -18,27 +28,47 @@
"/" = {
device = "/dev/disk/by-uuid/3638cea6-5503-43cc-aa4f-3d37ebedad2f";
fsType = "btrfs";
options = [ "subvol=@root" "noatime" "compress=zstd" ];
options = [
"subvol=@root"
"noatime"
"compress=zstd"
];
};
"/home" = {
device = "/dev/disk/by-uuid/3638cea6-5503-43cc-aa4f-3d37ebedad2f";
fsType = "btrfs";
options = [ "subvol=@home" "noatime" "compress=zstd" ];
options = [
"subvol=@home"
"noatime"
"compress=zstd"
];
};
"/nix" = {
device = "/dev/disk/by-uuid/3638cea6-5503-43cc-aa4f-3d37ebedad2f";
fsType = "btrfs";
options = [ "subvol=@nix" "noatime" "compress=zstd" ];
options = [
"subvol=@nix"
"noatime"
"compress=zstd"
];
};
"/persistent" = {
device = "/dev/disk/by-uuid/3638cea6-5503-43cc-aa4f-3d37ebedad2f";
fsType = "btrfs";
options = [ "subvol=@persistent" "noatime" "compress=zstd" ];
options = [
"subvol=@persistent"
"noatime"
"compress=zstd"
];
};
"/boot/efi" = {
device = "/dev/disk/by-uuid/34AD-002A";
fsType = "vfat";
options = [ "noatime" "fmask=0077" "dmask=0077" ];
options = [
"noatime"
"fmask=0077"
"dmask=0077"
];
};
};
@ -48,7 +78,5 @@
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;
}

14
hosts/desktops/rotterdam.nix
View file

@ -1,4 +1,10 @@
{ inputs, config, pkgs, lib, ... }:
{
inputs,
config,
pkgs,
lib,
...
}:
let
qubesnsh = pkgs.writeTextFile {
@ -9,8 +15,7 @@ let
reboot-into-qubes = pkgs.makeDesktopItem {
name = "reboot-into-qubes";
icon = pkgs.fetchurl {
url =
"https://raw.githubusercontent.com/vinceliuice/Qogir-icon-theme/31f267e1f5fd4e9596bfd78dfb41a03d3a9f33ee/src/scalable/apps/distributor-logo-qubes.svg";
url = "https://raw.githubusercontent.com/vinceliuice/Qogir-icon-theme/31f267e1f5fd4e9596bfd78dfb41a03d3a9f33ee/src/scalable/apps/distributor-logo-qubes.svg";
sha256 = "sha256-QbHr7s5Wcs7uFtfqZctMyS0iDbMfiiZOKy2nHhDOfn0=";
};
desktopName = "Qubes OS";
@ -28,7 +33,8 @@ let
fi
'';
};
in {
in
{
imports = [
# Host-common imports
../common

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

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

12
hosts/desktops/rotterdam/ephermal.nix
View file

@ -1,10 +1,18 @@
{ config, lib, pkgs, ... }:
{
config,
lib,
pkgs,
...
}:
{
boot.initrd.systemd.services.recreate-root = {
description = "Rolling over and creating new filesystem root";
requires = [ "initrd-root-device.target" ];
after = [ "local-fs-pre.target" "initrd-root-device.target" ];
after = [
"local-fs-pre.target"
"initrd-root-device.target"
];
requiredBy = [ "initrd-root-fs.target" ];
before = [ "sysroot.mount" ];
unitConfig = {

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

@ -1,14 +1,24 @@
{ config, lib, modulesPath, ... }:
{
config,
lib,
modulesPath,
...
}:
{
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot = {
initrd = {
availableKernelModules =
[ "amdgpu" "nvme" "xhci_pci" "ahci" "usbhid" "sd_mod" ];
luks.devices."cryptroot".device =
"/dev/disk/by-uuid/f7dd4142-7109-4493-834d-4a831777f08d";
availableKernelModules = [
"amdgpu"
"nvme"
"xhci_pci"
"ahci"
"usbhid"
"sd_mod"
];
luks.devices."cryptroot".device = "/dev/disk/by-uuid/f7dd4142-7109-4493-834d-4a831777f08d";
};
kernelModules = [ "kvm-amd" ];
};
@ -17,41 +27,63 @@
"/" = {
device = "/dev/disk/by-uuid/3287dbc3-c0fa-4096-a0b3-59b017cfecc8";
fsType = "btrfs";
options = [ "subvol=@root" "noatime" "compress=zstd" ];
options = [
"subvol=@root"
"noatime"
"compress=zstd"
];
};
"/home" = {
device = "/dev/disk/by-uuid/3287dbc3-c0fa-4096-a0b3-59b017cfecc8";
fsType = "btrfs";
options = [ "subvol=@home" "noatime" "compress=zstd" ];
options = [
"subvol=@home"
"noatime"
"compress=zstd"
];
};
"/boot/efi" = {
device = "/dev/disk/by-uuid/1F5A-8945";
fsType = "vfat";
options = [ "noatime" "fmask=0077" "dmask=0077" ];
options = [
"noatime"
"fmask=0077"
"dmask=0077"
];
};
"/nix" = {
device = "/dev/disk/by-uuid/3287dbc3-c0fa-4096-a0b3-59b017cfecc8";
fsType = "btrfs";
options = [ "subvol=@nix" "noatime" "compress=zstd" ];
options = [
"subvol=@nix"
"noatime"
"compress=zstd"
];
};
"/persistent" = {
device = "/dev/disk/by-uuid/3287dbc3-c0fa-4096-a0b3-59b017cfecc8";
fsType = "btrfs";
options = [ "subvol=@persistent" "noatime" "compress=zstd" ];
options = [
"subvol=@persistent"
"noatime"
"compress=zstd"
];
};
"/swap" = {
device = "/dev/disk/by-uuid/3287dbc3-c0fa-4096-a0b3-59b017cfecc8";
fsType = "btrfs";
options = [ "subvol=@swap" "noatime" ];
options = [
"subvol=@swap"
"noatime"
];
};
};
swapDevices = [{ device = "/swap/swapfile"; }];
swapDevices = [ { device = "/swap/swapfile"; } ];
networking.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode =
lib.mkDefault config.hardware.enableRedistributableFirmware;
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
}