diff options
Diffstat (limited to 'system')
54 files changed, 261 insertions, 308 deletions
diff --git a/system/mba.nix b/system/mba.nix index d2452c4a..41059124 100644 --- a/system/mba.nix +++ b/system/mba.nix @@ -1,7 +1,6 @@ -{ - config, - pkgs, - ... +{ config +, pkgs +, ... }: { imports = [ ./settings/darwin.nix diff --git a/system/prefect.nix b/system/prefect.nix index 7891110a..ea65197a 100644 --- a/system/prefect.nix +++ b/system/prefect.nix @@ -1,10 +1,9 @@ -{ - config, - pkgs, - nixpkgs, - nixpkgs-unstable, - nixos-hardware, - ... +{ config +, pkgs +, nixpkgs +, nixpkgs-unstable +, nixos-hardware +, ... }: { imports = [ (nixos-hardware + "/common/pc/ssd") @@ -61,15 +60,15 @@ zenpower ]; - boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usbhid" "sd_mod"]; - boot.initrd.kernelModules = []; - boot.kernelModules = ["kvm-amd"]; + boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; fileSystems = { "/" = { device = "/dev/disk/by-partlabel/nixos-root"; fsType = "f2fs"; - options = ["atgc" "gc_merge" "lazytime" "nodiscard"]; + options = [ "atgc" "gc_merge" "lazytime" "nodiscard" ]; }; "/boot" = { @@ -80,25 +79,25 @@ "/home" = { device = "/dev/disk/by-partlabel/home"; fsType = "ext4"; - options = ["lazytime" "nodiscard"]; + options = [ "lazytime" "nodiscard" ]; }; "/mnt/data" = { device = "/dev/disk/by-partlabel/data"; fsType = "ntfs3"; - options = ["uid=1000" "gid=100" "x-systemd-automount" "nofail"]; + options = [ "uid=1000" "gid=100" "x-systemd-automount" "nofail" ]; }; "/mnt/games" = { device = "/dev/disk/by-partlabel/games"; fsType = "ntfs3"; - options = ["uid=1000" "gid=100" "x-systemd-automount" "nofail"]; + options = [ "uid=1000" "gid=100" "x-systemd-automount" "nofail" ]; }; "/mnt/windows" = { device = "/dev/disk/by-partlabel/windows"; fsType = "ntfs3"; - options = ["x-systemd-automount" "nofail"]; + options = [ "x-systemd-automount" "nofail" ]; }; }; diff --git a/system/satoshipad.nix b/system/satoshipad.nix index 626f5900..d3f4c1a0 100644 --- a/system/satoshipad.nix +++ b/system/satoshipad.nix @@ -1,7 +1,6 @@ -{ - config, - pkgs, - ... +{ config +, pkgs +, ... }: { imports = [ ./hardware-configuration.nix diff --git a/system/settings/base.nix b/system/settings/base.nix index 1fa61d09..92cbb5bd 100644 --- a/system/settings/base.nix +++ b/system/settings/base.nix @@ -1,8 +1,7 @@ -{ - config, - pkgs, - lib, - ... +{ config +, pkgs +, lib +, ... }: { boot.loader.timeout = lib.mkDefault 1; services.irqbalance.enable = true; diff --git a/system/settings/configuration/berlin.nix b/system/settings/configuration/berlin.nix index bc8ed1fd..bdccea09 100644 --- a/system/settings/configuration/berlin.nix +++ b/system/settings/configuration/berlin.nix @@ -1,7 +1,6 @@ -{ - config, - pkgs, - ... +{ config +, pkgs +, ... }: { time.timeZone = "Europe/Berlin"; location = { diff --git a/system/settings/configuration/british-english.nix b/system/settings/configuration/british-english.nix index 4167016f..1ab51cb0 100644 --- a/system/settings/configuration/british-english.nix +++ b/system/settings/configuration/british-english.nix @@ -1,7 +1,6 @@ -{ - config, - pkgs, - ... +{ config +, pkgs +, ... }: { i18n.defaultLocale = "en_GB.UTF-8"; } diff --git a/system/settings/configuration/england.nix b/system/settings/configuration/england.nix index 2213ac74..1323b292 100644 --- a/system/settings/configuration/england.nix +++ b/system/settings/configuration/england.nix @@ -1,7 +1,6 @@ -{ - config, - pkgs, - ... +{ config +, pkgs +, ... }: { time.timeZone = "Europe/London"; services.redshift = { diff --git a/system/settings/configuration/networking.nix b/system/settings/configuration/networking.nix index 8d9f276f..ad4200b1 100644 --- a/system/settings/configuration/networking.nix +++ b/system/settings/configuration/networking.nix @@ -1,9 +1,8 @@ -{ - config, - pkgs, - ... +{ config +, pkgs +, ... }: { - environment.systemPackages = with pkgs; [lxqt.lxqt-policykit]; # provides a default authentification client for policykit + environment.systemPackages = with pkgs; [ lxqt.lxqt-policykit ]; # provides a default authentification client for policykit services.gvfs.enable = true; # enables gvfs imports = [ diff --git a/system/settings/configuration/nix.nix b/system/settings/configuration/nix.nix index 7ae8f7f6..583f7982 100644 --- a/system/settings/configuration/nix.nix +++ b/system/settings/configuration/nix.nix @@ -1,13 +1,12 @@ -{ - config, - pkgs, - ... +{ config +, pkgs +, ... }: { nix = { settings = { cores = 0; auto-optimise-store = true; - trusted-users = ["@wheel"]; + trusted-users = [ "@wheel" ]; }; daemonCPUSchedPolicy = "idle"; @@ -27,7 +26,7 @@ system.autoUpgrade = { enable = true; - flags = ["--max-jobs" "2"]; + flags = [ "--max-jobs" "2" ]; }; systemd.services.nixos-upgrade = { script = pkgs.lib.mkForce '' diff --git a/system/settings/configuration/user.nix b/system/settings/configuration/user.nix index ccb43323..482ddf91 100644 --- a/system/settings/configuration/user.nix +++ b/system/settings/configuration/user.nix @@ -1,12 +1,11 @@ -{ - config, - pkgs, - ... +{ config +, pkgs +, ... }: { users.extraUsers.alan = { description = "Alan Pearce"; isNormalUser = true; - extraGroups = ["audio" "wheel" "lp" "adbusers" "docker" "nitrokey" "dialout" "pipewire" "networkmanager" "video"]; + extraGroups = [ "audio" "wheel" "lp" "adbusers" "docker" "nitrokey" "dialout" "pipewire" "networkmanager" "video" ]; shell = "/run/current-system/sw/bin/zsh"; initialPassword = "password"; home = "/home/alan"; diff --git a/system/settings/darwin.nix b/system/settings/darwin.nix index 1d64ff3b..ed890f13 100644 --- a/system/settings/darwin.nix +++ b/system/settings/darwin.nix @@ -1,8 +1,7 @@ -{ - config, - pkgs, - lib, - ... +{ config +, pkgs +, lib +, ... }: { services.nix-daemon = { enable = true; diff --git a/system/settings/gaming.nix b/system/settings/gaming.nix index b00aadb7..c112bb1d 100644 --- a/system/settings/gaming.nix +++ b/system/settings/gaming.nix @@ -1,7 +1,6 @@ -{ - config, - pkgs, - ... +{ config +, pkgs +, ... }: { security.rtkit.enable = true; programs.steam.enable = true; @@ -47,26 +46,26 @@ "rt.time.soft" = 200000; "rt.time.hard" = 200000; }; - flags = ["ifexists" "nofail"]; + flags = [ "ifexists" "nofail" ]; } - {name = "libpipewire-module-protocol-native";} - {name = "libpipewire-module-profiler";} - {name = "libpipewire-module-metadata";} - {name = "libpipewire-module-spa-device-factory";} - {name = "libpipewire-module-spa-node-factory";} - {name = "libpipewire-module-client-node";} - {name = "libpipewire-module-client-device";} + { name = "libpipewire-module-protocol-native"; } + { name = "libpipewire-module-profiler"; } + { name = "libpipewire-module-metadata"; } + { name = "libpipewire-module-spa-device-factory"; } + { name = "libpipewire-module-spa-node-factory"; } + { name = "libpipewire-module-client-node"; } + { name = "libpipewire-module-client-device"; } { name = "libpipewire-module-portal"; - flags = ["ifexists" "nofail"]; + flags = [ "ifexists" "nofail" ]; } { name = "libpipewire-module-access"; - args = {}; + args = { }; } - {name = "libpipewire-module-adapter";} - {name = "libpipewire-module-link-factory";} - {name = "libpipewire-module-session-manager";} + { name = "libpipewire-module-adapter"; } + { name = "libpipewire-module-link-factory"; } + { name = "libpipewire-module-session-manager"; } ]; "stream.properties" = { "node.latency" = "32/44100"; diff --git a/system/settings/hardware/adb.nix b/system/settings/hardware/adb.nix index be151695..d7025d7e 100644 --- a/system/settings/hardware/adb.nix +++ b/system/settings/hardware/adb.nix @@ -1,12 +1,11 @@ -{ - config, - pkgs, - ... +{ config +, pkgs +, ... }: { programs.adb.enable = true; - users.groups.adbusers = {}; + users.groups.adbusers = { }; services.udev = { - packages = [pkgs.android-udev-rules]; + packages = [ pkgs.android-udev-rules ]; }; } diff --git a/system/settings/hardware/audio.nix b/system/settings/hardware/audio.nix index 823edaeb..57055942 100644 --- a/system/settings/hardware/audio.nix +++ b/system/settings/hardware/audio.nix @@ -1,7 +1,6 @@ -{ - config, - pkgs, - ... +{ config +, pkgs +, ... }: { services.pipewire = { enable = true; diff --git a/system/settings/hardware/bare-metal.nix b/system/settings/hardware/bare-metal.nix index 0b8ce6d2..bd528fda 100644 --- a/system/settings/hardware/bare-metal.nix +++ b/system/settings/hardware/bare-metal.nix @@ -1,7 +1,6 @@ -{ - config, - pkgs, - ... +{ config +, pkgs +, ... }: { environment.systemPackages = with pkgs; [ exfat @@ -31,7 +30,7 @@ ACTION=="add|change", KERNEL=="sd[a-z]", ATTR{queue/rotational}=="1", ATTR{queue/scheduler}="bfq" ''; - boot.kernelModules = ["tcp_bbr"]; + boot.kernelModules = [ "tcp_bbr" ]; boot.kernel.sysctl = { "net.core.default_qdisc" = "cake"; "net.ipv4.tcp_allowed_congestion_control" = "bbr illinois reno lp"; @@ -47,6 +46,6 @@ }; boot.tmpOnTmpfs = true; - fileSystems."/".options = ["noatime" "nodiratime"]; - fileSystems."/home".options = ["noatime" "nodiratime"]; + fileSystems."/".options = [ "noatime" "nodiratime" ]; + fileSystems."/home".options = [ "noatime" "nodiratime" ]; } diff --git a/system/settings/hardware/bluetooth-audio.nix b/system/settings/hardware/bluetooth-audio.nix index 26e3ca70..d368cb29 100644 --- a/system/settings/hardware/bluetooth-audio.nix +++ b/system/settings/hardware/bluetooth-audio.nix @@ -1,7 +1,6 @@ -{ - config, - pkgs, - ... +{ config +, pkgs +, ... }: { hardware = { bluetooth = { diff --git a/system/settings/hardware/bluetooth.nix b/system/settings/hardware/bluetooth.nix index 54a1792a..b92cd881 100644 --- a/system/settings/hardware/bluetooth.nix +++ b/system/settings/hardware/bluetooth.nix @@ -1,8 +1,7 @@ -{ - config, - pkgs, - lib, - ... +{ config +, pkgs +, lib +, ... }: { hardware = { bluetooth = { diff --git a/system/settings/hardware/connman.nix b/system/settings/hardware/connman.nix index e8e04244..5e8d0227 100644 --- a/system/settings/hardware/connman.nix +++ b/system/settings/hardware/connman.nix @@ -1,12 +1,11 @@ -{ - config, - pkgs, - ... +{ config +, pkgs +, ... }: { services.connman = { enable = true; enableVPN = false; - extraFlags = ["--nodnsproxy"]; + extraFlags = [ "--nodnsproxy" ]; }; networking.useDHCP = false; diff --git a/system/settings/hardware/grub2.nix b/system/settings/hardware/grub2.nix index a020baa7..7b4b2e39 100644 --- a/system/settings/hardware/grub2.nix +++ b/system/settings/hardware/grub2.nix @@ -1,8 +1,7 @@ -{ - config, - pkgs, - lib, - ... +{ config +, pkgs +, lib +, ... }: { boot.loader = { grub = { diff --git a/system/settings/hardware/intel-gpu.nix b/system/settings/hardware/intel-gpu.nix index c606de79..494cb86e 100644 --- a/system/settings/hardware/intel-gpu.nix +++ b/system/settings/hardware/intel-gpu.nix @@ -1,7 +1,6 @@ -{ - config, - pkgs, - ... +{ config +, pkgs +, ... }: { # https://wiki.gentoo.org/wiki/Intel#Feature_support services.xserver = { @@ -9,7 +8,7 @@ deviceSection = '' Option "DRI" "3" ''; - videoDrivers = ["intel"]; + videoDrivers = [ "intel" ]; }; boot.kernelParams = [ diff --git a/system/settings/hardware/iwd.nix b/system/settings/hardware/iwd.nix index c0090f26..45d0ffdb 100644 --- a/system/settings/hardware/iwd.nix +++ b/system/settings/hardware/iwd.nix @@ -1,12 +1,11 @@ -{ - config, - pkgs, - ... +{ config +, pkgs +, ... }: { networking.wireless.iwd = { enable = true; }; - users.users.alan.extraGroups = ["network"]; + users.users.alan.extraGroups = [ "network" ]; services.connman.wifi.backend = "iwd"; } diff --git a/system/settings/hardware/keyboard.nix b/system/settings/hardware/keyboard.nix index 6e06618f..20030760 100644 --- a/system/settings/hardware/keyboard.nix +++ b/system/settings/hardware/keyboard.nix @@ -1,7 +1,6 @@ -{ - config, - pkgs, - ... +{ config +, pkgs +, ... }: { services.xserver = { layout = "us,de"; diff --git a/system/settings/hardware/keyboardio-model01.nix b/system/settings/hardware/keyboardio-model01.nix index c10533bd..450ae6d0 100644 --- a/system/settings/hardware/keyboardio-model01.nix +++ b/system/settings/hardware/keyboardio-model01.nix @@ -1,7 +1,6 @@ -{ - config, - pkgs, - ... +{ config +, pkgs +, ... }: { services.udev.extraRules = '' SUBSYSTEMS=="usb", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="2300", SYMLINK+="model01", ENV{ID_MM_DEVICE_IGNORE}:="1", ENV{ID_MM_CANDIDATE}:="0" diff --git a/system/settings/hardware/laptop.nix b/system/settings/hardware/laptop.nix index 32479ad1..bd66fb8f 100644 --- a/system/settings/hardware/laptop.nix +++ b/system/settings/hardware/laptop.nix @@ -1,8 +1,7 @@ -{ - config, - pkgs, - lib, - ... +{ config +, pkgs +, lib +, ... }: { imports = [ ./bluetooth.nix @@ -13,7 +12,7 @@ ../user-interface.nix ]; - boot.kernelModules = ["coretemp"]; + boot.kernelModules = [ "coretemp" ]; environment.systemPackages = with pkgs; [ powerstat @@ -29,7 +28,7 @@ enable = true; defaultTarget = "common"; }; - systemd.services.autorandr.wantedBy = ["graphical.target"]; + systemd.services.autorandr.wantedBy = [ "graphical.target" ]; environment.etc.autorandr = { enable = true; diff --git a/system/settings/hardware/mouse.nix b/system/settings/hardware/mouse.nix index 6104ea47..b74d17aa 100644 --- a/system/settings/hardware/mouse.nix +++ b/system/settings/hardware/mouse.nix @@ -1,7 +1,6 @@ -{ - config, - pkgs, - ... +{ config +, pkgs +, ... }: { services.xserver.libinput = { enable = true; diff --git a/system/settings/hardware/network-manager.nix b/system/settings/hardware/network-manager.nix index 22711b10..a27ca892 100644 --- a/system/settings/hardware/network-manager.nix +++ b/system/settings/hardware/network-manager.nix @@ -1,8 +1,7 @@ -{ - config, - lib, - pkgs, - ... +{ config +, lib +, pkgs +, ... }: { networking = { networkmanager = { diff --git a/system/settings/hardware/nitrokey.nix b/system/settings/hardware/nitrokey.nix index 58e62195..ae402b34 100644 --- a/system/settings/hardware/nitrokey.nix +++ b/system/settings/hardware/nitrokey.nix @@ -1,8 +1,7 @@ -{ - config, - pkgs, - lib, - ... +{ config +, pkgs +, lib +, ... }: { hardware.nitrokey = { enable = true; diff --git a/system/settings/hardware/nvidia-gpu.nix b/system/settings/hardware/nvidia-gpu.nix index 40c148ec..8aa3f104 100644 --- a/system/settings/hardware/nvidia-gpu.nix +++ b/system/settings/hardware/nvidia-gpu.nix @@ -1,15 +1,16 @@ -{ - config, - pkgs, - lib, - ... -}: let +{ config +, pkgs +, lib +, ... +}: +let nvidia_x11 = config.boot.kernelPackages.nvidia_x11; -in { - services.xserver.videoDrivers = ["nvidia"]; +in +{ + services.xserver.videoDrivers = [ "nvidia" ]; boot = { - blacklistedKernelModules = ["nouveau"]; - extraModulePackages = [nvidia_x11]; + blacklistedKernelModules = [ "nouveau" ]; + extraModulePackages = [ nvidia_x11 ]; }; environment.systemPackages = [ nvidia_x11 pkgs.nvidia-vaapi-driver ]; diff --git a/system/settings/hardware/nvme-root.nix b/system/settings/hardware/nvme-root.nix index 310a0482..90f5248a 100644 --- a/system/settings/hardware/nvme-root.nix +++ b/system/settings/hardware/nvme-root.nix @@ -1,7 +1,6 @@ -{ - config, - pkgs, - ... +{ config +, pkgs +, ... }: { - boot.kernelParams = ["elevator=none"]; + boot.kernelParams = [ "elevator=none" ]; } diff --git a/system/settings/hardware/personal-computer.nix b/system/settings/hardware/personal-computer.nix index e7160950..35824136 100644 --- a/system/settings/hardware/personal-computer.nix +++ b/system/settings/hardware/personal-computer.nix @@ -1,8 +1,7 @@ -{ - config, - pkgs, - lib, - ... +{ config +, pkgs +, lib +, ... }: { boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_zen; powerManagement.cpuFreqGovernor = "schedutil"; diff --git a/system/settings/hardware/printing.nix b/system/settings/hardware/printing.nix index 474b37b7..2cb3b62c 100644 --- a/system/settings/hardware/printing.nix +++ b/system/settings/hardware/printing.nix @@ -1,17 +1,16 @@ -{ - config, - pkgs, - lib, - ... +{ config +, pkgs +, lib +, ... }: { services.printing.enable = true; - systemd.services.cups.wantedBy = lib.mkForce []; - systemd.sockets.cups.wantedBy = ["sockets.target"]; - systemd.services.cups-browsed.wantedBy = lib.mkForce []; + systemd.services.cups.wantedBy = lib.mkForce [ ]; + systemd.sockets.cups.wantedBy = [ "sockets.target" ]; + systemd.services.cups-browsed.wantedBy = lib.mkForce [ ]; systemd.timers.cups-browsed = { description = "Delayed startup of CUPS Remote Printer Discovery"; - wantedBy = ["timers.target"]; + wantedBy = [ "timers.target" ]; timerConfig = { OnActiveSec = "2 min"; }; diff --git a/system/settings/hardware/systemd-boot.nix b/system/settings/hardware/systemd-boot.nix index e8c06527..9a94dcf8 100644 --- a/system/settings/hardware/systemd-boot.nix +++ b/system/settings/hardware/systemd-boot.nix @@ -1,7 +1,6 @@ -{ - config, - pkgs, - ... +{ config +, pkgs +, ... }: { boot.loader.systemd-boot = { enable = true; diff --git a/system/settings/hardware/thinkpad.nix b/system/settings/hardware/thinkpad.nix index 99d91263..649f626a 100644 --- a/system/settings/hardware/thinkpad.nix +++ b/system/settings/hardware/thinkpad.nix @@ -1,10 +1,9 @@ -{ - config, - pkgs, - ... +{ config +, pkgs +, ... }: { - boot.kernelModules = []; - boot.blacklistedKernelModules = ["thinkpad_ec"]; + boot.kernelModules = [ ]; + boot.blacklistedKernelModules = [ "thinkpad_ec" ]; boot.extraModulePackages = with config.boot.kernelPackages; [ acpi_call ]; diff --git a/system/settings/hardware/trackball.nix b/system/settings/hardware/trackball.nix index 7445c5bb..c2f7e68c 100644 --- a/system/settings/hardware/trackball.nix +++ b/system/settings/hardware/trackball.nix @@ -1,7 +1,6 @@ -{ - config, - pkgs, - ... +{ config +, pkgs +, ... }: { services.xserver.config = '' Section "InputClass" diff --git a/system/settings/hardware/trezor.nix b/system/settings/hardware/trezor.nix index e24fc92e..1004833a 100644 --- a/system/settings/hardware/trezor.nix +++ b/system/settings/hardware/trezor.nix @@ -1,14 +1,13 @@ -{ - config, - lib, - pkgs, - ... +{ config +, lib +, pkgs +, ... }: { services.trezord.enable = true; environment.systemPackages = with pkgs; [ gnupg pinentry - (python3.withPackages (ps: with ps; [trezor_agent wheel])) + (python3.withPackages (ps: with ps; [ trezor_agent wheel ])) trezor-suite ]; programs.gnupg.agent = { diff --git a/system/settings/kubernetes.nix b/system/settings/kubernetes.nix index 8c171fc5..e460e2f9 100644 --- a/system/settings/kubernetes.nix +++ b/system/settings/kubernetes.nix @@ -1,10 +1,9 @@ -{ - config, - pkgs, - ... +{ config +, pkgs +, ... }: { networking.bridges = { - cbr0.interfaces = []; + cbr0.interfaces = [ ]; }; networking.interfaces = { cbr0 = { @@ -16,7 +15,7 @@ ]; }; }; - services.kubernetes.roles = ["master" "node"]; + services.kubernetes.roles = [ "master" "node" ]; services.kubernetes.kubelet.extraOpts = "--fail-swap-on=false"; virtualisation.docker.extraOptions = '' --iptables=false --ip-masq=false -b cbr0 diff --git a/system/settings/machines/t470s.nix b/system/settings/machines/t470s.nix index c1a82912..5f1f4a1c 100644 --- a/system/settings/machines/t470s.nix +++ b/system/settings/machines/t470s.nix @@ -1,7 +1,6 @@ -{ - config, - pkgs, - ... +{ config +, pkgs +, ... }: { hardware.usbWwan.enable = false; # unused systemd.services.ModemManager.enable = false; diff --git a/system/settings/programs/barrier.nix b/system/settings/programs/barrier.nix index 788021d5..76e1b06b 100644 --- a/system/settings/programs/barrier.nix +++ b/system/settings/programs/barrier.nix @@ -1,11 +1,10 @@ -{ - config, - pkgs, - ... +{ config +, pkgs +, ... }: { environment.systemPackages = with pkgs; [ barrier ]; - networking.firewall.allowedTCPPorts = [24800]; + networking.firewall.allowedTCPPorts = [ 24800 ]; } diff --git a/system/settings/programs/base.nix b/system/settings/programs/base.nix index f09beb75..7f51271e 100644 --- a/system/settings/programs/base.nix +++ b/system/settings/programs/base.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: { +{ pkgs, ... }: { environment.systemPackages = with pkgs; [ cachix home-manager @@ -6,7 +6,7 @@ zstd ]; nix.settings = { - trusted-substituters = ["https://nix-community.cachix.org"]; - trusted-public-keys = ["nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="]; + trusted-substituters = [ "https://nix-community.cachix.org" ]; + trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" ]; }; } diff --git a/system/settings/programs/gnome.nix b/system/settings/programs/gnome.nix index 3ccac864..f9618009 100644 --- a/system/settings/programs/gnome.nix +++ b/system/settings/programs/gnome.nix @@ -1,8 +1,7 @@ -{ - config, - lib, - pkgs, - ... +{ config +, lib +, pkgs +, ... }: with lib; { services = { diff --git a/system/settings/programs/gnupg.nix b/system/settings/programs/gnupg.nix index 9899c23b..f17263c9 100644 --- a/system/settings/programs/gnupg.nix +++ b/system/settings/programs/gnupg.nix @@ -1,13 +1,12 @@ -{ - config, - pkgs, - lib, - ... +{ config +, pkgs +, lib +, ... }: { environment.systemPackages = with pkgs; [ gnupg pinentry - (python3.withPackages (ps: with ps; [trezor_agent wheel])) + (python3.withPackages (ps: with ps; [ trezor_agent wheel ])) ]; environment.variables.GNUPGHOME = "$HOME/.gnupg/trezor/"; } diff --git a/system/settings/programs/i3.nix b/system/settings/programs/i3.nix index 4cf4a82a..7d172659 100644 --- a/system/settings/programs/i3.nix +++ b/system/settings/programs/i3.nix @@ -1,7 +1,6 @@ -{ - config, - pkgs, - ... +{ config +, pkgs +, ... }: { services.xserver.windowManager = { i3 = { diff --git a/system/settings/programs/kde.nix b/system/settings/programs/kde.nix index 9d77eeb5..c67fcfc1 100644 --- a/system/settings/programs/kde.nix +++ b/system/settings/programs/kde.nix @@ -1,8 +1,7 @@ -{ - config, - lib, - pkgs, - ... +{ config +, lib +, pkgs +, ... }: with lib; { services = { diff --git a/system/settings/programs/shell.nix b/system/settings/programs/shell.nix index 6f4b793a..c0e50690 100644 --- a/system/settings/programs/shell.nix +++ b/system/settings/programs/shell.nix @@ -1,7 +1,6 @@ -{ - config, - pkgs, - ... +{ config +, pkgs +, ... }: { programs.zsh = { @@ -10,7 +9,7 @@ } // ( if pkgs.stdenv.isDarwin - then {} + then { } else { enableGlobalCompInit = false; } diff --git a/system/settings/programs/tor.nix b/system/settings/programs/tor.nix index 80e2fdf2..31521857 100644 --- a/system/settings/programs/tor.nix +++ b/system/settings/programs/tor.nix @@ -1,8 +1,7 @@ -{ - config, - pkgs, - lib, - ... +{ config +, pkgs +, lib +, ... }: { services.tor = { enable = true; @@ -17,10 +16,10 @@ enable = true; }; }; - systemd.services.tor.wantedBy = lib.mkForce []; + systemd.services.tor.wantedBy = lib.mkForce [ ]; systemd.timers.tor = { description = "Delayed startup of Tor"; - wantedBy = ["timers.target"]; + wantedBy = [ "timers.target" ]; timerConfig = { OnActiveSec = "1 min"; }; diff --git a/system/settings/programs/window-manager.nix b/system/settings/programs/window-manager.nix index bad60797..e22609fe 100644 --- a/system/settings/programs/window-manager.nix +++ b/system/settings/programs/window-manager.nix @@ -1,7 +1,6 @@ -{ - config, - pkgs, - ... +{ config +, pkgs +, ... }: { services.xserver = { desktopManager.xterm.enable = false; diff --git a/system/settings/satoshipay.nix b/system/settings/satoshipay.nix index 96c69711..2f520411 100644 --- a/system/settings/satoshipay.nix +++ b/system/settings/satoshipay.nix @@ -1,10 +1,10 @@ -{ - config, - pkgs, - fetchurl, - lib, - ... -}: let +{ config +, pkgs +, fetchurl +, lib +, ... +}: +let dockerConfig = { ipv6 = true; fixed-cidr-v6 = "fd69:2074:9fcd:b0fd::/64"; @@ -12,7 +12,8 @@ buildkit = true; }; }; -in { +in +{ virtualisation = { docker = { enable = true; diff --git a/system/settings/services/airplay-sink.nix b/system/settings/services/airplay-sink.nix index 4621706e..f03f7641 100644 --- a/system/settings/services/airplay-sink.nix +++ b/system/settings/services/airplay-sink.nix @@ -1,7 +1,6 @@ -{ - config, - pkgs, - ... +{ config +, pkgs +, ... }: { services.pipewire.systemWide = false; services.shairport-sync = { diff --git a/system/settings/services/samba.nix b/system/settings/services/samba.nix index 729a6756..ae6c6f5a 100644 --- a/system/settings/services/samba.nix +++ b/system/settings/services/samba.nix @@ -1,16 +1,17 @@ -{ - config, - pkgs, - ... -}: let +{ config +, pkgs +, ... +}: +let workgroup = "WORKGROUP"; -in { +in +{ services.samba-wsdd = { inherit workgroup; enable = true; }; - networking.firewall.allowedTCPPorts = [5357]; - networking.firewall.allowedUDPPorts = [3702]; + networking.firewall.allowedTCPPorts = [ 5357 ]; + networking.firewall.allowedUDPPorts = [ 3702 ]; services.samba = { enable = true; diff --git a/system/settings/services/syncthing.nix b/system/settings/services/syncthing.nix index b504bde3..3623b875 100644 --- a/system/settings/services/syncthing.nix +++ b/system/settings/services/syncthing.nix @@ -1,7 +1,6 @@ -{ - config, - pkgs, - ... +{ config +, pkgs +, ... }: { services.syncthing = { enable = true; diff --git a/system/settings/services/virtualisation.nix b/system/settings/services/virtualisation.nix index 8056387c..dbe041c7 100644 --- a/system/settings/services/virtualisation.nix +++ b/system/settings/services/virtualisation.nix @@ -1,7 +1,6 @@ -{ - config, - pkgs, - ... +{ config +, pkgs +, ... }: { virtualisation.libvirtd = { enable = true; diff --git a/system/settings/services/xserver.nix b/system/settings/services/xserver.nix index 7e2a7c49..7ce0dbb2 100644 --- a/system/settings/services/xserver.nix +++ b/system/settings/services/xserver.nix @@ -1,8 +1,7 @@ -{ - config, - lib, - pkgs, - ... +{ config +, lib +, pkgs +, ... }: with lib; { services.xserver = { @@ -41,9 +40,9 @@ with lib; { }; useEmbeddedBitmaps = !config.fonts.fontconfig.antialias; defaultFonts = { - monospace = ["IBM Plex Mono"]; - sansSerif = ["Cantarell"]; - serif = ["Times New Roman"]; + monospace = [ "IBM Plex Mono" ]; + sansSerif = [ "Cantarell" ]; + serif = [ "Times New Roman" ]; }; localConf = '' diff --git a/system/settings/services/zeroconf.nix b/system/settings/services/zeroconf.nix index 6859cfd5..1412b1f0 100644 --- a/system/settings/services/zeroconf.nix +++ b/system/settings/services/zeroconf.nix @@ -1,8 +1,7 @@ -{ - config, - pkgs, - lib, - ... +{ config +, pkgs +, lib +, ... }: { services.avahi = { enable = true; @@ -16,10 +15,10 @@ workstation = true; }; }; - systemd.services.avahi-daemon.wantedBy = lib.mkForce []; + systemd.services.avahi-daemon.wantedBy = lib.mkForce [ ]; systemd.timers.avahi-daemon = { description = "Delayed startup of Avahi"; - wantedBy = ["timers.target"]; + wantedBy = [ "timers.target" ]; timerConfig = { OnActiveSec = "1 min"; }; diff --git a/system/settings/user-interface.nix b/system/settings/user-interface.nix index 577ecdc1..8dca1e10 100644 --- a/system/settings/user-interface.nix +++ b/system/settings/user-interface.nix @@ -1,14 +1,13 @@ -{ - config, - pkgs, - lib, - makeDesktopItem, - ... +{ config +, pkgs +, lib +, makeDesktopItem +, ... }: { documentation.info.enable = true; nixpkgs.config.firefox.enableOfficialBranding = true; - environment.pathsToLink = ["/share/zsh"]; + environment.pathsToLink = [ "/share/zsh" ]; environment.systemPackages = with pkgs; [ aria2 @@ -33,7 +32,7 @@ services.devmon.enable = true; systemd.user.services.trash-clean = { - path = with pkgs; [trash-cli]; + path = with pkgs; [ trash-cli ]; description = "Remove old files from FreeDesktop.org trash"; serviceConfig = { @@ -42,7 +41,7 @@ script = "trash-empty 30"; }; systemd.user.timers.trash-clean = { - wantedBy = ["default.target"]; + wantedBy = [ "default.target" ]; timerConfig = { OnCalendar = "weekly"; Persistent = true; |