steven/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(fmt): use nixpkgs-fmt

Browse source
This commit is contained in:
Zhongheng Liu 2025-01-08 14:13:31 +02:00
commit ecaf5df80a
Signed by: steven
GPG key ID: 805A28B071DAD84B
22 changed files with 151 additions and 164 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/ags.nix
View file

@ -1,4 +1,4 @@
{pkgs, ...}: { { pkgs, ... }: {
environment.systemPackages = [ environment.systemPackages = [
pkgs.ags pkgs.ags
]; ];

23
nixos/bootloader.nix
View file

@ -1,8 +1,8 @@
{ { config
config, , pkgs
pkgs, , ...
... }:
}: let let
distro-grub-themes = pkgs.stdenv.mkDerivation { distro-grub-themes = pkgs.stdenv.mkDerivation {
pname = "distro-grub-themes"; pname = "distro-grub-themes";
version = "3.1"; version = "3.1";
@ -25,8 +25,9 @@
}; };
installPhase = "cp -r xenlism-grub-1080p-nixos/Xenlism-Nixos $out"; installPhase = "cp -r xenlism-grub-1080p-nixos/Xenlism-Nixos $out";
}; };
in { in
environment.systemPackages = with pkgs; [hack-font]; {
environment.systemPackages = with pkgs; [ hack-font ];
#fileSystems."/mnt/winsys" = { #fileSystems."/mnt/winsys" = {
# device = "/dev/nvme0n1p5"; # device = "/dev/nvme0n1p5";
# fsType = "ntfs-3g"; # fsType = "ntfs-3g";
@ -43,7 +44,7 @@ in {
theme = "rings"; theme = "rings";
themePackages = with pkgs; [ themePackages = with pkgs; [
# By default we would install all themes # By default we would install all themes
(adi1090x-plymouth-themes.override {selected_themes = ["rings"];}) (adi1090x-plymouth-themes.override { selected_themes = [ "rings" ]; })
]; ];
}; };
@ -62,16 +63,16 @@ in {
# Hide the OS choice for bootloaders. # Hide the OS choice for bootloaders.
# It's still possible to open the bootloader list by pressing any key # It's still possible to open the bootloader list by pressing any key
# It will just not appear on screen unless a key is pressed # It will just not appear on screen unless a key is pressed
supportedFilesystems = ["ntfs"]; supportedFilesystems = [ "ntfs" ];
loader = { loader = {
#timeout = 0; #timeout = 0;
efi = {canTouchEfiVariables = true;}; efi = { canTouchEfiVariables = true; };
grub = { grub = {
enable = true; enable = true;
efiSupport = true; efiSupport = true;
device = "nodev"; device = "nodev";
fsIdentifier = "label"; fsIdentifier = "label";
devices = ["nodev"]; devices = [ "nodev" ];
extraConfig = '' extraConfig = ''
function load_video { function load_video {
if [ x$feature_all_video_module = xy ]; then if [ x$feature_all_video_module = xy ]; then

79
nixos/configuration.nix
View file

@ -1,16 +1,14 @@
# This is your system's configuration file. # This is your system's configuration file.
# Use this to configure your system environment (it replaces /etc/nixos/configuration.nix) # Use this to configure your system environment (it replaces /etc/nixos/configuration.nix)
{ { inputs
inputs, , lib
lib, , config
config, , pkgs
pkgs, , ...
...
}: { }: {
imports = [ imports = [
../common/variables.nix ../common/variables.nix
./greetd.nix ./greetd.nix
#./ly.nix
./bootloader.nix ./bootloader.nix
./nvidia.nix ./nvidia.nix
./fonts.nix ./fonts.nix
@ -23,13 +21,14 @@
FLAKE = config.myConfigLocation; FLAKE = config.myConfigLocation;
MANPAGER = "nvim +Man!"; MANPAGER = "nvim +Man!";
NVD_BACKEND = "direct"; NVD_BACKEND = "direct";
NIXOS_OZONE_WL = "1";
# GTK_IM_MODULE = lib.mkForce ""; # GTK_IM_MODULE = lib.mkForce "";
}; };
services.keyd = { services.keyd = {
enable = true; enable = true;
keyboards = { keyboards = {
default = { default = {
ids = ["*"]; ids = [ "*" ];
settings = { settings = {
main = { main = {
capslock = "overload(control, esc)"; capslock = "overload(control, esc)";
@ -49,7 +48,7 @@
enable = true; enable = true;
capSysNice = true; capSysNice = true;
}; };
security.pam.services.hyprlock = {}; security.pam.services.hyprlock = { };
i18n.inputMethod = { i18n.inputMethod = {
type = "fcitx5"; type = "fcitx5";
enable = true; enable = true;
@ -65,7 +64,7 @@
hardware.bluetooth = { hardware.bluetooth = {
enable = true; enable = true;
powerOnBoot = true; powerOnBoot = true;
settings = {General = {Disable = "Handsfree,Headset";};}; settings = { General = { Disable = "Handsfree,Headset"; }; };
}; };
specialisation = { specialisation = {
in-china.configuration = { in-china.configuration = {
@ -77,13 +76,13 @@
}; };
xdg.portal = { xdg.portal = {
enable = true; enable = true;
extraPortals = with pkgs; [xdg-desktop-portal-gtk]; extraPortals = with pkgs; [ xdg-desktop-portal-gtk ];
config = {common.default = ["gtk"];}; config = { common.default = [ "gtk" ]; };
}; };
systemd.user.services.mpris-proxy = { systemd.user.services.mpris-proxy = {
description = "Mpris proxy"; description = "Mpris proxy";
after = ["network.target" "sound.target"]; after = [ "network.target" "sound.target" ];
wantedBy = ["default.target"]; wantedBy = [ "default.target" ];
serviceConfig.ExecStart = "${pkgs.bluez}/bin/mpris-proxy"; serviceConfig.ExecStart = "${pkgs.bluez}/bin/mpris-proxy";
}; };
programs = { programs = {
@ -96,13 +95,13 @@
true; # Open ports in the firewall for Source Dedicated Server true; # Open ports in the firewall for Source Dedicated Server
localNetworkGameTransfers.openFirewall = localNetworkGameTransfers.openFirewall =
true; # Open ports in the firewall for Steam Local Network Game Transfers true; # Open ports in the firewall for Steam Local Network Game Transfers
extraCompatPackages = with pkgs; [proton-ge-bin]; extraCompatPackages = with pkgs; [ proton-ge-bin ];
}; };
gamemode.enable = true; gamemode.enable = true;
}; };
boot = { boot = {
kernelPackages = pkgs.linuxPackages_zen; kernelPackages = pkgs.linuxPackages_zen;
supportedFilesystems = ["ntfs"]; supportedFilesystems = [ "ntfs" ];
}; };
documentation = { documentation = {
enable = true; enable = true;
@ -114,7 +113,7 @@
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
man-pages-posix man-pages-posix
man-pages man-pages
(pass-wayland.withExtensions (exts: [exts.pass-otp exts.pass-import])) (pass-wayland.withExtensions (exts: [ exts.pass-otp exts.pass-import ]))
gparted gparted
zed-editor zed-editor
libsForQt5.qt5.qtquickcontrols2 libsForQt5.qt5.qtquickcontrols2
@ -122,7 +121,7 @@
/* /*
(blender.override { (blender.override {
cudaSupport = true; cudaSupport = true;
}) })
*/ */
trash-cli trash-cli
#inputs.hyprswitch.packages.x86_64-linux.default #inputs.hyprswitch.packages.x86_64-linux.default
@ -154,28 +153,30 @@
# wrapperFeatures.gtk = true; # wrapperFeatures.gtk = true;
#}; #};
nixpkgs = { nixpkgs = {
overlays = []; overlays = [ ];
config = { config = {
allowUnfree = true; allowUnfree = true;
permittedInsecurePackages = ["dotnet-core-combined"]; permittedInsecurePackages = [ "dotnet-core-combined" ];
}; };
}; };
nix = let nix =
flakeInputs = lib.filterAttrs (_: lib.isType "flake") inputs; let
in { flakeInputs = lib.filterAttrs (_: lib.isType "flake") inputs;
settings = { in
experimental-features = "nix-command flakes"; {
# flake-registry = ""; settings = {
nix-path = config.nix.nixPath; experimental-features = "nix-command flakes";
# flake-registry = "";
nix-path = config.nix.nixPath;
};
extraOptions = ''
trusted-users = root stvnliu
'';
channel.enable = false;
registry = lib.mapAttrs (_: flake: { inherit flake; }) flakeInputs;
nixPath = lib.mapAttrsToList (n: _: "${n}=flake:${n}") flakeInputs;
}; };
extraOptions = ''
trusted-users = root stvnliu
'';
channel.enable = false;
registry = lib.mapAttrs (_: flake: {inherit flake;}) flakeInputs;
nixPath = lib.mapAttrsToList (n: _: "${n}=flake:${n}") flakeInputs;
};
systemd.network.wait-online.enable = false; systemd.network.wait-online.enable = false;
networking = { networking = {
@ -188,15 +189,15 @@
"${config.myUserName}" = { "${config.myUserName}" = {
initialPassword = "stevenpassword"; initialPassword = "stevenpassword";
isNormalUser = true; isNormalUser = true;
openssh.authorizedKeys.keys = []; openssh.authorizedKeys.keys = [ ];
packages = with pkgs; [nh]; packages = with pkgs; [ nh ];
extraGroups = ["wheel" "input" "networkmanager"]; extraGroups = [ "wheel" "input" "networkmanager" ];
}; };
"xi_jinping" = { "xi_jinping" = {
initialPassword = "bingchilling"; initialPassword = "bingchilling";
isNormalUser = true; isNormalUser = true;
packages = with pkgs; [git]; packages = with pkgs; [ git ];
extraGroups = ["input"]; extraGroups = [ "input" ];
}; };
}; };
# https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion

9
nixos/custom-hosts.nix
View file

@ -1,8 +1,7 @@
{ { config
config, , lib
lib, , pkgs
pkgs, , ...
...
}: { }: {
networking.extraHosts = '' networking.extraHosts = ''
# home IP mapping # home IP mapping

2
nixos/fonts.nix
View file

@ -1,4 +1,4 @@
{pkgs, ...}: { { pkgs, ... }: {
fonts.packages = with pkgs; fonts.packages = with pkgs;
[ [
helvetica-neue-lt-std helvetica-neue-lt-std

15
nixos/greetd.nix
View file

@ -1,11 +1,12 @@
{ { pkgs
pkgs, , config
config, , lib
lib, , ...
... }:
}: let let
tuigreet = "${pkgs.greetd.tuigreet}/bin/tuigreet"; tuigreet = "${pkgs.greetd.tuigreet}/bin/tuigreet";
in { in
{
services.greetd = { services.greetd = {
enable = true; enable = true;
settings = { settings = {

23
nixos/hardware-configuration.nix
View file

@ -1,21 +1,20 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’ # Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ { config
config, , lib
lib, , pkgs
pkgs, , modulesPath
modulesPath, , ...
...
}: { }: {
imports = [ imports = [
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "usbhid"]; boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usbhid" ];
boot.initrd.kernelModules = []; boot.initrd.kernelModules = [ ];
boot.kernelModules = ["kvm-amd"]; boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = []; boot.extraModulePackages = [ ];
fileSystems."/" = { fileSystems."/" = {
device = "/dev/disk/by-uuid/f9ff609f-6e72-43cf-917c-3bd3fde6c410"; device = "/dev/disk/by-uuid/f9ff609f-6e72-43cf-917c-3bd3fde6c410";
@ -25,7 +24,7 @@
fileSystems."/boot" = { fileSystems."/boot" = {
device = "/dev/disk/by-uuid/2E4F-3060"; device = "/dev/disk/by-uuid/2E4F-3060";
fsType = "vfat"; fsType = "vfat";
options = ["fmask=0022" "dmask=0022"]; options = [ "fmask=0022" "dmask=0022" ];
}; };
fileSystems."/games" = { fileSystems."/games" = {
@ -33,7 +32,7 @@
fsType = "ext4"; fsType = "ext4";
}; };
swapDevices = []; swapDevices = [ ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # 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 # (the default) this is the recommended approach. When using systemd-networkd it's

9
nixos/ly.nix
View file

@ -1,9 +0,0 @@
{
pkgs,
config,
...
}: {
services.displayManager.ly = {
enable = true;
};
}

13
nixos/nvidia.nix
View file

@ -1,8 +1,7 @@
{ { config
config, , lib
lib, , pkgs
pkgs, , ...
...
}: { }: {
specialisation = { specialisation = {
powersave.configuration = { powersave.configuration = {
@ -15,14 +14,14 @@
}; };
}; };
}; };
boot.kernelModules = ["nvidia_uvm"]; boot.kernelModules = [ "nvidia_uvm" ];
hardware.graphics = { hardware.graphics = {
enable = true; enable = true;
extraPackages = with pkgs; [ extraPackages = with pkgs; [
libvdpau-va-gl libvdpau-va-gl
]; ];
}; };
services.xserver.videoDrivers = ["nvidia"]; services.xserver.videoDrivers = [ "nvidia" ];
hardware.nvidia = { hardware.nvidia = {
dynamicBoost.enable = true; dynamicBoost.enable = true;
prime = { prime = {

2
nixos/sddm-theme.nix
View file

@ -1,4 +1,4 @@
{pkgs, ...}: { pkgs, ... }:
pkgs.stdenv.mkDerivation { pkgs.stdenv.mkDerivation {
name = "sddm-theme"; name = "sddm-theme";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {

2
nixos/services/avahi.service.nix
View file

@ -1,4 +1,4 @@
{...}: { { ... }: {
services.avahi = { services.avahi = {
enable = true; enable = true;
nssmdns4 = true; nssmdns4 = true;

3
nixos/services/laptop.preset.nix
View file

@ -1,4 +1,4 @@
{...}: { { ... }: {
imports = [ imports = [
./nginx.service.nix ./nginx.service.nix
./pipewire.service.nix ./pipewire.service.nix
@ -10,5 +10,6 @@
./power_management.service.nix ./power_management.service.nix
./seatd.service.nix ./seatd.service.nix
./logind.service.nix ./logind.service.nix
#./mpd.service.nix
]; ];
} }

9
nixos/services/logind.service.nix
View file

@ -1,8 +1,7 @@
{ { pkgs
pkgs, , config
config, , lib
lib, , ...
...
}: { }: {
services.logind.extraConfig = '' services.logind.extraConfig = ''
# don't shutdown in short press # don't shutdown in short press

2
nixos/services/misc.service.nix
View file

@ -1,4 +1,4 @@
{...}: { { ... }: {
specialisation.powersave.configuration = { specialisation.powersave.configuration = {
services.auto-cpufreq.enable = true; services.auto-cpufreq.enable = true;
}; };

11
nixos/services/nginx.service.nix
View file

@ -1,7 +1,6 @@
{ { pkgs
pkgs, , config
config, , ...
...
}: { }: {
services.nginx = { services.nginx = {
enable = true; enable = true;
@ -15,8 +14,8 @@
''; '';
}; };
}; };
listenAddresses = ["127.0.0.1" "[::1]"]; listenAddresses = [ "127.0.0.1" "[::1]" ];
}; };
}; };
networking.firewall.allowedTCPPorts = [80]; networking.firewall.allowedTCPPorts = [ 80 ];
} }

58
nixos/services/pipewire.service.nix
View file

@ -1,4 +1,5 @@
{pkgs, ...}: let { pkgs, ... }:
let
pw_rnnoise_config = { pw_rnnoise_config = {
"context.modules" = [ "context.modules" = [
{ {
@ -13,11 +14,11 @@
"name" = "rnnoise"; "name" = "rnnoise";
"plugin" = "${pkgs.rnnoise-plugin}/lib/ladspa/librnnoise_ladspa.so"; "plugin" = "${pkgs.rnnoise-plugin}/lib/ladspa/librnnoise_ladspa.so";
"label" = "noise_suppressor_stereo"; "label" = "noise_suppressor_stereo";
"control" = {"VAD Threshold (%)" = 50.0;}; "control" = { "VAD Threshold (%)" = 50.0; };
} }
]; ];
}; };
"audio.position" = ["FL" "FR"]; "audio.position" = [ "FL" "FR" ];
"capture.props" = { "capture.props" = {
"node.name" = "effect_input.rnnoise"; "node.name" = "effect_input.rnnoise";
"node.passive" = true; "node.passive" = true;
@ -30,7 +31,8 @@
} }
]; ];
}; };
in { in
{
services.pipewire = { services.pipewire = {
enable = true; enable = true;
alsa = { alsa = {
@ -42,33 +44,33 @@ in {
wireplumber.configPackages = [ wireplumber.configPackages = [
(pkgs.writeTextDir (pkgs.writeTextDir
"share/wireplumber/wireplumber.conf.d/52-profile-switch.conf" '' "share/wireplumber/wireplumber.conf.d/52-profile-switch.conf" ''
wireplumber.settings = { wireplumber.settings = {
bluetooth.autoswitch-to-headset-profile = false bluetooth.autoswitch-to-headset-profile = false
} }
monitor.bluez.properties = { monitor.bluez.properties = {
## Supported roles: hsp_hs (HSP Headset), ## Supported roles: hsp_hs (HSP Headset),
## hsp_ag (HSP Audio Gateway), ## hsp_ag (HSP Audio Gateway),
## hfp_hf (HFP Hands-Free), ## hfp_hf (HFP Hands-Free),
## hfp_ag (HFP Audio Gateway) ## hfp_ag (HFP Audio Gateway)
## a2dp_sink (A2DP Audio Sink) ## a2dp_sink (A2DP Audio Sink)
## a2dp_source (A2DP Audio Source) ## a2dp_source (A2DP Audio Source)
## bap_sink (LE Audio Basic Audio Profile Sink) ## bap_sink (LE Audio Basic Audio Profile Sink)
## bap_source (LE Audio Basic Audio Profile Source) ## bap_source (LE Audio Basic Audio Profile Source)
## -- ## --
## Only enable A2DP here and disable HFP. See note at the top as to why. ## Only enable A2DP here and disable HFP. See note at the top as to why.
bluez5.roles = [ a2dp_sink a2dp_source ] bluez5.roles = [ a2dp_sink a2dp_source ]
} }
'') '')
(pkgs.writeTextDir (pkgs.writeTextDir
"share/wireplumber/bluetooth.lua.d/51-bluez-config.lua" '' "share/wireplumber/bluetooth.lua.d/51-bluez-config.lua" ''
bluez_monitor.properties = { bluez_monitor.properties = {
["bluez5.enable-sbc-xq"] = true, ["bluez5.enable-sbc-xq"] = true,
["bluez5.enable-msbc"] = true, ["bluez5.enable-msbc"] = true,
["bluez5.enable-hw-volume"] = true, ["bluez5.enable-hw-volume"] = true,
["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]" ["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]"
} }
'') '')
]; ];
#extraConfig.pipewire."99-input-denoising" = pw_rnnoise_config; #extraConfig.pipewire."99-input-denoising" = pw_rnnoise_config;
}; };

9
nixos/services/power_management.service.nix
View file

@ -1,8 +1,7 @@
{ { pkgs
pkgs, , config
config, , lib
lib, , ...
...
}: { }: {
services.tlp = { services.tlp = {
enable = true; enable = true;

4
nixos/services/printing.service.nix
View file

@ -1,6 +1,6 @@
{...}: { { ... }: {
services.printing = { services.printing = {
enable = true; enable = true;
drivers = []; drivers = [ ];
}; };
} }

9
nixos/services/seatd.service.nix
View file

@ -1,8 +1,7 @@
{ { pkgs
pkgs, , config
config, , lib
lib, , ...
...
}: { }: {
services.seatd = { services.seatd = {
enable = true; enable = true;

13
nixos/services/syncthing.service.nix
View file

@ -1,8 +1,7 @@
{ { pkgs
pkgs, , config
config, , lib
lib, , ...
...
}: { }: {
services = { services = {
syncthing = { syncthing = {
@ -12,6 +11,6 @@
configDir = "/home/${config.myUserName}/.config/syncthing"; configDir = "/home/${config.myUserName}/.config/syncthing";
}; };
}; };
networking.firewall.allowedTCPPorts = [8384 22000]; networking.firewall.allowedTCPPorts = [ 8384 22000 ];
networking.firewall.allowedUDPPorts = [22000 21027]; networking.firewall.allowedUDPPorts = [ 22000 21027 ];
} }

7
nixos/services/tailscale.service.nix
View file

@ -1,7 +1,6 @@
{ { pkgs
pkgs, , config
config, , ...
...
}: { }: {
services.tailscale = { services.tailscale = {
enable = true; enable = true;

11
nixos/virtualisation.nix
View file

@ -1,8 +1,7 @@
{ { pkgs
pkgs, , lib
lib, , config
config, , ...
...
}: { }: {
virtualisation = { virtualisation = {
libvirtd.enable = true; libvirtd.enable = true;
@ -13,5 +12,5 @@
#virtualisation.virtualbox.host = { #virtualisation.virtualbox.host = {
# enable = true; # enable = true;
#}; #};
users.users."${config.myUserName}".extraGroups = ["libvirtd"]; users.users."${config.myUserName}".extraGroups = [ "libvirtd" ];
} }