From 3d6dd759c42a751723340b2683cbc35b71abac06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Thu, 10 Mar 2022 12:25:23 +0000 Subject: [PATCH] nixfmt --- flake.nix | 7 +- nixos/backups.nix | 6 +- nixos/boot.nix | 4 +- nixos/boxes/bolty/bolty-boot.nix | 33 +- nixos/boxes/bolty/default.nix | 6 +- nixos/boxes/bolty/i2p.nix | 3 +- nixos/boxes/bolty/matrix-server.nix | 35 +- nixos/boxes/bolty/nextcloud.nix | 3 +- nixos/boxes/bolty/print-server.nix | 6 +- nixos/boxes/bolty/prometheus-node.nix | 3 +- nixos/boxes/bolty/real-hardware.nix | 7 +- nixos/boxes/bolty/restic-server.nix | 3 +- nixos/boxes/bolty/tailscale-bolty.nix | 6 +- nixos/boxes/bootstrap/default.nix | 3 +- .../bootstrap/hardware-configuration.nix | 6 +- nixos/boxes/cli.nix | 3 +- nixos/boxes/foureighty/custom-kernel.nix | 12 +- nixos/boxes/foureighty/default.nix | 15 +- .../foureighty/hardware-configuration.nix | 9 +- nixos/boxes/foureighty/lte-modem.nix | 7 +- nixos/boxes/foureighty/nvidia.nix | 5 +- .../boxes/foureighty/tailscale-foureighty.nix | 6 +- nixos/boxes/macmini/default.nix | 5 +- nixos/boxes/rpi4-8/default.nix | 10 +- nixos/boxes/skinnyv/default.nix | 7 +- .../boxes/skinnyv/hardware-configuration.nix | 10 +- nixos/boxes/skinnyv/tailscale-skinnyv.nix | 6 +- nixos/boxes/thinky/default.nix | 7 +- nixos/boxes/thinky/hardware-configuration.nix | 9 +- nixos/boxes/thinky/tailscale-thinky.nix | 6 +- nixos/boxes/vm.nix | 10 +- nixos/boxes/vpsfree1/default.nix | 3 +- nixos/boxes/vpsfree1/tailscale-vpsfree1.nix | 6 +- nixos/boxes/vpsfree1/vpsfree1-vpsadminos.nix | 17 +- nixos/boxes/vultr1/default.nix | 3 +- nixos/boxes/vultr1/folding.nix | 12 +- nixos/boxes/vultr1/matrix-front.nix | 31 +- nixos/boxes/vultr1/nginx.nix | 3 +- nixos/boxes/vultr1/search.nix | 7 +- nixos/boxes/vultr1/snowflake.nix | 6 +- nixos/boxes/vultr1/tailscale-vultr1.nix | 6 +- nixos/boxes/vultr1/vultr-boot.nix | 28 +- nixos/common-services.nix | 7 +- nixos/email-accounts.nix | 21 +- nixos/enlightenment/home.nix | 7 +- nixos/enlightenment/system.nix | 3 +- nixos/gfx-intel.nix | 3 +- nixos/gfx-nvidia-optimus.nix | 3 +- nixos/git/default.nix | 9 +- nixos/git/home.nix | 19 +- nixos/gnome/default.nix | 13 +- nixos/gnome/home.nix | 12 +- nixos/gnome/system.nix | 3 +- nixos/gsconnect.nix | 13 +- nixos/gui/default.nix | 120 ++++--- nixos/gui/firejail.nix | 3 +- nixos/gui/vscode.nix | 300 +++++++++--------- nixos/home-manager/cli.nix | 11 +- nixos/home-manager/default.nix | 3 +- nixos/home-manager/linux.nix | 5 +- nixos/home-manager/programs/alacritty.nix | 7 +- nixos/home-manager/programs/emacs/default.nix | 9 +- nixos/home-manager/programs/emacs/emacs.nix | 25 +- nixos/home-manager/programs/emacs/home.nix | 3 +- nixos/home-manager/programs/genpass.nix | 6 +- nixos/home-manager/programs/tmux.nix | 3 +- nixos/home-manager/programs/zsh.nix | 3 +- nixos/home-manager/scripts.nix | 3 +- nixos/home-manager/scripts/download.nix | 5 +- nixos/home-manager/scripts/mount-vault.nix | 3 +- nixos/home-manager/scripts/umount-vault.nix | 5 +- nixos/home-other-os.nix | 14 +- nixos/i3/autorandr.nix | 16 +- nixos/i3/default.nix | 32 +- nixos/i3/grobi.nix | 3 +- nixos/i3/home.nix | 12 +- nixos/i3/i3-status.nix | 15 +- nixos/i3/kdeconnect.nix | 3 +- nixos/i3/polybar/polybar.nix | 13 +- nixos/i3/xidlehook.nix | 7 +- nixos/kde.nix | 3 +- nixos/libvirt.nix | 9 +- nixos/mercurial/default.nix | 9 +- nixos/mercurial/home.nix | 6 +- nixos/packages/decsync-evolution/default.nix | 12 +- nixos/packages/etesync-dav/default.nix | 22 +- nixos/quirks/thinkpad-cpu-throttling.nix | 15 +- nixos/security-kernel.nix | 3 +- nixos/security.nix | 10 +- nixos/server-security.nix | 7 +- nixos/shell-config.nix | 3 +- nixos/sway/default.nix | 40 ++- nixos/sway/keybindings.nix | 24 +- nixos/syncthing.nix | 6 +- nixos/tailscale.nix | 6 +- nixos/variables.nix | 3 +- nixos/virtualbox.nix | 3 +- nixos/wireguard.nix | 7 +- shell.nix | 9 +- 99 files changed, 584 insertions(+), 735 deletions(-) diff --git a/flake.nix b/flake.nix index 5d479a6d..7d041fcf 100644 --- a/flake.nix +++ b/flake.nix @@ -34,7 +34,8 @@ home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.users.cyryl = { - imports = [ ./nixos/home-manager ./nixos/home-manager/linux.nix ]; + imports = + [ ./nixos/home-manager ./nixos/home-manager/linux.nix ]; _module.args.inputs = inputs; }; } @@ -57,9 +58,7 @@ { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - home-manager.users.cyryl = { - imports = [ ./nixos/home-manager ]; - }; + home-manager.users.cyryl = { imports = [ ./nixos/home-manager ]; }; } ]; diff --git a/nixos/backups.nix b/nixos/backups.nix index 96d477e0..8ebf2a67 100644 --- a/nixos/backups.nix +++ b/nixos/backups.nix @@ -1,8 +1,8 @@ { config, pkgs, ... }: let - extraArgs = [ "--exclude='.cache'" "--exclude='.rustup'" "--exclude='.cargo'" ]; -in -{ + extraArgs = + [ "--exclude='.cache'" "--exclude='.rustup'" "--exclude='.cargo'" ]; +in { services = { restic.backups.home-to-bolty = { diff --git a/nixos/boot.nix b/nixos/boot.nix index be30d62c..28f4efbc 100644 --- a/nixos/boot.nix +++ b/nixos/boot.nix @@ -1,5 +1,4 @@ -{ config, pkgs, ... }: -{ +{ config, pkgs, ... }: { fileSystems."/".options = [ "noatime" "nodiratime" "discard" ]; boot = { @@ -12,6 +11,5 @@ }; }; - } diff --git a/nixos/boxes/bolty/bolty-boot.nix b/nixos/boxes/bolty/bolty-boot.nix index a1007e40..ca3de5ea 100644 --- a/nixos/boxes/bolty/bolty-boot.nix +++ b/nixos/boxes/bolty/bolty-boot.nix @@ -1,9 +1,9 @@ -{ config, pkgs, ... }: -{ +{ config, pkgs, ... }: { boot = { kernelPackages = pkgs.linuxPackages_latest; - initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sdhci_acpi" ]; + initrd.availableKernelModules = + [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sdhci_acpi" ]; initrd.kernelModules = [ "dm-snapshot" ]; kernelModules = [ "kvm-amd" ]; extraModulePackages = [ ]; @@ -15,20 +15,25 @@ fileSystems."/data" = { device = "/dev/disk/by-uuid/78e8e5b5-9068-4381-8e85-b4297607f9ea"; fsType = "btrfs"; - options = [ "autodefrag" "space_cache" "inode_cache" "noatime" "nodiratime" "compress=zstd" ]; + options = [ + "autodefrag" + "space_cache" + "inode_cache" + "noatime" + "nodiratime" + "compress=zstd" + ]; }; - fileSystems."/" = - { - device = "/dev/disk/by-uuid/28afab71-ff3d-4f1a-b7e4-2129572706dd"; - fsType = "btrfs"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/28afab71-ff3d-4f1a-b7e4-2129572706dd"; + fsType = "btrfs"; + }; - fileSystems."/boot" = - { - device = "/dev/disk/by-uuid/5BFB-9E6B"; - fsType = "vfat"; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/5BFB-9E6B"; + fsType = "vfat"; + }; swapDevices = [ ]; diff --git a/nixos/boxes/bolty/default.nix b/nixos/boxes/bolty/default.nix index cabb308a..ca40971f 100644 --- a/nixos/boxes/bolty/default.nix +++ b/nixos/boxes/bolty/default.nix @@ -1,5 +1,4 @@ -{ config, pkgs, inputs, lib, ... }: -{ +{ config, pkgs, inputs, lib, ... }: { imports = [ ./bolty-boot.nix ./real-hardware.nix @@ -16,7 +15,8 @@ enable = true; dataDir = "/data/syncthing"; openDefaultPorts = true; - package = inputs.nixpkgs-nixos-unstable.legacyPackages."x86_64-linux".syncthing; + package = + inputs.nixpkgs-nixos-unstable.legacyPackages."x86_64-linux".syncthing; }; boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; networking = { diff --git a/nixos/boxes/bolty/i2p.nix b/nixos/boxes/bolty/i2p.nix index 6d4eed31..5ab91a3b 100644 --- a/nixos/boxes/bolty/i2p.nix +++ b/nixos/boxes/bolty/i2p.nix @@ -1,5 +1,4 @@ -{ config, pkgs, ... }: -{ +{ config, pkgs, ... }: { services.i2pd = { enable = true; bandwidth = 1024; # kb/s diff --git a/nixos/boxes/bolty/matrix-server.nix b/nixos/boxes/bolty/matrix-server.nix index f7c12db6..ca443e5c 100644 --- a/nixos/boxes/bolty/matrix-server.nix +++ b/nixos/boxes/bolty/matrix-server.nix @@ -1,5 +1,4 @@ -{ config, pkgs, inputs, ... }: -{ +{ config, pkgs, inputs, ... }: { services.postgresql = { enable = true; initialScript = pkgs.writeText "synapse-init.sql" '' @@ -15,27 +14,23 @@ enable = true; server_name = "cyplo.dev"; enable_registration = false; - listeners = [ - { - port = 8008; - bind_address = "bolty.cyplo.github.beta.tailscale.net"; - type = "http"; - tls = false; - x_forwarded = true; - resources = [ - { - names = [ "client" "federation" ]; - compress = false; - } - ]; - } - ]; - app_service_config_files = [ - ]; + listeners = [{ + port = 8008; + bind_address = "bolty.cyplo.github.beta.tailscale.net"; + type = "http"; + tls = false; + x_forwarded = true; + resources = [{ + names = [ "client" "federation" ]; + compress = false; + }]; + }]; + app_service_config_files = [ ]; extraConfig = '' experimental_features: { spaces_enabled: true } ''; - package = inputs.nixpkgs-nixos-unstable.legacyPackages."x86_64-linux".matrix-synapse; + package = + inputs.nixpkgs-nixos-unstable.legacyPackages."x86_64-linux".matrix-synapse; }; networking.firewall.allowedTCPPorts = [ 8008 ]; diff --git a/nixos/boxes/bolty/nextcloud.nix b/nixos/boxes/bolty/nextcloud.nix index 1e29e4c0..9c2963df 100644 --- a/nixos/boxes/bolty/nextcloud.nix +++ b/nixos/boxes/bolty/nextcloud.nix @@ -1,5 +1,4 @@ -{ config, pkgs, ... }: -{ +{ config, pkgs, ... }: { networking.firewall.allowedTCPPorts = [ 80 ]; services.nextcloud = { diff --git a/nixos/boxes/bolty/print-server.nix b/nixos/boxes/bolty/print-server.nix index 1e959c89..a3b3abb5 100644 --- a/nixos/boxes/bolty/print-server.nix +++ b/nixos/boxes/bolty/print-server.nix @@ -1,5 +1,4 @@ -{ config, pkgs, lib, ... }: -{ +{ config, pkgs, lib, ... }: { networking.firewall.enable = true; networking.firewall.allowedTCPPorts = [ 631 6566 ]; @@ -21,7 +20,8 @@ description = "Epson XP-540"; location = "connected to bolty"; name = "epson_xp540"; - deviceUri = "usb://EPSON/XP-540%20Series?serial=583245393030303936&interface=1"; + deviceUri = + "usb://EPSON/XP-540%20Series?serial=583245393030303936&interface=1"; model = "raw"; ppdOptions = { PageSize = "A4"; }; }]; diff --git a/nixos/boxes/bolty/prometheus-node.nix b/nixos/boxes/bolty/prometheus-node.nix index 64d400a1..715063f3 100644 --- a/nixos/boxes/bolty/prometheus-node.nix +++ b/nixos/boxes/bolty/prometheus-node.nix @@ -1,5 +1,4 @@ -{ config, pkgs, lib, ... }: -{ +{ config, pkgs, lib, ... }: { networking.firewall.allowedTCPPorts = [ 9100 ]; services.prometheus = { enable = true; diff --git a/nixos/boxes/bolty/real-hardware.nix b/nixos/boxes/bolty/real-hardware.nix index 7f9b7394..4d318aa4 100644 --- a/nixos/boxes/bolty/real-hardware.nix +++ b/nixos/boxes/bolty/real-hardware.nix @@ -1,11 +1,8 @@ -{ config, pkgs, lib, ... }: -{ +{ config, pkgs, lib, ... }: { hardware.enableRedistributableFirmware = true; services.smartd.enable = true; services.fstrim.enable = true; - environment.systemPackages = with pkgs; [ - smartmontools - ]; + environment.systemPackages = with pkgs; [ smartmontools ]; services.fwupd.enable = true; services.thermald.enable = true; services.haveged.enable = true; diff --git a/nixos/boxes/bolty/restic-server.nix b/nixos/boxes/bolty/restic-server.nix index c6163d70..1fe80f2b 100644 --- a/nixos/boxes/bolty/restic-server.nix +++ b/nixos/boxes/bolty/restic-server.nix @@ -1,5 +1,4 @@ -{ config, pkgs, ... }: -{ +{ config, pkgs, ... }: { environment.systemPackages = with pkgs; [ restic ]; networking.firewall.allowedTCPPorts = [ 8000 ]; services.restic.server = { diff --git a/nixos/boxes/bolty/tailscale-bolty.nix b/nixos/boxes/bolty/tailscale-bolty.nix index 424faa3c..b98b86c1 100644 --- a/nixos/boxes/bolty/tailscale-bolty.nix +++ b/nixos/boxes/bolty/tailscale-bolty.nix @@ -1,8 +1,8 @@ { config, pkgs, inputs, lib, ... }: let - tailscale = inputs.nixpkgs-nixos-unstable.legacyPackages."x86_64-linux".tailscale; -in -{ + tailscale = + inputs.nixpkgs-nixos-unstable.legacyPackages."x86_64-linux".tailscale; +in { systemd.services.tailscale-autoconnect = { description = "Automatic connection to Tailscale"; diff --git a/nixos/boxes/bootstrap/default.nix b/nixos/boxes/bootstrap/default.nix index 54ed3a60..5ea4de22 100644 --- a/nixos/boxes/bootstrap/default.nix +++ b/nixos/boxes/bootstrap/default.nix @@ -1,5 +1,4 @@ -{ config, pkgs, inputs, nixpkgs-nixos-unstable-and-unfree, ... }: -{ +{ config, pkgs, inputs, nixpkgs-nixos-unstable-and-unfree, ... }: { networking.hostName = "fixme"; imports = [ diff --git a/nixos/boxes/bootstrap/hardware-configuration.nix b/nixos/boxes/bootstrap/hardware-configuration.nix index ecd7b6aa..9e349d2c 100644 --- a/nixos/boxes/bootstrap/hardware-configuration.nix +++ b/nixos/boxes/bootstrap/hardware-configuration.nix @@ -1,11 +1,11 @@ -{ config, lib, pkgs, inputs, ... }: -{ +{ config, lib, pkgs, inputs, ... }: { boot = { kernelModules = [ "kvm-intel" ]; initrd = { kernelModules = [ "dm-snapshot" ]; - availableKernelModules = [ "xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; + availableKernelModules = + [ "xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; }; loader.efi.canTouchEfiVariables = true; diff --git a/nixos/boxes/cli.nix b/nixos/boxes/cli.nix index d5e79a60..bca9b50b 100644 --- a/nixos/boxes/cli.nix +++ b/nixos/boxes/cli.nix @@ -1,5 +1,4 @@ -{ config, pkgs, ... }: -{ +{ config, pkgs, ... }: { environment.systemPackages = with pkgs; [ vim tmux diff --git a/nixos/boxes/foureighty/custom-kernel.nix b/nixos/boxes/foureighty/custom-kernel.nix index 10f54f9c..6a931173 100644 --- a/nixos/boxes/foureighty/custom-kernel.nix +++ b/nixos/boxes/foureighty/custom-kernel.nix @@ -1,12 +1,12 @@ -{ config, pkgs, ... }: -{ +{ config, pkgs, ... }: { boot.kernelPackages = pkgs.linuxPackages_latest; nixpkgs.overlays = [ (self: super: { - buildLinux = x: super.buildLinux ({ - ignoreConfigErrors = true; - enableParallelBuilding = true; - } // x); + buildLinux = x: + super.buildLinux ({ + ignoreConfigErrors = true; + enableParallelBuilding = true; + } // x); }) ]; boot.kernelPatches = [{ diff --git a/nixos/boxes/foureighty/default.nix b/nixos/boxes/foureighty/default.nix index 2008e49c..44170375 100644 --- a/nixos/boxes/foureighty/default.nix +++ b/nixos/boxes/foureighty/default.nix @@ -1,5 +1,4 @@ -{ config, pkgs, inputs, lib, nixpkgs-nixos-unstable-and-unfree, ... }: -{ +{ config, pkgs, inputs, lib, nixpkgs-nixos-unstable-and-unfree, ... }: { networking.hostName = "foureighty"; imports = [ @@ -19,9 +18,7 @@ ../../tailscale.nix ]; - fileSystems."/" = { - options = [ "compress=zstd" ]; - }; + fileSystems."/" = { options = [ "compress=zstd" ]; }; boot.kernelPackages = pkgs.linuxPackages_latest; boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; @@ -43,14 +40,10 @@ powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; hardware.video.hidpi.enable = lib.mkDefault true; - services.fprintd = { - enable = true; - }; + services.fprintd = { enable = true; }; home-manager.users.cyryl = { ... }: { - imports = [ - ../../home-manager/programs/kitty.nix - ]; + imports = [ ../../home-manager/programs/kitty.nix ]; home.packages = [ inputs.nixpkgs-nixos-unstable.legacyPackages."x86_64-linux".bisq-desktop ]; diff --git a/nixos/boxes/foureighty/hardware-configuration.nix b/nixos/boxes/foureighty/hardware-configuration.nix index 2377cdaa..1a372641 100644 --- a/nixos/boxes/foureighty/hardware-configuration.nix +++ b/nixos/boxes/foureighty/hardware-configuration.nix @@ -1,18 +1,19 @@ -{ config, lib, pkgs, inputs, ... }: -{ +{ config, lib, pkgs, inputs, ... }: { boot = { kernelModules = [ "kvm-intel" ]; initrd = { kernelModules = [ "dm-snapshot" ]; - availableKernelModules = [ "xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; + availableKernelModules = + [ "xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; }; loader.efi.canTouchEfiVariables = true; loader.systemd-boot.enable = true; }; - boot.initrd.luks.devices."crypt".device = "/dev/disk/by-uuid/c2deaeaa-cb76-4d29-a603-0cf42f6e829f"; + boot.initrd.luks.devices."crypt".device = + "/dev/disk/by-uuid/c2deaeaa-cb76-4d29-a603-0cf42f6e829f"; fileSystems."/boot" = { device = "/dev/disk/by-uuid/FC06-82E6"; diff --git a/nixos/boxes/foureighty/lte-modem.nix b/nixos/boxes/foureighty/lte-modem.nix index 20dbc8e7..a95fa593 100644 --- a/nixos/boxes/foureighty/lte-modem.nix +++ b/nixos/boxes/foureighty/lte-modem.nix @@ -1,8 +1,5 @@ -{ config, pkgs, ... }: -{ - environment.systemPackages = with pkgs; [ - libqmi - ]; +{ config, pkgs, ... }: { + environment.systemPackages = with pkgs; [ libqmi ]; boot.extraModulePackages = with pkgs; [ libqmi ]; boot.kernelModules = [ "qmi_wwan" "qcserial" ]; } diff --git a/nixos/boxes/foureighty/nvidia.nix b/nixos/boxes/foureighty/nvidia.nix index fe40822b..6ad7b0f3 100644 --- a/nixos/boxes/foureighty/nvidia.nix +++ b/nixos/boxes/foureighty/nvidia.nix @@ -8,7 +8,7 @@ let export __VK_LAYER_NV_optimus=NVIDIA_only exec -a "$0" "$@" ''; - whichgpu = pkgs.writeShellScriptBin "whichgpu" ''glxinfo | grep vendor''; + whichgpu = pkgs.writeShellScriptBin "whichgpu" "glxinfo | grep vendor"; nvidiaon = pkgs.writeShellScriptBin "nvidiaon" '' export __NV_PRIME_RENDER_OFFLOAD=1; export __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0; @@ -16,8 +16,7 @@ let export __VK_LAYER_NV_optimus=NVIDIA_only; glxinfo | grep vendor; echo OK!; ''; -in -{ +in { environment.systemPackages = [ nvidia-offload whichgpu nvidiaon ]; hardware.opengl.enable = true; hardware.opengl.driSupport32Bit = true; diff --git a/nixos/boxes/foureighty/tailscale-foureighty.nix b/nixos/boxes/foureighty/tailscale-foureighty.nix index 7c45105e..87df1d2f 100644 --- a/nixos/boxes/foureighty/tailscale-foureighty.nix +++ b/nixos/boxes/foureighty/tailscale-foureighty.nix @@ -1,8 +1,8 @@ { config, pkgs, inputs, lib, ... }: let - tailscale = inputs.nixpkgs-nixos-unstable.legacyPackages."x86_64-linux".tailscale; -in -{ + tailscale = + inputs.nixpkgs-nixos-unstable.legacyPackages."x86_64-linux".tailscale; +in { systemd.services.tailscale-autoconnect = { description = "Automatic connection to Tailscale"; diff --git a/nixos/boxes/macmini/default.nix b/nixos/boxes/macmini/default.nix index 776f434e..255124fc 100644 --- a/nixos/boxes/macmini/default.nix +++ b/nixos/boxes/macmini/default.nix @@ -1,10 +1,7 @@ { config, pkgs, inputs, lib, nixpkgs-nixos-unstable-and-unfree, ... }: { environment.systemPackages = with pkgs; [ vim nixfmt ]; - imports = [ - ../../git - ../../mercurial - ]; + imports = [ ../../git ../../mercurial ]; services.nix-daemon.enable = true; nix = { useDaemon = true; diff --git a/nixos/boxes/rpi4-8/default.nix b/nixos/boxes/rpi4-8/default.nix index 4308d7d1..7df76cc8 100644 --- a/nixos/boxes/rpi4-8/default.nix +++ b/nixos/boxes/rpi4-8/default.nix @@ -1,7 +1,5 @@ -{ config, pkgs, inputs, lib, ... }: -{ - imports = [ - ]; +{ config, pkgs, inputs, lib, ... }: { + imports = [ ]; boot = { kernelPackages = pkgs.linuxPackages_rpi4; tmpOnTmpfs = true; @@ -23,9 +21,7 @@ boot.loader.generic-extlinux-compatible.enable = true; networking = { hostName = "rpi4-8"; - networkmanager = { - enable = true; - }; + networkmanager = { enable = true; }; }; environment.systemPackages = with pkgs; [ neovim htop ]; diff --git a/nixos/boxes/skinnyv/default.nix b/nixos/boxes/skinnyv/default.nix index 15405253..97bbd4a1 100644 --- a/nixos/boxes/skinnyv/default.nix +++ b/nixos/boxes/skinnyv/default.nix @@ -1,5 +1,4 @@ -{ config, pkgs, ... }: -{ +{ config, pkgs, ... }: { networking.hostName = "skinnyv"; imports = [ @@ -23,9 +22,7 @@ services.thermald.enable = true; home-manager.users.cyryl = { ... }: { - imports = [ - ../../home-manager/programs/kitty.nix - ]; + imports = [ ../../home-manager/programs/kitty.nix ]; }; } diff --git a/nixos/boxes/skinnyv/hardware-configuration.nix b/nixos/boxes/skinnyv/hardware-configuration.nix index 6c79107b..5aaa644e 100644 --- a/nixos/boxes/skinnyv/hardware-configuration.nix +++ b/nixos/boxes/skinnyv/hardware-configuration.nix @@ -1,11 +1,10 @@ { 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" ]; + boot.initrd.availableKernelModules = + [ "xhci_pci" "ahci" "usb_storage" "sd_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; @@ -16,7 +15,8 @@ options = [ "compress=zstd" ]; }; - boot.initrd.luks.devices."crypt".device = "/dev/disk/by-uuid/0c192a18-178f-4598-a1ed-5295ef2abdc4"; + boot.initrd.luks.devices."crypt".device = + "/dev/disk/by-uuid/0c192a18-178f-4598-a1ed-5295ef2abdc4"; fileSystems."/boot" = { device = "/dev/disk/by-uuid/0A6A-AAFC"; diff --git a/nixos/boxes/skinnyv/tailscale-skinnyv.nix b/nixos/boxes/skinnyv/tailscale-skinnyv.nix index 989ed1f2..8f10fc80 100644 --- a/nixos/boxes/skinnyv/tailscale-skinnyv.nix +++ b/nixos/boxes/skinnyv/tailscale-skinnyv.nix @@ -1,8 +1,8 @@ { config, pkgs, inputs, lib, ... }: let - tailscale = inputs.nixpkgs-nixos-unstable.legacyPackages."x86_64-linux".tailscale; -in -{ + tailscale = + inputs.nixpkgs-nixos-unstable.legacyPackages."x86_64-linux".tailscale; +in { systemd.services.tailscale-autoconnect = { description = "Automatic connection to Tailscale"; diff --git a/nixos/boxes/thinky/default.nix b/nixos/boxes/thinky/default.nix index acdc7a63..1b5a065e 100644 --- a/nixos/boxes/thinky/default.nix +++ b/nixos/boxes/thinky/default.nix @@ -1,5 +1,4 @@ -{ config, pkgs, ... }: -{ +{ config, pkgs, ... }: { networking.hostName = "thinky"; imports = [ @@ -28,8 +27,6 @@ memoryPercent = 50; }; home-manager.users.cyryl = { ... }: { - imports = [ - ../../home-manager/programs/termite.nix - ]; + imports = [ ../../home-manager/programs/termite.nix ]; }; } diff --git a/nixos/boxes/thinky/hardware-configuration.nix b/nixos/boxes/thinky/hardware-configuration.nix index 53951e48..ffc88038 100644 --- a/nixos/boxes/thinky/hardware-configuration.nix +++ b/nixos/boxes/thinky/hardware-configuration.nix @@ -1,11 +1,11 @@ -{ config, lib, pkgs, inputs, ... }: -{ +{ config, lib, pkgs, inputs, ... }: { boot = { kernelModules = [ "kvm-intel" ]; initrd = { kernelModules = [ "dm-snapshot" ]; - availableKernelModules = [ "ata_generic" "uhci_hcd" "ehci_pci" "ahci" "usb_storage" "sd_mod" ]; + availableKernelModules = + [ "ata_generic" "uhci_hcd" "ehci_pci" "ahci" "usb_storage" "sd_mod" ]; }; loader.grub.enable = true; @@ -18,7 +18,8 @@ fsType = "btrfs"; }; - boot.initrd.luks.devices."crypt".device = "/dev/disk/by-uuid/8d51b38a-5d90-4a7a-a86a-0d57648fd82d"; + boot.initrd.luks.devices."crypt".device = + "/dev/disk/by-uuid/8d51b38a-5d90-4a7a-a86a-0d57648fd82d"; fileSystems."/boot" = { device = "/dev/disk/by-uuid/195b3f15-885e-4123-879f-6e4591a58317"; diff --git a/nixos/boxes/thinky/tailscale-thinky.nix b/nixos/boxes/thinky/tailscale-thinky.nix index 8848f04e..4478d96f 100644 --- a/nixos/boxes/thinky/tailscale-thinky.nix +++ b/nixos/boxes/thinky/tailscale-thinky.nix @@ -1,8 +1,8 @@ { config, pkgs, inputs, lib, ... }: let - tailscale = inputs.nixpkgs-nixos-unstable.legacyPackages."x86_64-linux".tailscale; -in -{ + tailscale = + inputs.nixpkgs-nixos-unstable.legacyPackages."x86_64-linux".tailscale; +in { systemd.services.tailscale-autoconnect = { description = "Automatic connection to Tailscale"; diff --git a/nixos/boxes/vm.nix b/nixos/boxes/vm.nix index 7bb8b97e..b5273e0c 100644 --- a/nixos/boxes/vm.nix +++ b/nixos/boxes/vm.nix @@ -1,5 +1,4 @@ -{ config, pkgs, lib, ... }: -{ +{ config, pkgs, lib, ... }: { time.timeZone = "Europe/London"; services.xserver.desktopManager.plasma5.enable = lib.mkForce false; @@ -8,9 +7,6 @@ virtualisation.virtualbox.guest.enable = true; virtualisation.virtualbox.guest.x11 = true; - - imports = [ - - ../common.nix - ]; + imports = + [ ../common.nix ]; } diff --git a/nixos/boxes/vpsfree1/default.nix b/nixos/boxes/vpsfree1/default.nix index d6942bd2..5cb139fa 100644 --- a/nixos/boxes/vpsfree1/default.nix +++ b/nixos/boxes/vpsfree1/default.nix @@ -1,5 +1,4 @@ -{ config, pkgs, inputs, lib, ... }: -{ +{ config, pkgs, inputs, lib, ... }: { networking.hostName = "vpsfree1"; imports = [ diff --git a/nixos/boxes/vpsfree1/tailscale-vpsfree1.nix b/nixos/boxes/vpsfree1/tailscale-vpsfree1.nix index 86545d2b..a95570b6 100644 --- a/nixos/boxes/vpsfree1/tailscale-vpsfree1.nix +++ b/nixos/boxes/vpsfree1/tailscale-vpsfree1.nix @@ -1,8 +1,8 @@ { config, pkgs, inputs, lib, ... }: let - tailscale = inputs.nixpkgs-nixos-unstable.legacyPackages."x86_64-linux".tailscale; -in -{ + tailscale = + inputs.nixpkgs-nixos-unstable.legacyPackages."x86_64-linux".tailscale; +in { systemd.services.tailscale-autoconnect = { description = "Automatic connection to Tailscale"; diff --git a/nixos/boxes/vpsfree1/vpsfree1-vpsadminos.nix b/nixos/boxes/vpsfree1/vpsfree1-vpsadminos.nix index cd8920e6..e8644750 100644 --- a/nixos/boxes/vpsfree1/vpsfree1-vpsadminos.nix +++ b/nixos/boxes/vpsfree1/vpsfree1-vpsadminos.nix @@ -8,20 +8,18 @@ { config, pkgs, lib, ... }: with lib; -let - nameservers = [ - "1.1.1.1" - "2606:4700:4700::1111" - ]; -in -{ +let nameservers = [ "1.1.1.1" "2606:4700:4700::1111" ]; +in { networking.nameservers = lib.mkDefault nameservers; services.resolved = lib.mkDefault { fallbackDns = nameservers; }; networking.dhcpcd.extraConfig = "noipv4ll"; systemd.services.systemd-sysctl.enable = false; systemd.sockets."systemd-journald-audit".enable = false; - systemd.mounts = [{ where = "/sys/kernel/debug"; enable = false; }]; + systemd.mounts = [{ + where = "/sys/kernel/debug"; + enable = false; + }]; systemd.services.systemd-udev-trigger.enable = false; systemd.services.rpc-gssd.enable = false; @@ -29,7 +27,8 @@ in boot.enableContainers = mkDefault true; boot.loader.initScript.enable = true; boot.specialFileSystems."/run/keys".fsType = lib.mkForce "tmpfs"; - boot.systemdExecutable = mkDefault "systemd systemd.unified_cgroup_hierarchy=0"; + boot.systemdExecutable = + mkDefault "systemd systemd.unified_cgroup_hierarchy=0"; # Overrides for documentation.enable = mkOverride 500 true; diff --git a/nixos/boxes/vultr1/default.nix b/nixos/boxes/vultr1/default.nix index 4ae3d0b5..46816591 100644 --- a/nixos/boxes/vultr1/default.nix +++ b/nixos/boxes/vultr1/default.nix @@ -1,5 +1,4 @@ -{ config, pkgs, inputs, lib, ... }: -{ +{ config, pkgs, inputs, lib, ... }: { networking.hostName = "vultr1"; imports = [ diff --git a/nixos/boxes/vultr1/folding.nix b/nixos/boxes/vultr1/folding.nix index 7d7e7235..125ab894 100644 --- a/nixos/boxes/vultr1/folding.nix +++ b/nixos/boxes/vultr1/folding.nix @@ -1,13 +1,9 @@ -{ config, pkgs, lib, ... }: -{ - nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ - "fahclient" - ]; +{ config, pkgs, lib, ... }: { + nixpkgs.config.allowUnfreePredicate = pkg: + builtins.elem (lib.getName pkg) [ "fahclient" ]; services.foldingathome = { enable = true; user = "cyplo"; }; - boot.kernel.sysctl = { - "kernel.unprivileged_userns_clone" = 1; - }; + boot.kernel.sysctl = { "kernel.unprivileged_userns_clone" = 1; }; } diff --git a/nixos/boxes/vultr1/matrix-front.nix b/nixos/boxes/vultr1/matrix-front.nix index 5c4ddfb5..b543e90d 100644 --- a/nixos/boxes/vultr1/matrix-front.nix +++ b/nixos/boxes/vultr1/matrix-front.nix @@ -1,5 +1,4 @@ -{ config, pkgs, ... }: -{ +{ config, pkgs, ... }: { services.nginx = { virtualHosts = { @@ -7,26 +6,22 @@ forceSSL = true; enableACME = true; locations."= /.well-known/matrix/server".extraConfig = - let - server = { "m.server" = "cyplo.dev:443"; }; - in - '' + let server = { "m.server" = "cyplo.dev:443"; }; + in '' add_header Content-Type application/json; return 200 '${builtins.toJSON server}'; ''; - locations."= /.well-known/matrix/client".extraConfig = - let - client = { - "m.homeserver" = { "base_url" = "https://cyplo.dev"; }; - "m.identity_server" = { "base_url" = "https://vector.im"; }; - }; - in - '' - add_header Content-Type application/json; - add_header Access-Control-Allow-Origin *; - return 200 '${builtins.toJSON client}'; - ''; + locations."= /.well-known/matrix/client".extraConfig = let + client = { + "m.homeserver" = { "base_url" = "https://cyplo.dev"; }; + "m.identity_server" = { "base_url" = "https://vector.im"; }; + }; + in '' + add_header Content-Type application/json; + add_header Access-Control-Allow-Origin *; + return 200 '${builtins.toJSON client}'; + ''; locations."/".extraConfig = '' return 404; diff --git a/nixos/boxes/vultr1/nginx.nix b/nixos/boxes/vultr1/nginx.nix index 93c4775a..d20a1af2 100644 --- a/nixos/boxes/vultr1/nginx.nix +++ b/nixos/boxes/vultr1/nginx.nix @@ -1,5 +1,4 @@ -{ config, pkgs, ... }: -{ +{ config, pkgs, ... }: { networking.firewall.allowedTCPPorts = [ 80 443 ]; services.nginx = { enable = true; diff --git a/nixos/boxes/vultr1/search.nix b/nixos/boxes/vultr1/search.nix index 598709a6..842b7b27 100644 --- a/nixos/boxes/vultr1/search.nix +++ b/nixos/boxes/vultr1/search.nix @@ -1,5 +1,4 @@ -{ config, pkgs, ... }: -{ +{ config, pkgs, ... }: { services.nginx = { virtualHosts = { @@ -13,9 +12,7 @@ proxy_send_timeout 60s; proxy_read_timeout 60s; ''; - locations."/" = { - proxyPass = "http://localhost:8888"; - }; + locations."/" = { proxyPass = "http://localhost:8888"; }; }; }; }; diff --git a/nixos/boxes/vultr1/snowflake.nix b/nixos/boxes/vultr1/snowflake.nix index a28738d4..7b5b2cee 100644 --- a/nixos/boxes/vultr1/snowflake.nix +++ b/nixos/boxes/vultr1/snowflake.nix @@ -1,5 +1,4 @@ -{ config, pkgs, lib, ... }: -{ +{ config, pkgs, lib, ... }: { containers.snowflake = { autoStart = true; ephemeral = true; @@ -29,7 +28,8 @@ RestrictRealtime = "yes"; RestrictSUIDSGID = "yes"; SystemCallArchitectures = "native"; - SystemCallFilter = "~@chown @clock @cpu-emulation @debug @module @mount @obsolete @raw-io @reboot @setuid @swap @privileged @resources"; + SystemCallFilter = + "~@chown @clock @cpu-emulation @debug @module @mount @obsolete @raw-io @reboot @setuid @swap @privileged @resources"; CapabilityBoundingSet = ""; ProtectProc = "invisible"; ProcSubset = "pid"; diff --git a/nixos/boxes/vultr1/tailscale-vultr1.nix b/nixos/boxes/vultr1/tailscale-vultr1.nix index 34d9d763..45e2ca70 100644 --- a/nixos/boxes/vultr1/tailscale-vultr1.nix +++ b/nixos/boxes/vultr1/tailscale-vultr1.nix @@ -1,8 +1,8 @@ { config, pkgs, inputs, lib, ... }: let - tailscale = inputs.nixpkgs-nixos-unstable.legacyPackages."x86_64-linux".tailscale; -in -{ + tailscale = + inputs.nixpkgs-nixos-unstable.legacyPackages."x86_64-linux".tailscale; +in { systemd.services.tailscale-autoconnect = { description = "Automatic connection to Tailscale"; diff --git a/nixos/boxes/vultr1/vultr-boot.nix b/nixos/boxes/vultr1/vultr-boot.nix index 37b07a98..510f013d 100644 --- a/nixos/boxes/vultr1/vultr-boot.nix +++ b/nixos/boxes/vultr1/vultr-boot.nix @@ -1,8 +1,20 @@ -{ config, pkgs, ... }: -{ +{ config, pkgs, ... }: { boot = { - initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "sr_mod" "virtio_blk" "virtio_net" "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_scsi" "9p" "9pnet_virtio" ]; + initrd.availableKernelModules = [ + "ata_piix" + "uhci_hcd" + "virtio_pci" + "sr_mod" + "virtio_blk" + "virtio_net" + "virtio_pci" + "virtio_mmio" + "virtio_blk" + "virtio_scsi" + "9p" + "9pnet_virtio" + ]; initrd.kernelModules = [ "virtio_balloon" "virtio_console" "virtio_rng" ]; initrd.postDeviceCommands = '' @@ -23,12 +35,10 @@ fsType = "ext4"; }; - swapDevices = [ - { - device = "/swapfile"; - size = 2048; - } - ]; + swapDevices = [{ + device = "/swapfile"; + size = 2048; + }]; } diff --git a/nixos/common-services.nix b/nixos/common-services.nix index 22e664d8..8caab128 100644 --- a/nixos/common-services.nix +++ b/nixos/common-services.nix @@ -1,5 +1,4 @@ -{ config, pkgs, ... }: -{ +{ config, pkgs, ... }: { services = { udev.packages = [ pkgs.android-udev-rules ]; ratbagd.enable = true; @@ -11,9 +10,7 @@ tlp = { enable = true; - settings = { - "DISK_IOSCHED" = "mq-deadline"; - }; + settings = { "DISK_IOSCHED" = "mq-deadline"; }; }; upower.enable = true; diff --git a/nixos/email-accounts.nix b/nixos/email-accounts.nix index f76154d5..307d8d11 100644 --- a/nixos/email-accounts.nix +++ b/nixos/email-accounts.nix @@ -1,8 +1,6 @@ { config, pkgs, inputs, ... }: -let - unstable = inputs.nixpkgs-nixos-unstable.legacyPackages.${pkgs.system}; -in -{ +let unstable = inputs.nixpkgs-nixos-unstable.legacyPackages.${pkgs.system}; +in { home-manager.users.cyryl = { ... }: { accounts.email.accounts.cyplo = { primary = true; @@ -54,27 +52,22 @@ in programs.mbsync.enable = true; programs.msmtp.enable = true; - programs.neomutt = { - enable = true; - }; + programs.neomutt = { enable = true; }; programs.notmuch = { enable = true; hooks.preNew = "${pkgs.isync}/bin/mbsync -a"; }; - programs.alot = { - enable = true; - }; + programs.alot = { enable = true; }; - home.packages = with pkgs; [ - unstable.protonmail-bridge - ]; + home.packages = with pkgs; [ unstable.protonmail-bridge ]; services.mbsync.enable = true; systemd.user.services."proton-bridge" = { Unit.Description = "Bridge to ProtonMail"; Install.WantedBy = [ "default.target" "mbsync.service" ]; - Service.ExecStart = "${unstable.protonmail-bridge}/bin/protonmail-bridge --noninteractive"; + Service.ExecStart = + "${unstable.protonmail-bridge}/bin/protonmail-bridge --noninteractive"; Service.Environment = "PATH=${pkgs.pass}/bin:${pkgs.gnupg}/bin"; }; diff --git a/nixos/enlightenment/home.nix b/nixos/enlightenment/home.nix index 6c41a6ae..cec22006 100644 --- a/nixos/enlightenment/home.nix +++ b/nixos/enlightenment/home.nix @@ -1,10 +1,7 @@ -{ config, pkgs, ... }: -{ +{ config, pkgs, ... }: { services = { }; - xsession = { - enable = false; - }; + xsession = { enable = false; }; programs.gnome-terminal = { enable = true; diff --git a/nixos/enlightenment/system.nix b/nixos/enlightenment/system.nix index 147adcca..d67ba156 100644 --- a/nixos/enlightenment/system.nix +++ b/nixos/enlightenment/system.nix @@ -1,5 +1,4 @@ -{ config, pkgs, ... }: -{ +{ config, pkgs, ... }: { services.xserver = { enable = true; desktopManager.enlightenment.enable = true; diff --git a/nixos/gfx-intel.nix b/nixos/gfx-intel.nix index 2c0620ff..78ea00bf 100644 --- a/nixos/gfx-intel.nix +++ b/nixos/gfx-intel.nix @@ -1,5 +1,4 @@ -{ config, pkgs, ... }: -{ +{ config, pkgs, ... }: { services.xserver.videoDrivers = [ "intel" ]; hardware.opengl = { diff --git a/nixos/gfx-nvidia-optimus.nix b/nixos/gfx-nvidia-optimus.nix index 4b22b04a..bc06466c 100644 --- a/nixos/gfx-nvidia-optimus.nix +++ b/nixos/gfx-nvidia-optimus.nix @@ -7,8 +7,7 @@ let export __VK_LAYER_NV_optimus=NVIDIA_only exec -a "$0" "$@" ''; -in -{ +in { environment.systemPackages = [ nvidia-offload ]; services.xserver.videoDrivers = [ "nvidia" ]; diff --git a/nixos/git/default.nix b/nixos/git/default.nix index 334780b1..6380cc98 100644 --- a/nixos/git/default.nix +++ b/nixos/git/default.nix @@ -1,8 +1,3 @@ -{ config, pkgs, lib, ... }: -{ - home-manager.users.cyryl = { ... }: { - imports = [ - ./home.nix - ]; - }; +{ config, pkgs, lib, ... }: { + home-manager.users.cyryl = { ... }: { imports = [ ./home.nix ]; }; } diff --git a/nixos/git/home.nix b/nixos/git/home.nix index 1be3dfef..e455bfff 100644 --- a/nixos/git/home.nix +++ b/nixos/git/home.nix @@ -1,5 +1,4 @@ -{ config, pkgs, ... }: -{ +{ config, pkgs, ... }: { programs.git = { enable = true; lfs.enable = true; @@ -24,12 +23,14 @@ pull.ff = "only"; push.default = "simple"; }; - aliases = - { - tree = "log --show-signature --color --decorate --date=short --all --graph -n 3"; - newbranch = "!git checkout master && git fetch -p && git reset --hard origin/master && git checkout -b $2"; - head = "log HEAD -n1"; - vacuum = "!git fetch -p && git branch -vv | awk '/: gone]/{print $1}' | xargs -r git branch -D && git gc --aggressive --auto"; - }; + aliases = { + tree = + "log --show-signature --color --decorate --date=short --all --graph -n 3"; + newbranch = + "!git checkout master && git fetch -p && git reset --hard origin/master && git checkout -b $2"; + head = "log HEAD -n1"; + vacuum = + "!git fetch -p && git branch -vv | awk '/: gone]/{print $1}' | xargs -r git branch -D && git gc --aggressive --auto"; + }; }; } diff --git a/nixos/gnome/default.nix b/nixos/gnome/default.nix index a74eb9ec..1c1e9c40 100644 --- a/nixos/gnome/default.nix +++ b/nixos/gnome/default.nix @@ -1,12 +1,5 @@ -{ config, pkgs, ... }: -{ - imports = [ - ./system.nix - ]; +{ config, pkgs, ... }: { + imports = [ ./system.nix ]; - home-manager.users.cyryl = { ... }: { - imports = [ - ./home.nix - ]; - }; + home-manager.users.cyryl = { ... }: { imports = [ ./home.nix ]; }; } diff --git a/nixos/gnome/home.nix b/nixos/gnome/home.nix index 98bbf9ed..7a96e888 100644 --- a/nixos/gnome/home.nix +++ b/nixos/gnome/home.nix @@ -1,15 +1,9 @@ -{ config, pkgs, ... }: -{ +{ config, pkgs, ... }: { services = { }; - xsession = { - enable = false; - }; + xsession = { enable = false; }; - home.packages = with pkgs; [ - gnome-usage - gnome3.gnome-tweaks - ]; + home.packages = with pkgs; [ gnome-usage gnome3.gnome-tweaks ]; programs.gnome-terminal = { enable = true; diff --git a/nixos/gnome/system.nix b/nixos/gnome/system.nix index da59bd75..555e1e48 100644 --- a/nixos/gnome/system.nix +++ b/nixos/gnome/system.nix @@ -1,5 +1,4 @@ -{ config, pkgs, ... }: -{ +{ config, pkgs, ... }: { services.xserver = { enable = true; displayManager.gdm.enable = true; diff --git a/nixos/gsconnect.nix b/nixos/gsconnect.nix index 7d1320e4..8b41e255 100644 --- a/nixos/gsconnect.nix +++ b/nixos/gsconnect.nix @@ -1,5 +1,10 @@ -{ config, pkgs, ... }: -{ - networking.firewall.allowedTCPPortRanges = [{ from = 1716; to = 1764; }]; - networking.firewall.allowedUDPPortRanges = [{ from = 1716; to = 1764; }]; +{ config, pkgs, ... }: { + networking.firewall.allowedTCPPortRanges = [{ + from = 1716; + to = 1764; + }]; + networking.firewall.allowedUDPPortRanges = [{ + from = 1716; + to = 1764; + }]; } diff --git a/nixos/gui/default.nix b/nixos/gui/default.nix index 6752424d..8c46bcdf 100644 --- a/nixos/gui/default.nix +++ b/nixos/gui/default.nix @@ -1,8 +1,6 @@ { config, pkgs, discord, inputs, nixpkgs-nixos-unstable-and-unfree, ... }: -let - unstable = inputs.nixpkgs-nixos-unstable.legacyPackages.${pkgs.system}; -in -{ +let unstable = inputs.nixpkgs-nixos-unstable.legacyPackages.${pkgs.system}; +in { programs.firejail.enable = true; programs.firejail.wrappedBinaries = { firefox = { @@ -32,63 +30,63 @@ in style.package = pkgs.adwaita-qt; }; - imports = [ - ./firejail.nix - ]; + imports = [ ./firejail.nix ]; - home.packages = with pkgs; with pkgs.gnome3; with pkgs.python38Packages; [ - anarchism - binwalk-full - brave - cheese - digikam - electrum - element-desktop - eog - evince - fontconfig - freecad - ghidra-bin - gimp - glxinfo - gnome-screenshot - gsettings-desktop-schemas - inkscape - libreoffice - mindforger - modem-manager-gui - nautilus - nyxt - obs-studio - openscad - passff-host - pdfarranger - qcad - qemu - remmina - shotwell - signal-desktop - simple-scan - ssb-patchwork - tlaplusToolbox - tlaps - vlc - wineFull - wireshark - wsjtx - xclip - xidlehook - yubico-piv-tool - yubikey-manager-qt - yubikey-personalization - yubikey-personalization-gui - ] ++ - [ - nixpkgs-nixos-unstable-and-unfree.discord - nixpkgs-nixos-unstable-and-unfree.hopper - nixpkgs-nixos-unstable-and-unfree.slack - nixpkgs-nixos-unstable-and-unfree.spotify - nixpkgs-nixos-unstable-and-unfree.zoom-us - ]; + home.packages = with pkgs; + with pkgs.gnome3; + with pkgs.python38Packages; + [ + anarchism + binwalk-full + brave + cheese + digikam + electrum + element-desktop + eog + evince + fontconfig + freecad + ghidra-bin + gimp + glxinfo + gnome-screenshot + gsettings-desktop-schemas + inkscape + libreoffice + mindforger + modem-manager-gui + nautilus + nyxt + obs-studio + openscad + passff-host + pdfarranger + qcad + qemu + remmina + shotwell + signal-desktop + simple-scan + ssb-patchwork + tlaplusToolbox + tlaps + vlc + wineFull + wireshark + wsjtx + xclip + xidlehook + yubico-piv-tool + yubikey-manager-qt + yubikey-personalization + yubikey-personalization-gui + ] ++ [ + nixpkgs-nixos-unstable-and-unfree.discord + nixpkgs-nixos-unstable-and-unfree.hopper + nixpkgs-nixos-unstable-and-unfree.slack + nixpkgs-nixos-unstable-and-unfree.spotify + nixpkgs-nixos-unstable-and-unfree.zoom-us + ]; }; } diff --git a/nixos/gui/firejail.nix b/nixos/gui/firejail.nix index b9e74e9a..2a54617d 100644 --- a/nixos/gui/firejail.nix +++ b/nixos/gui/firejail.nix @@ -1,5 +1,4 @@ -{ config, pkgs, lib, ... }: -{ +{ config, pkgs, lib, ... }: { home.file.".config/firejail/firefox.profile".text = '' include ${pkgs.firejail}/etc/firejail/firefox.profile diff --git a/nixos/gui/vscode.nix b/nixos/gui/vscode.nix index 4df3d414..7ebd221c 100644 --- a/nixos/gui/vscode.nix +++ b/nixos/gui/vscode.nix @@ -1,153 +1,153 @@ -{ config, pkgs, ... }: -{ - home.packages = with pkgs; [ - (vscode-with-extensions.override { - vscodeExtensions = with vscode-extensions; [ - ms-python.python - ( - vscode-utils.buildVscodeExtension { - vscodeExtUniqueId = "vadimcn.vscode-lldb"; - name = "vadimcn.vscode-lldb-1.6.10"; - src = fetchurl { - name = "vadimcn.vscode-lldb.zip"; - url = "https://github.com/vadimcn/vscode-lldb/releases/download/v1.6.10/codelldb-${pkgs.system}.vsix"; - sha256 = "sha256-QWbpe6ofacjrTCyWSKljwHDWWeHGmKNqi7cpw8Qy5Tw="; - }; - buildInputs = with pkgs; [ llvm lldb python37 autoPatchelfHook ]; - } - ) - ] +{ config, pkgs, ... }: { + home.packages = with pkgs; + [ + (vscode-with-extensions.override { + vscodeExtensions = with vscode-extensions; + [ + ms-python.python + (vscode-utils.buildVscodeExtension { + vscodeExtUniqueId = "vadimcn.vscode-lldb"; + name = "vadimcn.vscode-lldb-1.6.10"; + src = fetchurl { + name = "vadimcn.vscode-lldb.zip"; + url = + "https://github.com/vadimcn/vscode-lldb/releases/download/v1.6.10/codelldb-${pkgs.system}.vsix"; + sha256 = "sha256-QWbpe6ofacjrTCyWSKljwHDWWeHGmKNqi7cpw8Qy5Tw="; + }; + buildInputs = with pkgs; [ llvm lldb python37 autoPatchelfHook ]; + }) + ] - ++ + ++ - vscode-utils.extensionsFromVscodeMarketplace [ - { - publisher = "vscodevim"; - name = "vim"; - version = "1.21.7"; - sha256 = "sha256-nCcDafZ2CUhTjVha+6Mjxoil61xMGboO5lajc7dGEJg="; - } - { - publisher = "bbenoist"; - name = "nix"; - version = "1.0.1"; - sha256 = "sha256-qwxqOGublQeVP2qrLF94ndX/Be9oZOn+ZMCFX1yyoH0="; - } - { - publisher = "matklad"; - name = "rust-analyzer"; - version = "0.3.937"; - sha256 = "sha256-aGBFKnntycpgNFdWwxFPVtQ2ryUvFCx7oet9uILiUTY="; - } - { - publisher = "hashicorp"; - name = "terraform"; - version = "2.19.0"; - sha256 = "sha256-k/fcEJuELz0xkwivSrP6Nxtz861BLq1wR2ZDMXVrvkY="; - } - { - publisher = "be5invis"; - name = "toml"; - version = "0.6.0"; - sha256 = "sha256-yk7buEyQIw6aiUizAm+sgalWxUibIuP9crhyBaOjC2E="; - } - { - publisher = "ms-vscode"; - name = "cpptools-extension-pack"; - version = "1.1.0"; - sha256 = "sha256-XKHBwoRXNHIpy7gDR9/xEFdEdB4S0B9L9Jbk53f/Vbc="; - } - { - publisher = "tiehuis"; - name = "zig"; - version = "0.2.5"; - sha256 = "sha256-P8Sep0OtdchTfnudxFNvIK+SW++TyibGVI9zd+B5tu4="; - } - { - publisher = "sjhuangx"; - name = "vscode-scheme"; - version = "0.4.0"; - sha256 = "07vjfymvfv98s5r5a4b5iqhgfz1wpgq2l8h3wlq1bnhhhvmq5pq4"; - } - { - publisher = "shaunlebron"; - name = "vscode-parinfer"; - version = "0.6.2"; - sha256 = "0h4v4rnximy6rbh83y4s2qj1cqbj66g9wld39mzd0zwgi6ig9syd"; - } - { - publisher = "swyphcosmo"; - name = "spellchecker"; - version = "1.2.13"; - sha256 = "1lr33lf01afgi74c1a9gylk92li4hyq24l8bki4l6ggl4z4c2h3w"; - } - { - publisher = "asabil"; - name = "meson"; - version = "1.1.1"; - sha256 = "00cc28a2nb325f54bx51wf5q15x1pmsn0j9z6rnxxqxwii1dm5cl"; - } - { - publisher = "codezombiech"; - name = "gitignore"; - version = "0.6.0"; - sha256 = "0gnc0691pwkd9s8ldqabmpfvj0236rw7bxvkf0bvmww32kv1ia0b"; - } - { - publisher = "DavidAnson"; - name = "vscode-markdownlint"; - version = "0.26.0"; - sha256 = "0g4pssvajn7d8p2547v7313gjyqx4pzs7cbjws2s3v2fk1sw7vbj"; - } - { - publisher = "esbenp"; - name = "prettier-vscode"; - version = "1.8.1"; - sha256 = "0qcm2784n9qc4p77my1kwqrswpji7bp895ay17yzs5g84cj010ln"; - } - { - publisher = "hbenl"; - name = "vscode-test-explorer"; - version = "2.9.3"; - sha256 = "1yf85hgvganxq5n5jff9ckn3smxd6xi79cgn6k53qi5w1r5rahy0"; - } - { - publisher = "lextudio"; - name = "restructuredtext"; - version = "106.0.0"; - sha256 = "096r8071202nxi1is6z7dghcmpsh0f0mm3mp3cfh1yj2mnyzlaxa"; - } - { - publisher = "lostintangent"; - name = "vsls-pomodoro"; - version = "0.1.0"; - sha256 = "1b73zbkhlhacvi18cx4g3n6randy3hw9cab1gkw5gzb3375w7w3p"; - } - { - publisher = "lostintangent"; - name = "vsls-whiteboard"; - version = "0.0.8"; - sha256 = "13fcay9bs861msb5y694casbw66dmhl504xm5cvprssx1qka186p"; - } - { - publisher = "mechatroner"; - name = "rainbow-csv"; - version = "1.0.0"; - sha256 = "1fyamgm7zq31r3c00cn6pcb66rrkfhwfmp72qnhrajydmnvcnbg6"; - } - { - publisher = "ronnidc"; - name = "nunjucks"; - version = "0.2.3"; - sha256 = "119xgyn1dggw2rcqkn2mnz364iw5jlrxg7pcydbijsqj5d3zdfsf"; - } - { - publisher = "serayuzgur"; - name = "crates"; - version = "0.4.2"; - sha256 = "1knspsc98cfw4mhc0yaz0f2185sxdf9kn9qsysfs6c82g9wjaqcj"; - } - ]; - }) - ]; + vscode-utils.extensionsFromVscodeMarketplace [ + { + publisher = "vscodevim"; + name = "vim"; + version = "1.21.7"; + sha256 = "sha256-nCcDafZ2CUhTjVha+6Mjxoil61xMGboO5lajc7dGEJg="; + } + { + publisher = "bbenoist"; + name = "nix"; + version = "1.0.1"; + sha256 = "sha256-qwxqOGublQeVP2qrLF94ndX/Be9oZOn+ZMCFX1yyoH0="; + } + { + publisher = "matklad"; + name = "rust-analyzer"; + version = "0.3.937"; + sha256 = "sha256-aGBFKnntycpgNFdWwxFPVtQ2ryUvFCx7oet9uILiUTY="; + } + { + publisher = "hashicorp"; + name = "terraform"; + version = "2.19.0"; + sha256 = "sha256-k/fcEJuELz0xkwivSrP6Nxtz861BLq1wR2ZDMXVrvkY="; + } + { + publisher = "be5invis"; + name = "toml"; + version = "0.6.0"; + sha256 = "sha256-yk7buEyQIw6aiUizAm+sgalWxUibIuP9crhyBaOjC2E="; + } + { + publisher = "ms-vscode"; + name = "cpptools-extension-pack"; + version = "1.1.0"; + sha256 = "sha256-XKHBwoRXNHIpy7gDR9/xEFdEdB4S0B9L9Jbk53f/Vbc="; + } + { + publisher = "tiehuis"; + name = "zig"; + version = "0.2.5"; + sha256 = "sha256-P8Sep0OtdchTfnudxFNvIK+SW++TyibGVI9zd+B5tu4="; + } + { + publisher = "sjhuangx"; + name = "vscode-scheme"; + version = "0.4.0"; + sha256 = "07vjfymvfv98s5r5a4b5iqhgfz1wpgq2l8h3wlq1bnhhhvmq5pq4"; + } + { + publisher = "shaunlebron"; + name = "vscode-parinfer"; + version = "0.6.2"; + sha256 = "0h4v4rnximy6rbh83y4s2qj1cqbj66g9wld39mzd0zwgi6ig9syd"; + } + { + publisher = "swyphcosmo"; + name = "spellchecker"; + version = "1.2.13"; + sha256 = "1lr33lf01afgi74c1a9gylk92li4hyq24l8bki4l6ggl4z4c2h3w"; + } + { + publisher = "asabil"; + name = "meson"; + version = "1.1.1"; + sha256 = "00cc28a2nb325f54bx51wf5q15x1pmsn0j9z6rnxxqxwii1dm5cl"; + } + { + publisher = "codezombiech"; + name = "gitignore"; + version = "0.6.0"; + sha256 = "0gnc0691pwkd9s8ldqabmpfvj0236rw7bxvkf0bvmww32kv1ia0b"; + } + { + publisher = "DavidAnson"; + name = "vscode-markdownlint"; + version = "0.26.0"; + sha256 = "0g4pssvajn7d8p2547v7313gjyqx4pzs7cbjws2s3v2fk1sw7vbj"; + } + { + publisher = "esbenp"; + name = "prettier-vscode"; + version = "1.8.1"; + sha256 = "0qcm2784n9qc4p77my1kwqrswpji7bp895ay17yzs5g84cj010ln"; + } + { + publisher = "hbenl"; + name = "vscode-test-explorer"; + version = "2.9.3"; + sha256 = "1yf85hgvganxq5n5jff9ckn3smxd6xi79cgn6k53qi5w1r5rahy0"; + } + { + publisher = "lextudio"; + name = "restructuredtext"; + version = "106.0.0"; + sha256 = "096r8071202nxi1is6z7dghcmpsh0f0mm3mp3cfh1yj2mnyzlaxa"; + } + { + publisher = "lostintangent"; + name = "vsls-pomodoro"; + version = "0.1.0"; + sha256 = "1b73zbkhlhacvi18cx4g3n6randy3hw9cab1gkw5gzb3375w7w3p"; + } + { + publisher = "lostintangent"; + name = "vsls-whiteboard"; + version = "0.0.8"; + sha256 = "13fcay9bs861msb5y694casbw66dmhl504xm5cvprssx1qka186p"; + } + { + publisher = "mechatroner"; + name = "rainbow-csv"; + version = "1.0.0"; + sha256 = "1fyamgm7zq31r3c00cn6pcb66rrkfhwfmp72qnhrajydmnvcnbg6"; + } + { + publisher = "ronnidc"; + name = "nunjucks"; + version = "0.2.3"; + sha256 = "119xgyn1dggw2rcqkn2mnz364iw5jlrxg7pcydbijsqj5d3zdfsf"; + } + { + publisher = "serayuzgur"; + name = "crates"; + version = "0.4.2"; + sha256 = "1knspsc98cfw4mhc0yaz0f2185sxdf9kn9qsysfs6c82g9wjaqcj"; + } + ]; + }) + ]; } diff --git a/nixos/home-manager/cli.nix b/nixos/home-manager/cli.nix index c4b91720..ce6520eb 100644 --- a/nixos/home-manager/cli.nix +++ b/nixos/home-manager/cli.nix @@ -1,7 +1,12 @@ -{ config, pkgs, ... }: -{ +{ config, pkgs, ... }: { home.packages = with pkgs; [ - (pass.withExtensions (ext: [ ext.pass-otp ext.pass-import ext.pass-genphrase ext.pass-audit ext.pass-update ])) + (pass.withExtensions (ext: [ + ext.pass-otp + ext.pass-import + ext.pass-genphrase + ext.pass-audit + ext.pass-update + ])) aria bfg-repo-cleaner binutils diff --git a/nixos/home-manager/default.nix b/nixos/home-manager/default.nix index 89aefe44..25bc3a67 100644 --- a/nixos/home-manager/default.nix +++ b/nixos/home-manager/default.nix @@ -9,8 +9,7 @@ news.display = "show"; - home.packages = with pkgs; [ - ]; + home.packages = with pkgs; [ ]; imports = [ ./programs/tmux.nix diff --git a/nixos/home-manager/linux.nix b/nixos/home-manager/linux.nix index 2644c0fd..50c05ed6 100644 --- a/nixos/home-manager/linux.nix +++ b/nixos/home-manager/linux.nix @@ -1,5 +1,4 @@ -{ config, pkgs, inputs, ... }: -{ +{ config, pkgs, inputs, ... }: { services.gpg-agent = { enable = true; pinentryFlavor = "curses"; @@ -13,4 +12,4 @@ powertop wirelesstools ]; -} \ No newline at end of file +} diff --git a/nixos/home-manager/programs/alacritty.nix b/nixos/home-manager/programs/alacritty.nix index 767477ed..d41b36b6 100644 --- a/nixos/home-manager/programs/alacritty.nix +++ b/nixos/home-manager/programs/alacritty.nix @@ -1,8 +1,5 @@ -{ config, pkgs, ... }: -{ - home.sessionVariables = { - TERMINAL = "alacritty"; - }; +{ config, pkgs, ... }: { + home.sessionVariables = { TERMINAL = "alacritty"; }; programs.alacritty = { enable = true; diff --git a/nixos/home-manager/programs/emacs/default.nix b/nixos/home-manager/programs/emacs/default.nix index 334780b1..6380cc98 100644 --- a/nixos/home-manager/programs/emacs/default.nix +++ b/nixos/home-manager/programs/emacs/default.nix @@ -1,8 +1,3 @@ -{ config, pkgs, lib, ... }: -{ - home-manager.users.cyryl = { ... }: { - imports = [ - ./home.nix - ]; - }; +{ config, pkgs, lib, ... }: { + home-manager.users.cyryl = { ... }: { imports = [ ./home.nix ]; }; } diff --git a/nixos/home-manager/programs/emacs/emacs.nix b/nixos/home-manager/programs/emacs/emacs.nix index fd1af260..2d22902f 100644 --- a/nixos/home-manager/programs/emacs/emacs.nix +++ b/nixos/home-manager/programs/emacs/emacs.nix @@ -2,19 +2,12 @@ let myEmacs = pkgs.emacs-nox; emacsWithPackages = (pkgs.emacsPackagesGen myEmacs).emacsWithPackages; -in -emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [ - magit - solarized-theme - evil -]) -++ (with epkgs.melpaPackages; [ - xterm-color - nix-mode -]) -++ (with epkgs.elpaPackages; [ - beacon # ; highlight my cursor when scrolling - nameless # ; hide current package name everywhere in elisp code -]) ++ [ - pkgs.notmuch # From main packages set -]) +in emacsWithPackages (epkgs: + (with epkgs.melpaStablePackages; [ magit solarized-theme evil ]) + ++ (with epkgs.melpaPackages; [ xterm-color nix-mode ]) + ++ (with epkgs.elpaPackages; [ + beacon # ; highlight my cursor when scrolling + nameless # ; hide current package name everywhere in elisp code + ]) ++ [ + pkgs.notmuch # From main packages set + ]) diff --git a/nixos/home-manager/programs/emacs/home.nix b/nixos/home-manager/programs/emacs/home.nix index 33f73445..4a87cbec 100644 --- a/nixos/home-manager/programs/emacs/home.nix +++ b/nixos/home-manager/programs/emacs/home.nix @@ -1,5 +1,4 @@ -{ config, pkgs, ... }: -{ +{ config, pkgs, ... }: { home.file.".emacs".text = '' (require 'package) diff --git a/nixos/home-manager/programs/genpass.nix b/nixos/home-manager/programs/genpass.nix index 258bf955..b5cbf7ac 100644 --- a/nixos/home-manager/programs/genpass.nix +++ b/nixos/home-manager/programs/genpass.nix @@ -13,11 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1p6l64s9smhwka8bh3pamqimamxziad859i62nrmxzqc49nq5s7m"; - buildInputs = [ - openssl - pkgconfig - git - ]; + buildInputs = [ openssl pkgconfig git ]; meta = with stdenv.lib; { description = "A simple yet robust commandline random password generator."; diff --git a/nixos/home-manager/programs/tmux.nix b/nixos/home-manager/programs/tmux.nix index 51134add..1e90ce38 100644 --- a/nixos/home-manager/programs/tmux.nix +++ b/nixos/home-manager/programs/tmux.nix @@ -1,5 +1,4 @@ -{ config, pkgs, ... }: -{ +{ config, pkgs, ... }: { programs.tmux = { enable = true; shortcut = "a"; diff --git a/nixos/home-manager/programs/zsh.nix b/nixos/home-manager/programs/zsh.nix index 2b690db3..adbdcc94 100644 --- a/nixos/home-manager/programs/zsh.nix +++ b/nixos/home-manager/programs/zsh.nix @@ -1,5 +1,4 @@ -{ config, pkgs, ... }: -{ +{ config, pkgs, ... }: { programs.zsh = { enable = true; history = { diff --git a/nixos/home-manager/scripts.nix b/nixos/home-manager/scripts.nix index 2f707e67..010e59ac 100644 --- a/nixos/home-manager/scripts.nix +++ b/nixos/home-manager/scripts.nix @@ -1,5 +1,4 @@ -{ config, pkgs, ... }: -{ +{ config, pkgs, ... }: { imports = [ ./scripts/mount-vault.nix ./scripts/umount-vault.nix diff --git a/nixos/home-manager/scripts/download.nix b/nixos/home-manager/scripts/download.nix index 54362cf3..24e8aa71 100644 --- a/nixos/home-manager/scripts/download.nix +++ b/nixos/home-manager/scripts/download.nix @@ -10,7 +10,4 @@ let ''; }; -in -{ - home.packages = with pkgs; [ download ]; -} +in { home.packages = with pkgs; [ download ]; } diff --git a/nixos/home-manager/scripts/mount-vault.nix b/nixos/home-manager/scripts/mount-vault.nix index b946c5ed..bbbc721f 100644 --- a/nixos/home-manager/scripts/mount-vault.nix +++ b/nixos/home-manager/scripts/mount-vault.nix @@ -50,8 +50,7 @@ let ''; }; -in -{ +in { home.packages = with pkgs; [ mount-vault ]; } diff --git a/nixos/home-manager/scripts/umount-vault.nix b/nixos/home-manager/scripts/umount-vault.nix index bc7255cd..f579b472 100644 --- a/nixos/home-manager/scripts/umount-vault.nix +++ b/nixos/home-manager/scripts/umount-vault.nix @@ -17,7 +17,4 @@ let ''; }; -in -{ - home.packages = with pkgs; [ umount-vault ]; -} +in { home.packages = with pkgs; [ umount-vault ]; } diff --git a/nixos/home-other-os.nix b/nixos/home-other-os.nix index 1720bf7c..1188ab28 100644 --- a/nixos/home-other-os.nix +++ b/nixos/home-other-os.nix @@ -1,10 +1,10 @@ { config, pkgs, ... }: let - unstableTarball = fetchTarball https://github.com/NixOS/nixpkgs/archive/nixpkgs-unstable.tar.gz; + unstableTarball = fetchTarball + "https://github.com/NixOS/nixpkgs/archive/nixpkgs-unstable.tar.gz"; dotfiles = "/home/cyryl/dev/dotfiles"; -in -{ +in { home.username = "cyryl"; home.homeDirectory = "/home/cyryl"; home.stateVersion = "21.11"; @@ -12,15 +12,11 @@ in nixpkgs.config = { allowUnfree = true; packageOverrides = pkgs: { - unstable = import unstableTarball { - config = config.nixpkgs.config; - }; + unstable = import unstableTarball { config = config.nixpkgs.config; }; }; }; - home.sessionVariables = { - LOCALE_ARCHIVE = /usr/lib/locale/locale-archive; - }; + home.sessionVariables = { LOCALE_ARCHIVE = /usr/lib/locale/locale-archive; }; targets.genericLinux.enable = true; home.file.".gitconfig".source = ~/dev/dotfiles/.gitconfig.linux.form3; diff --git a/nixos/i3/autorandr.nix b/nixos/i3/autorandr.nix index 51c6f265..a1d4d533 100644 --- a/nixos/i3/autorandr.nix +++ b/nixos/i3/autorandr.nix @@ -1,5 +1,4 @@ -{ config, pkgs, ... }: -{ +{ config, pkgs, ... }: { services.autorandr.enable = true; home-manager.users.cyryl = { ... }: { programs.autorandr = { @@ -25,13 +24,13 @@ profiles = { "foureighty-docked" = { fingerprint = { - eDP-1 = "00ffffffffffff0006af362300000000001b0104a51f117802f4f5a4544d9c270f505400000001010101010101010101010101010101e65f00a0a0a040503020350035ae100000180000000f0000000000000000000000000020000000fe0041554f0a202020202020202020000000fe004231343051414e30322e33200a00b2"; - DP-1 = "00ffffffffffff0026cd4e66f3030000271d0104b53c22783ef6d5a7544b9e250d5054bfef80714f8140818081c09500b300d1c001014dd000a0f0703e8030203500544f2100001a000000ff0031313636333933393031303131000000fd00184c1fa03c000a202020202020000000fc00504c3237393255480a202020200176020320f15390050403020716011f121314201511065d5e5f2309070783010000023a801871382d40582c4500544f2100001f011d8018711c1620582c2500544f2100009fa76600a0f0701f8030205500544f2100001ff45100a0f070198030203500544f2100001f565e00a0a0a0295030203500544f2100001b000000000059"; + eDP-1 = + "00ffffffffffff0006af362300000000001b0104a51f117802f4f5a4544d9c270f505400000001010101010101010101010101010101e65f00a0a0a040503020350035ae100000180000000f0000000000000000000000000020000000fe0041554f0a202020202020202020000000fe004231343051414e30322e33200a00b2"; + DP-1 = + "00ffffffffffff0026cd4e66f3030000271d0104b53c22783ef6d5a7544b9e250d5054bfef80714f8140818081c09500b300d1c001014dd000a0f0703e8030203500544f2100001a000000ff0031313636333933393031303131000000fd00184c1fa03c000a202020202020000000fc00504c3237393255480a202020200176020320f15390050403020716011f121314201511065d5e5f2309070783010000023a801871382d40582c4500544f2100001f011d8018711c1620582c2500544f2100009fa76600a0f0701f8030205500544f2100001ff45100a0f070198030203500544f2100001f565e00a0a0a0295030203500544f2100001b000000000059"; }; config = { - eDP-1 = { - enable = false; - }; + eDP-1 = { enable = false; }; DP-1 = { enable = true; primary = true; @@ -42,7 +41,8 @@ }; "foureighty" = { fingerprint = { - eDP-1 = "00ffffffffffff0006af362300000000001b0104a51f117802f4f5a4544d9c270f505400000001010101010101010101010101010101e65f00a0a0a040503020350035ae100000180000000f0000000000000000000000000020000000fe0041554f0a202020202020202020000000fe004231343051414e30322e33200a00b2"; + eDP-1 = + "00ffffffffffff0006af362300000000001b0104a51f117802f4f5a4544d9c270f505400000001010101010101010101010101010101e65f00a0a0a040503020350035ae100000180000000f0000000000000000000000000020000000fe0041554f0a202020202020202020000000fe004231343051414e30322e33200a00b2"; }; config = { eDP-1 = { diff --git a/nixos/i3/default.nix b/nixos/i3/default.nix index 244772dd..dbe2811a 100644 --- a/nixos/i3/default.nix +++ b/nixos/i3/default.nix @@ -1,21 +1,22 @@ -{ config, pkgs, ... }: -{ - imports = [ - ./autorandr.nix - ]; - environment.systemPackages = with pkgs; [ - gnome3.dconf - ]; +{ config, pkgs, ... }: { + imports = [ ./autorandr.nix ]; + environment.systemPackages = with pkgs; [ gnome3.dconf ]; programs.dconf.enable = true; security.sudo.extraRules = [ { users = [ "cyryl" ]; - commands = [{ command = "${pkgs.i3}/bin/i3-msg"; options = [ "NOPASSWD" ]; }]; + commands = [{ + command = "${pkgs.i3}/bin/i3-msg"; + options = [ "NOPASSWD" ]; + }]; } { users = [ "cyryl" ]; - commands = [{ command = "${pkgs.intel-gpu-tools}/bin/intel_gpu_top"; options = [ "NOPASSWD" ]; }]; + commands = [{ + command = "${pkgs.intel-gpu-tools}/bin/intel_gpu_top"; + options = [ "NOPASSWD" ]; + }]; } ]; @@ -25,9 +26,7 @@ allowAnyUser = true; }; - dbus = { - packages = with pkgs; [ gnome2.GConf gnome3.dconf ]; - }; + dbus = { packages = with pkgs; [ gnome2.GConf gnome3.dconf ]; }; fractalart.enable = true; colord.enable = true; @@ -38,10 +37,7 @@ }; }; home-manager.users.cyryl = { ... }: { - imports = [ - ./home.nix - ]; - home.packages = with pkgs; [ - ]; + imports = [ ./home.nix ]; + home.packages = with pkgs; [ ]; }; } diff --git a/nixos/i3/grobi.nix b/nixos/i3/grobi.nix index e4aa9e96..c2b29321 100644 --- a/nixos/i3/grobi.nix +++ b/nixos/i3/grobi.nix @@ -1,5 +1,4 @@ -{ config, pkgs, ... }: -{ +{ config, pkgs, ... }: { home.packages = with pkgs; [ grobi ]; services.grobi = { diff --git a/nixos/i3/home.nix b/nixos/i3/home.nix index 2b43f8bb..1406ca27 100644 --- a/nixos/i3/home.nix +++ b/nixos/i3/home.nix @@ -1,5 +1,4 @@ -{ config, pkgs, ... }: -{ +{ config, pkgs, ... }: { imports = [ ./i3.nix ./i3-status.nix @@ -9,9 +8,7 @@ ./xidlehook.nix ]; - home.sessionVariables = { - CM_LAUNCHER = "rofi"; - }; + home.sessionVariables = { CM_LAUNCHER = "rofi"; }; services = { picom = { @@ -35,9 +32,6 @@ longitude = -1.0; }; - xsession = { - enable = true; - }; - + xsession = { enable = true; }; } diff --git a/nixos/i3/i3-status.nix b/nixos/i3/i3-status.nix index 148add8b..360a54ed 100644 --- a/nixos/i3/i3-status.nix +++ b/nixos/i3/i3-status.nix @@ -1,17 +1,12 @@ -{ config, pkgs, ... }: -{ +{ config, pkgs, ... }: { programs.i3status = { enable = true; enableDefault = false; modules = { - "load" = { - position = 1; - }; + "load" = { position = 1; }; "disk /" = { position = 2; - settings = { - format = " %avail"; - }; + settings = { format = " %avail"; }; }; "memory" = { settings = { @@ -32,9 +27,7 @@ position = 3; }; "time" = { - settings = { - format = "%a %d/%m %H:%M"; - }; + settings = { format = "%a %d/%m %H:%M"; }; position = 9; }; }; diff --git a/nixos/i3/kdeconnect.nix b/nixos/i3/kdeconnect.nix index 771c17e1..b0d0f346 100644 --- a/nixos/i3/kdeconnect.nix +++ b/nixos/i3/kdeconnect.nix @@ -1,5 +1,4 @@ -{ config, pkgs, ... }: -{ +{ config, pkgs, ... }: { services.kdeconnect = { enable = true; indicator = true; diff --git a/nixos/i3/polybar/polybar.nix b/nixos/i3/polybar/polybar.nix index 8b3b9c81..21264e45 100644 --- a/nixos/i3/polybar/polybar.nix +++ b/nixos/i3/polybar/polybar.nix @@ -1,5 +1,4 @@ -{ config, pkgs, ... }: -{ +{ config, pkgs, ... }: { services.polybar = { enable = true; script = "polybar -r main_bar &"; @@ -41,13 +40,12 @@ "module/weather" = { type = "custom/script"; interval = 600; - exec = "${pkgs.bash}/bin/bash -c 'source ~/dev/dotfiles/nixos/i3/polybar/openweathermap-fullfeatured.sh'"; + exec = + "${pkgs.bash}/bin/bash -c 'source ~/dev/dotfiles/nixos/i3/polybar/openweathermap-fullfeatured.sh'"; label-font = 2; }; - "module/i3" = { - type = "internal/i3"; - }; + "module/i3" = { type = "internal/i3"; }; "module/cpu" = { type = "internal/cpu"; @@ -58,7 +56,8 @@ "module/temperature" = { type = "custom/script"; interval = 5; - exec = "${pkgs.bash}/bin/bash -c 'source ~/dev/dotfiles/nixos/i3/polybar/cpu-temp.sh'"; + exec = + "${pkgs.bash}/bin/bash -c 'source ~/dev/dotfiles/nixos/i3/polybar/cpu-temp.sh'"; }; "module/memory" = { diff --git a/nixos/i3/xidlehook.nix b/nixos/i3/xidlehook.nix index 1d3d97e8..5ac40068 100644 --- a/nixos/i3/xidlehook.nix +++ b/nixos/i3/xidlehook.nix @@ -1,5 +1,4 @@ -{ config, pkgs, ... }: -{ +{ config, pkgs, ... }: { services.xidlehook = { enable = true; not-when-audio = true; @@ -10,8 +9,8 @@ timers = [ { delay = 60; - command = "xrandr --output \"$PRIMARY_DISPLAY\" --brightness .1"; - canceller = "xrandr --output \"$PRIMARY_DISPLAY\" --brightness 1"; + command = ''xrandr --output "$PRIMARY_DISPLAY" --brightness .1''; + canceller = ''xrandr --output "$PRIMARY_DISPLAY" --brightness 1''; } { delay = 600; diff --git a/nixos/kde.nix b/nixos/kde.nix index b3c8cf3c..50a7e96f 100644 --- a/nixos/kde.nix +++ b/nixos/kde.nix @@ -1,5 +1,4 @@ -{ config, pkgs, ... }: -{ +{ config, pkgs, ... }: { services.xserver = { enable = true; displayManager.sddm = { diff --git a/nixos/libvirt.nix b/nixos/libvirt.nix index e452d570..dda761fd 100644 --- a/nixos/libvirt.nix +++ b/nixos/libvirt.nix @@ -1,15 +1,10 @@ -{ config, pkgs, ... }: -{ +{ config, pkgs, ... }: { boot.kernelModules = [ "kvm-intel" ]; boot.kernelParams = [ "intel_iommu=on" ]; virtualisation.libvirtd.enable = true; virtualisation.kvmgt.enable = true; users.extraUsers.cyryl.extraGroups = [ "kvm" ]; - environment.systemPackages = with pkgs; [ - virtmanager - qemu - swtpm - ]; + environment.systemPackages = with pkgs; [ virtmanager qemu swtpm ]; } diff --git a/nixos/mercurial/default.nix b/nixos/mercurial/default.nix index 334780b1..6380cc98 100644 --- a/nixos/mercurial/default.nix +++ b/nixos/mercurial/default.nix @@ -1,8 +1,3 @@ -{ config, pkgs, lib, ... }: -{ - home-manager.users.cyryl = { ... }: { - imports = [ - ./home.nix - ]; - }; +{ config, pkgs, lib, ... }: { + home-manager.users.cyryl = { ... }: { imports = [ ./home.nix ]; }; } diff --git a/nixos/mercurial/home.nix b/nixos/mercurial/home.nix index c7a4b24f..0e2500e7 100644 --- a/nixos/mercurial/home.nix +++ b/nixos/mercurial/home.nix @@ -1,5 +1,4 @@ -{ config, pkgs, ... }: -{ +{ config, pkgs, ... }: { programs.mercurial = { enable = true; userName = "Cyryl Płotnicki"; @@ -10,7 +9,6 @@ [ui] paginate = never ''; - aliases = - { }; + aliases = { }; }; } diff --git a/nixos/packages/decsync-evolution/default.nix b/nixos/packages/decsync-evolution/default.nix index 94bb4d71..3cef1492 100644 --- a/nixos/packages/decsync-evolution/default.nix +++ b/nixos/packages/decsync-evolution/default.nix @@ -11,7 +11,17 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - buildInputs = [ libgee json-glib gnome3.evolution-data-server gnome3.evolution gtk3 webkitgtk glib libsecret libsoup ]; + buildInputs = [ + libgee + json-glib + gnome3.evolution-data-server + gnome3.evolution + gtk3 + webkitgtk + glib + libsecret + libsoup + ]; nativeBuildInputs = [ meson ninja vala pkg-config ]; configurePhase = "meson build --prefix=$out"; buildPhase = "ninja -C build"; diff --git a/nixos/packages/etesync-dav/default.nix b/nixos/packages/etesync-dav/default.nix index c8ce3fb5..0738ea00 100644 --- a/nixos/packages/etesync-dav/default.nix +++ b/nixos/packages/etesync-dav/default.nix @@ -6,13 +6,15 @@ let version = "1.6.2"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "bafdd195f10f7c7395f0133bad09746a68e0e6b66da202c9bdb6b1eb4abba5e9"; + sha256 = + "bafdd195f10f7c7395f0133bad09746a68e0e6b66da202c9bdb6b1eb4abba5e9"; }; doCheck = false; meta = with stdenv.lib; { homepage = "https://github.com/ricmoo/pyscrypt"; license = licenses.mit; - description = "Pure-Python Implementation of the scrypt password-based key derivation function and scrypt file format library"; + description = + "Pure-Python Implementation of the scrypt password-based key derivation function and scrypt file format library"; }; }; @@ -21,7 +23,8 @@ let version = "1.0"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "b89895ba6438038d0bdf88020ceff876cf3eae0d5c66a69b526fab31125db2c5"; + sha256 = + "b89895ba6438038d0bdf88020ceff876cf3eae0d5c66a69b526fab31125db2c5"; }; checkInputs = [ python37Packages.pycodestyle ]; propagatedBuildInputs = [ python37Packages.six ]; @@ -37,7 +40,8 @@ let version = "2.0.0"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "fdcaedc1fb19a63d7d875b0105b0a5b496dd0989330d454a42bcb401fa5454ec"; + sha256 = + "fdcaedc1fb19a63d7d875b0105b0a5b496dd0989330d454a42bcb401fa5454ec"; }; checkInputs = [ python37Packages.flake8 ]; propagatedBuildInputs = [ orderedmultidict python37Packages.six ]; @@ -92,7 +96,8 @@ let version = "2.1.11"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "02273fcc6ae10e0f74aa12652e24d0001eec8dbf467d54ddb4dfcc2af7d7a5db"; + sha256 = + "02273fcc6ae10e0f74aa12652e24d0001eec8dbf467d54ddb4dfcc2af7d7a5db"; }; doCheck = false; checkInputs = [ @@ -101,7 +106,8 @@ let python37Packages.pytest-flake8 python37Packages.pytestcov ]; - propagatedBuildInputs = [ python37Packages.dateutil python37Packages.vobject ]; + propagatedBuildInputs = + [ python37Packages.dateutil python37Packages.vobject ]; meta = with pkgs.stdenv.lib; { homepage = "http://www.radicale.org/"; license = licenses.gpl1; @@ -139,9 +145,7 @@ let }; }; -in - -python37.pkgs.buildPythonPackage rec { +in python37.pkgs.buildPythonPackage rec { pname = "etesync-dav"; version = "0.5.0"; src = pythonPackages.fetchPypi { diff --git a/nixos/quirks/thinkpad-cpu-throttling.nix b/nixos/quirks/thinkpad-cpu-throttling.nix index e8a91252..eddd5773 100644 --- a/nixos/quirks/thinkpad-cpu-throttling.nix +++ b/nixos/quirks/thinkpad-cpu-throttling.nix @@ -1,5 +1,4 @@ -{ config, pkgs, ... }: -{ +{ config, pkgs, ... }: { systemd.services.cpu-throttling = { enable = true; description = "CPU Throttling Fix"; @@ -8,12 +7,8 @@ ]; path = [ pkgs.msr-tools ]; script = "wrmsr -a 0x1a2 0x3000000"; - serviceConfig = { - Type = "oneshot"; - }; - wantedBy = [ - "timers.target" - ]; + serviceConfig = { Type = "oneshot"; }; + wantedBy = [ "timers.target" ]; }; systemd.timers.cpu-throttling = { @@ -27,8 +22,6 @@ OnUnitActiveSec = 60; Unit = "cpu-throttling.service"; }; - wantedBy = [ - "timers.target" - ]; + wantedBy = [ "timers.target" ]; }; } diff --git a/nixos/security-kernel.nix b/nixos/security-kernel.nix index 0898fec5..c5e8df79 100644 --- a/nixos/security-kernel.nix +++ b/nixos/security-kernel.nix @@ -1,5 +1,4 @@ -{ config, pkgs, ... }: -{ +{ config, pkgs, ... }: { boot.kernelPatches = [{ name = "cyplo-hardened"; patch = null; diff --git a/nixos/security.nix b/nixos/security.nix index 95a24502..01bf42a1 100644 --- a/nixos/security.nix +++ b/nixos/security.nix @@ -1,5 +1,4 @@ -{ config, pkgs, lib, ... }: -{ +{ config, pkgs, lib, ... }: { nix.allowedUsers = [ "@users" ]; security.lockKernelModules = false; security.protectKernelImage = true; @@ -10,11 +9,8 @@ networking.firewall.enable = true; services.clamav.daemon.enable = true; services.clamav.updater.enable = true; - boot.kernelParams = [ - "slub_debug=FZP" - "page_poison=1" - "page_alloc.shuffle=1" - ]; + boot.kernelParams = + [ "slub_debug=FZP" "page_poison=1" "page_alloc.shuffle=1" ]; boot.blacklistedKernelModules = [ # Obscure network protocols diff --git a/nixos/server-security.nix b/nixos/server-security.nix index c8f92a7d..c7354115 100644 --- a/nixos/server-security.nix +++ b/nixos/server-security.nix @@ -6,11 +6,8 @@ let "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJwZ4M6lT2yzg8iarCzsLADAuXS4BUkLTt1+mKCECczk nix-builder@brix" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIALNEUIxbENTdhSWzYupGFn/q+AGe0diBOTMyiZAmv7F nix-builder@vultr1" ]; -in -{ - imports = [ - ./security.nix - ]; +in { + imports = [ ./security.nix ]; security.acme.email = "admin@cyplo.dev"; security.acme.acceptTerms = true; diff --git a/nixos/shell-config.nix b/nixos/shell-config.nix index 482dc40a..d19b1604 100644 --- a/nixos/shell-config.nix +++ b/nixos/shell-config.nix @@ -1,6 +1,5 @@ { - permittedInsecurePackages = [ - ]; + permittedInsecurePackages = [ ]; packageOverrides = pkgs: { vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; }; }; diff --git a/nixos/sway/default.nix b/nixos/sway/default.nix index f80b1085..5343f6fa 100644 --- a/nixos/sway/default.nix +++ b/nixos/sway/default.nix @@ -1,8 +1,6 @@ { config, pkgs, ... }: -let - mod = "Mod4"; -in -{ +let mod = "Mod4"; +in { services.dbus.packages = with pkgs; [ gnome2.GConf gnome3.dconf ]; services.dbus.socketActivated = true; programs.dconf.enable = true; @@ -12,9 +10,7 @@ in home-manager.users.cyryl = { ... }: { programs.mako.enable = true; - imports = [ - ./keybindings.nix - ]; + imports = [ ./keybindings.nix ]; home.sessionVariables = { XDG_CURRENT_DESKTOP = "Unity"; @@ -41,7 +37,8 @@ in home.file.".config/wofi/style.css".source = ../../.config/wofi/style.css; home.file.".config/waybar/config".source = ../../.config/waybar/config; - home.file.".config/waybar/style.css".source = ../../.config/waybar/style.css; + home.file.".config/waybar/style.css".source = + ../../.config/waybar/style.css; wayland.windowManager.sway = { enable = true; wrapperFeatures.base = true; @@ -50,8 +47,7 @@ in extraConfig = '' default_border none ''; - extraSessionCommands = '' - ''; + extraSessionCommands = ""; config = { modifier = "${mod}"; menu = "${pkgs.wofi}/bin/wofi --show drun,run"; @@ -62,18 +58,20 @@ in titlebar = false; border = 0; }; - bars = [ - { - position = "top"; - command = "${pkgs.waybar}/bin/waybar"; - } - ]; + bars = [{ + position = "top"; + command = "${pkgs.waybar}/bin/waybar"; + }]; startup = [ - { command = "${pkgs.wl-clipboard}/bin/wl-paste -t text --watch ${pkgs.clipman}/bin/clipman store"; } + { + command = + "${pkgs.wl-clipboard}/bin/wl-paste -t text --watch ${pkgs.clipman}/bin/clipman store"; + } { command = "${pkgs.clipman}/bin/clipman restore"; } { - command = ''swayidle -w timeout 300 'swaylock -f -c 000000' timeout 600 'swaymsg "output * dpms off" && systemctl suspend' resume 'swaymsg "output * dpms on"' before-sleep 'swaylock -f -c 657b83' - ''; + command = '' + swayidle -w timeout 300 'swaylock -f -c 000000' timeout 600 'swaymsg "output * dpms off" && systemctl suspend' resume 'swaymsg "output * dpms on"' before-sleep 'swaylock -f -c 657b83' + ''; } ]; output.eDP-1.scale = "1.7"; @@ -81,9 +79,7 @@ in xkb_layout = "pl"; xkb_options = "caps:ctrl_modifier"; }; - input."2:7:SynPS/2_Synaptics_TouchPad" = { - tap = "enabled"; - }; + input."2:7:SynPS/2_Synaptics_TouchPad" = { tap = "enabled"; }; }; }; }; diff --git a/nixos/sway/keybindings.nix b/nixos/sway/keybindings.nix index 7f7291dd..11b5aa1b 100644 --- a/nixos/sway/keybindings.nix +++ b/nixos/sway/keybindings.nix @@ -1,21 +1,25 @@ { config, pkgs, ... }: -let - mod = "Mod4"; -in -{ +let mod = "Mod4"; +in { wayland.windowManager.sway.config.keybindings = { "${mod}+Shift+e" = "exit"; "${mod}+Shift+r" = "reload"; "${mod}+Shift+l" = "exec swaylock -c 657b83"; "${mod}+Return" = "exec ${pkgs.kitty}/bin/kitty"; - "XF86AudioRaiseVolume" = "exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +5%"; - "XF86AudioLowerVolume" = "exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -5%"; - "XF86AudioMute" = "exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle"; - "XF86AudioMicMute" = "exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle"; + "XF86AudioRaiseVolume" = + "exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +5%"; + "XF86AudioLowerVolume" = + "exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -5%"; + "XF86AudioMute" = + "exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle"; + "XF86AudioMicMute" = + "exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle"; - "XF86MonBrightnessUp" = "exec light -s sysfs/backlight/intel_backlight -A 5"; - "XF86MonBrightnessDown" = "exec light -s sysfs/backlight/intel_backlight -U 5"; + "XF86MonBrightnessUp" = + "exec light -s sysfs/backlight/intel_backlight -A 5"; + "XF86MonBrightnessDown" = + "exec light -s sysfs/backlight/intel_backlight -U 5"; "Print" = "exec ${pkgs.gnome3.gnome-screenshot}/bin/gnome-screenshot -i"; diff --git a/nixos/syncthing.nix b/nixos/syncthing.nix index cb028e82..5f5ce7e0 100644 --- a/nixos/syncthing.nix +++ b/nixos/syncthing.nix @@ -1,10 +1,10 @@ -{ config, pkgs, inputs, ... }: -{ +{ config, pkgs, inputs, ... }: { services.syncthing = { enable = true; user = "cyryl"; dataDir = "/home/cyryl/.syncthing"; openDefaultPorts = true; - package = inputs.nixpkgs-nixos-unstable.legacyPackages."x86_64-linux".syncthing; + package = + inputs.nixpkgs-nixos-unstable.legacyPackages."x86_64-linux".syncthing; }; } diff --git a/nixos/tailscale.nix b/nixos/tailscale.nix index 441f4081..d8ade1bb 100644 --- a/nixos/tailscale.nix +++ b/nixos/tailscale.nix @@ -1,9 +1,9 @@ { config, pkgs, inputs, ... }: let - tailscale = inputs.nixpkgs-nixos-unstable.legacyPackages."x86_64-linux".tailscale; + tailscale = + inputs.nixpkgs-nixos-unstable.legacyPackages."x86_64-linux".tailscale; -in -{ +in { environment.systemPackages = [ tailscale ]; services.tailscale = { enable = true; diff --git a/nixos/variables.nix b/nixos/variables.nix index 7a7c7666..a2df0102 100644 --- a/nixos/variables.nix +++ b/nixos/variables.nix @@ -1,5 +1,4 @@ -{ config, lib, ... }: -{ +{ config, lib, ... }: { options.variables = lib.mkOption { type = lib.types.attrs; default = { }; diff --git a/nixos/virtualbox.nix b/nixos/virtualbox.nix index 0db6812b..cded9d93 100644 --- a/nixos/virtualbox.nix +++ b/nixos/virtualbox.nix @@ -1,5 +1,4 @@ -{ config, pkgs, ... }: -{ +{ config, pkgs, ... }: { virtualisation.virtualbox.host = { enable = true; enableExtensionPack = true; diff --git a/nixos/wireguard.nix b/nixos/wireguard.nix index 420dbf76..9097a63b 100644 --- a/nixos/wireguard.nix +++ b/nixos/wireguard.nix @@ -1,7 +1,4 @@ -{ config, pkgs, ... }: -{ - networking.wireguard = { - enable = true; - }; +{ config, pkgs, ... }: { + networking.wireguard = { enable = true; }; } diff --git a/shell.nix b/shell.nix index 83f62865..07b065d7 100644 --- a/shell.nix +++ b/shell.nix @@ -1,7 +1,5 @@ -let - nixpkgs = import { }; -in -with nixpkgs; +let nixpkgs = import { }; +in with nixpkgs; stdenv.mkDerivation { name = "legacy_shell"; buildInputs = [ @@ -11,6 +9,5 @@ stdenv.mkDerivation { cacert git ]; - shellHook = '' - ''; + shellHook = ""; }