From 3a282dbee52810df89c0f95b7a924feb556d3aff Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Wed, 17 May 2023 17:10:18 +0100 Subject: [PATCH] Formatting pass with alejandra --- H0615.nix | 5 ++-- J0162.nix | 5 ++-- Vanguard.nix | 14 +++++----- common.nix | 5 ++-- desktop/hyprland.nix | 7 +++-- desktop/i3.nix | 3 +-- desktop/pkgs/sddm-catppuccin-macchiato.nix | 4 ++- desktop/plasma.nix | 5 ++-- desktop/sddm.nix | 10 +++----- desktop/steam.nix | 5 ++-- desktop/xfce-bspwm.nix | 3 +-- desktop/xfce.nix | 3 +-- desktop/xserver.nix | 3 +-- hardware/audio.nix | 3 +-- hardware/bluetooth.nix | 3 +-- home/H0615/elitherl.nix | 4 +-- home/H0615/root.nix | 2 +- home/J0162/elitherl.nix | 4 +-- home/J0162/root.nix | 2 +- home/Monarch/tux.nix | 3 +-- home/Vanguard/root.nix | 2 +- home/Vanguard/xenia.nix | 6 ++--- home/default.nix | 6 ++--- home/desktop/bspwm.nix | 7 +++-- home/desktop/dunst.nix | 3 +-- home/desktop/eww.nix | 3 +-- home/desktop/gtk.nix | 5 +++- home/desktop/hyprland.nix | 19 ++++++++------ home/desktop/picom.nix | 3 +-- home/desktop/polybar.nix | 5 ++-- home/desktop/rofi.nix | 10 +++----- home/desktop/sway.nix | 7 +++-- home/desktop/swaylock.nix | 3 +-- home/desktop/sxhkd.nix | 3 +-- home/desktop/waybar.nix | 5 ++-- home/desktop/xfce.nix | 3 +-- home/desktop/xresources.nix | 30 ++++++++++++---------- home/env/bash.nix | 4 +-- home/env/bat.nix | 6 ++--- home/env/default.nix | 5 ++-- home/env/direnv.nix | 3 +-- home/env/fish.nix | 4 +-- home/env/keychain.nix | 7 +++-- home/env/nix-index.nix | 3 +-- home/env/readline.nix | 3 +-- home/env/starship.nix | 5 ++-- home/env/zsh.nix | 4 +-- home/git/common.nix | 3 +-- home/git/personal.nix | 5 ++-- home/git/work.nix | 5 ++-- home/gui/default.nix | 5 ++-- home/gui/foot.nix | 5 ++-- home/gui/kitty.nix | 6 ++--- home/gui/urxvt.nix | 7 +++-- home/gui/wezterm.nix | 3 +-- home/personal.nix | 3 +-- home/ssh/common.nix | 5 ++-- home/ssh/personal.nix | 11 ++++---- home/ssh/work.nix | 13 ++++++---- home/tui/config/lazygit.nix | 16 ++++++------ home/tui/default.nix | 3 +-- home/tui/lazygit.nix | 4 +-- home/tui/tmux.nix | 17 +++++++----- home/work.nix | 3 +-- locales/en_GB.nix | 5 +++- server/adguardhome.nix | 17 +++++++----- server/fail2ban.nix | 7 +++-- server/gitea.nix | 15 ++++++----- server/nextcloud.nix | 18 +++++++++---- server/sshd.nix | 5 ++-- server/traefik.nix | 26 +++++++++++-------- syncthing/H0615.nix | 7 +++-- syncthing/Vanguard.nix | 19 +++++++------- syncthing/default.nix | 5 ++-- syncthing/devices/H0615.nix | 5 ++-- syncthing/devices/ion.nix | 5 ++-- syncthing/devices/monarch.nix | 5 ++-- syncthing/devices/northstar.nix | 5 ++-- syncthing/devices/remarkable.nix | 5 ++-- syncthing/devices/vanguard.nix | 5 ++-- syncthing/folders/default.nix | 3 +-- systemd/nixos-pull.nix | 5 ++-- templates/poetry.nix | 10 -------- templates/venv.nix | 8 ++++-- 84 files changed, 259 insertions(+), 292 deletions(-) delete mode 100644 templates/poetry.nix diff --git a/H0615.nix b/H0615.nix index b8b1695b..9b94faae 100644 --- a/H0615.nix +++ b/H0615.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }: -{ +{pkgs, ...}: { imports = [ ./home ./common.nix @@ -15,7 +14,7 @@ users.users.elitherl = { isNormalUser = true; description = "Evie Litherland-Smith"; - extraGroups = [ "networkmanager" "wheel" ]; + extraGroups = ["networkmanager" "wheel"]; shell = pkgs.fish; }; home-manager.users.root = import ./home/H0615/root.nix; diff --git a/J0162.nix b/J0162.nix index 24a8d396..aad7b0c0 100644 --- a/J0162.nix +++ b/J0162.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }: -{ +{pkgs, ...}: { imports = [ ./home ./common.nix @@ -15,7 +14,7 @@ users.users.elitherl = { isNormalUser = true; description = "Evie Litherland-Smith"; - extraGroups = [ "networkmanager" "wheel" ]; + extraGroups = ["networkmanager" "wheel"]; shell = pkgs.fish; }; home-manager.users.root = import ./home/J0162/root.nix; diff --git a/Vanguard.nix b/Vanguard.nix index cdcfbeb6..2ae74bcf 100644 --- a/Vanguard.nix +++ b/Vanguard.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }: -{ +{pkgs, ...}: { imports = [ ./home ./common.nix @@ -17,13 +16,16 @@ networking.hostName = "Vanguard"; # Define your hostname. #networking.wireless.networks."LAN LAN Ranch".pskRaw = "d4c31e976456783b61d573ee49c94f93914a81bf1048c2f2e1e166c36bdfcd4a"; - networking.nameservers = [ "192.168.1.166" "9.9.9.9" ]; - networking.firewall = { enable = true; allowedTCPPorts = [ 22 ]; }; + networking.nameservers = ["192.168.1.166" "9.9.9.9"]; + networking.firewall = { + enable = true; + allowedTCPPorts = [22]; + }; users.users.xenia = { isNormalUser = true; description = "Evie Litherland-Smith"; - extraGroups = [ "networkmanager" "wheel" ]; + extraGroups = ["networkmanager" "wheel"]; shell = pkgs.fish; openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII1tJFdbiyJApuVZFvo9E9kjlBwvXZeySqVuS2qGdxha tux@monarch" @@ -37,7 +39,7 @@ # Extra hardware configuration hardware.openrazer = { enable = true; - users = [ "xenia" ]; + users = ["xenia"]; }; system.autoUpgrade = { diff --git a/common.nix b/common.nix index a1a6228c..2d4e79c4 100644 --- a/common.nix +++ b/common.nix @@ -1,6 +1,5 @@ -{ pkgs, ... }: -{ - nix.settings.experimental-features = [ "nix-command" "flakes" ]; +{pkgs, ...}: { + nix.settings.experimental-features = ["nix-command" "flakes"]; # Allow unfree packages nixpkgs.config.allowUnfree = true; diff --git a/desktop/hyprland.nix b/desktop/hyprland.nix index e8124f1d..0ab637c3 100644 --- a/desktop/hyprland.nix +++ b/desktop/hyprland.nix @@ -1,9 +1,8 @@ -{ pkgs, ... }: -{ +{pkgs, ...}: { nixpkgs.overlays = [ (self: super: { waybar = super.waybar.overrideAttrs (oldAttrs: { - mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ]; + mesonFlags = oldAttrs.mesonFlags ++ ["-Dexperimental=true"]; }); }) ]; @@ -14,7 +13,7 @@ pkgs.pamixer pkgs.pulseaudio ]; - security.pam.services.swaylock = { }; + security.pam.services.swaylock = {}; programs.hyprland = { enable = true; xwayland = { diff --git a/desktop/i3.nix b/desktop/i3.nix index afc5c409..e039dd49 100644 --- a/desktop/i3.nix +++ b/desktop/i3.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }: -{ +{pkgs, ...}: { imports = [ ./xserver.nix ./sddm.nix diff --git a/desktop/pkgs/sddm-catppuccin-macchiato.nix b/desktop/pkgs/sddm-catppuccin-macchiato.nix index c1225eb0..b73c8371 100644 --- a/desktop/pkgs/sddm-catppuccin-macchiato.nix +++ b/desktop/pkgs/sddm-catppuccin-macchiato.nix @@ -1,5 +1,7 @@ -{ stdenv, fetchFromGitHub }: { + stdenv, + fetchFromGitHub, +}: { sddm-catppuccin-macchiato = stdenv.mkDerivation rec { pname = "sddm-catppuccin-macchiato-theme"; version = "1.0"; diff --git a/desktop/plasma.nix b/desktop/plasma.nix index f77a5ae5..305d64ab 100644 --- a/desktop/plasma.nix +++ b/desktop/plasma.nix @@ -1,6 +1,5 @@ -{ pkgs, ... }: -{ - imports = [ ./xserver.nix ./sddm.nix ]; +{pkgs, ...}: { + imports = [./xserver.nix ./sddm.nix]; services.xserver.desktopManager.plasma5.enable = true; programs.kdeconnect.enable = true; environment.systemPackages = with pkgs; [ diff --git a/desktop/sddm.nix b/desktop/sddm.nix index 30dc456e..f9680afc 100644 --- a/desktop/sddm.nix +++ b/desktop/sddm.nix @@ -1,14 +1,12 @@ -{ pkgs, ... }: -let - sddm-catppuccin-macchiato = pkgs.callPackage ./pkgs/sddm-catppuccin-macchiato.nix { }; -in -{ +{pkgs, ...}: let + sddm-catppuccin-macchiato = pkgs.callPackage ./pkgs/sddm-catppuccin-macchiato.nix {}; +in { environment.systemPackages = [ sddm-catppuccin-macchiato.sddm-catppuccin-macchiato ]; services.xserver.displayManager.sddm = { enable = true; theme = "catppuccin-macchiato"; - settings = { General = { InputMethod = ""; }; }; + settings = {General = {InputMethod = "";};}; }; } diff --git a/desktop/steam.nix b/desktop/steam.nix index 96ca9a97..a1bf93ec 100644 --- a/desktop/steam.nix +++ b/desktop/steam.nix @@ -1,6 +1,5 @@ -{ pkgs, ... }: -{ - environment.systemPackages = [ pkgs.mesa ]; +{pkgs, ...}: { + environment.systemPackages = [pkgs.mesa]; programs.gamescope.enable = true; programs.steam = { enable = true; diff --git a/desktop/xfce-bspwm.nix b/desktop/xfce-bspwm.nix index 5f1cf092..87cff369 100644 --- a/desktop/xfce-bspwm.nix +++ b/desktop/xfce-bspwm.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }: -{ +{pkgs, ...}: { imports = [ ./xserver.nix ./sddm.nix diff --git a/desktop/xfce.nix b/desktop/xfce.nix index 59d39263..02280f09 100644 --- a/desktop/xfce.nix +++ b/desktop/xfce.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }: -{ +{pkgs, ...}: { imports = [ ./xserver.nix ./sddm.nix diff --git a/desktop/xserver.nix b/desktop/xserver.nix index 7434a994..38cbc16b 100644 --- a/desktop/xserver.nix +++ b/desktop/xserver.nix @@ -1,5 +1,4 @@ -{ ... }: -{ +{...}: { services.xserver = { enable = true; layout = "gb"; diff --git a/hardware/audio.nix b/hardware/audio.nix index 5afec0db..317d2cb7 100644 --- a/hardware/audio.nix +++ b/hardware/audio.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }: -{ +{pkgs, ...}: { # Enable sound with pipewire. sound.enable = true; hardware.pulseaudio.enable = false; diff --git a/hardware/bluetooth.nix b/hardware/bluetooth.nix index ba340380..56358af9 100644 --- a/hardware/bluetooth.nix +++ b/hardware/bluetooth.nix @@ -1,5 +1,4 @@ -{ ... }: -{ +{...}: { hardware.bluetooth = { enable = true; powerOnBoot = true; diff --git a/home/H0615/elitherl.nix b/home/H0615/elitherl.nix index 8de7c5c3..e7bcefd2 100644 --- a/home/H0615/elitherl.nix +++ b/home/H0615/elitherl.nix @@ -1,5 +1,5 @@ -{ ... }: { - imports = [ ../work.nix ]; +{...}: { + imports = [../work.nix]; # Home Manager needs a bit of information about you and the # paths it should manage. home.username = "elitherl"; diff --git a/home/H0615/root.nix b/home/H0615/root.nix index 02bb7953..ec922de8 100644 --- a/home/H0615/root.nix +++ b/home/H0615/root.nix @@ -1,4 +1,4 @@ -{ ... }: { +{...}: { imports = [ ../env ../tui diff --git a/home/J0162/elitherl.nix b/home/J0162/elitherl.nix index 8de7c5c3..e7bcefd2 100644 --- a/home/J0162/elitherl.nix +++ b/home/J0162/elitherl.nix @@ -1,5 +1,5 @@ -{ ... }: { - imports = [ ../work.nix ]; +{...}: { + imports = [../work.nix]; # Home Manager needs a bit of information about you and the # paths it should manage. home.username = "elitherl"; diff --git a/home/J0162/root.nix b/home/J0162/root.nix index 02bb7953..ec922de8 100644 --- a/home/J0162/root.nix +++ b/home/J0162/root.nix @@ -1,4 +1,4 @@ -{ ... }: { +{...}: { imports = [ ../env ../tui diff --git a/home/Monarch/tux.nix b/home/Monarch/tux.nix index d2ea3403..95e5e218 100644 --- a/home/Monarch/tux.nix +++ b/home/Monarch/tux.nix @@ -1,5 +1,4 @@ -{ ... }: -{ +{...}: { imports = [ ../env ../tui diff --git a/home/Vanguard/root.nix b/home/Vanguard/root.nix index e3f3f874..f3641116 100644 --- a/home/Vanguard/root.nix +++ b/home/Vanguard/root.nix @@ -1,4 +1,4 @@ -{ ... }: { +{...}: { imports = [ ../env ../tui diff --git a/home/Vanguard/xenia.nix b/home/Vanguard/xenia.nix index 241323ca..62c13b15 100644 --- a/home/Vanguard/xenia.nix +++ b/home/Vanguard/xenia.nix @@ -1,9 +1,9 @@ -{ pkgs, ... }: { - imports = [ ../personal.nix ]; +{pkgs, ...}: { + imports = [../personal.nix]; home.username = "xenia"; home.homeDirectory = "/home/xenia"; home.stateVersion = "22.11"; - home.packages = with pkgs; [ prismlauncher ]; + home.packages = with pkgs; [prismlauncher]; # xdg.configFile."hypr/hyprpaper.conf".source = ../desktop/config/hypr/hyprpaper-Vanguard.conf; # wayland.windowManager.hyprland.extraConfig = '' diff --git a/home/default.nix b/home/default.nix index 38c29fdd..08cbdd28 100644 --- a/home/default.nix +++ b/home/default.nix @@ -1,5 +1,3 @@ -{ ... }: -let +{...}: let home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/master.tar.gz"; -in -{ imports = [ (import "${home-manager}/nixos") ]; } +in {imports = [(import "${home-manager}/nixos")];} diff --git a/home/desktop/bspwm.nix b/home/desktop/bspwm.nix index c64f2281..0ea97fa1 100644 --- a/home/desktop/bspwm.nix +++ b/home/desktop/bspwm.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }: -{ +{pkgs, ...}: { home.packages = with pkgs; [ nitrogen polybar @@ -18,7 +17,7 @@ pointer_action3 = "resize_corner"; }; monitors = { - "primary" = [ "I" "II" "III" "IV" "V" "VI" "VII" "VIII" "IX" ]; + "primary" = ["I" "II" "III" "IV" "V" "VI" "VII" "VIII" "IX"]; }; rules = { "Xfce4-terminal".state = "floating"; @@ -37,6 +36,6 @@ "Bitwarden".desktop = "^7"; "Nxplayer.bin".desktop = "^8"; }; - extraConfig = builtins.readFile (./config/bspwm/startup.sh); + extraConfig = builtins.readFile ./config/bspwm/startup.sh; }; } diff --git a/home/desktop/dunst.nix b/home/desktop/dunst.nix index 10f48fc0..de5a55bf 100644 --- a/home/desktop/dunst.nix +++ b/home/desktop/dunst.nix @@ -1,5 +1,4 @@ -{ ... }: -{ +{...}: { services.dunst = { enable = true; settings = { diff --git a/home/desktop/eww.nix b/home/desktop/eww.nix index 4febadb4..c0fa7688 100644 --- a/home/desktop/eww.nix +++ b/home/desktop/eww.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }: -{ +{pkgs, ...}: { home.packages = with pkgs; [ jq socat diff --git a/home/desktop/gtk.nix b/home/desktop/gtk.nix index 1d2d397c..bc6ae543 100644 --- a/home/desktop/gtk.nix +++ b/home/desktop/gtk.nix @@ -1,5 +1,8 @@ -{ pkgs, config, ... }: { + pkgs, + config, + ... +}: { gtk = { enable = true; cursorTheme = { diff --git a/home/desktop/hyprland.nix b/home/desktop/hyprland.nix index 39df72ac..28a9b75a 100644 --- a/home/desktop/hyprland.nix +++ b/home/desktop/hyprland.nix @@ -1,12 +1,12 @@ -{ pkgs, ... }: -let +{pkgs, ...}: let flake-compat = builtins.fetchTarball "https://github.com/edolstra/flake-compat/archive/master.tar.gz"; - hyprland = (import flake-compat { - src = builtins.fetchTarball "https://github.com/hyprwm/Hyprland/archive/2df0d034bc4a18fafb3524401eeeceaa6b23e753.tar.gz"; - }).defaultNix; -in -{ + hyprland = + (import flake-compat { + src = builtins.fetchTarball "https://github.com/hyprwm/Hyprland/archive/2df0d034bc4a18fafb3524401eeeceaa6b23e753.tar.gz"; + }) + .defaultNix; +in { imports = [ hyprland.homeManagerModules.default ./swaylock.nix @@ -29,6 +29,9 @@ in xdg.configFile."hypr/window-rules.conf".source = ./config/hypr/window-rules.conf; wayland.windowManager.hyprland = { enable = true; - xwayland = { enable = true; hidpi = true; }; + xwayland = { + enable = true; + hidpi = true; + }; }; } diff --git a/home/desktop/picom.nix b/home/desktop/picom.nix index 3cdd49b9..d52cd3ab 100644 --- a/home/desktop/picom.nix +++ b/home/desktop/picom.nix @@ -1,5 +1,4 @@ -{ ... }: -{ +{...}: { services.picom = { enable = true; backend = "glx"; diff --git a/home/desktop/polybar.nix b/home/desktop/polybar.nix index a011beba..2b1c976a 100644 --- a/home/desktop/polybar.nix +++ b/home/desktop/polybar.nix @@ -1,6 +1,5 @@ -{ pkgs, ... }: -{ - home.packages = with pkgs; [ bluez ]; +{pkgs, ...}: { + home.packages = with pkgs; [bluez]; services.polybar = { enable = true; config = ./config/polybar/polybar.ini; diff --git a/home/desktop/rofi.nix b/home/desktop/rofi.nix index 9ba8760c..e959b739 100644 --- a/home/desktop/rofi.nix +++ b/home/desktop/rofi.nix @@ -1,11 +1,9 @@ -{ pkgs, ... }: -let +{pkgs, ...}: let powermenu = pkgs.writeShellScriptBin "powermenu" (builtins.readFile ./scripts/powermenu); power-profiles = pkgs.writeShellScriptBin "power-profiles" (builtins.readFile ./scripts/power-profiles); -in -{ - imports = [ ../gui/foot.nix ]; - home.packages = with pkgs; [ papirus-icon-theme powermenu power-profiles ]; +in { + imports = [../gui/foot.nix]; + home.packages = with pkgs; [papirus-icon-theme powermenu power-profiles]; programs.rofi = { enable = true; location = "center"; diff --git a/home/desktop/sway.nix b/home/desktop/sway.nix index 0c955052..984d5a1e 100644 --- a/home/desktop/sway.nix +++ b/home/desktop/sway.nix @@ -1,6 +1,5 @@ -{ pkgs, ... }: -{ +{pkgs, ...}: { #xdg.configFile."sway".source = ./config/sway; - home.packages = with pkgs; [ brightnessctl ]; - wayland.windowManager.sway = { enable = true; }; + home.packages = with pkgs; [brightnessctl]; + wayland.windowManager.sway = {enable = true;}; } diff --git a/home/desktop/swaylock.nix b/home/desktop/swaylock.nix index 59b4c733..954a5fe3 100644 --- a/home/desktop/swaylock.nix +++ b/home/desktop/swaylock.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }: -{ +{pkgs, ...}: { programs.swaylock = { enable = true; package = pkgs.swaylock-effects; diff --git a/home/desktop/sxhkd.nix b/home/desktop/sxhkd.nix index 65685672..86a8bac4 100644 --- a/home/desktop/sxhkd.nix +++ b/home/desktop/sxhkd.nix @@ -1,5 +1,4 @@ -{ ... }: -{ +{...}: { services.sxhkd = { enable = true; keybindings = { diff --git a/home/desktop/waybar.nix b/home/desktop/waybar.nix index 904ebe3d..735d8ba6 100644 --- a/home/desktop/waybar.nix +++ b/home/desktop/waybar.nix @@ -1,7 +1,6 @@ -{ pkgs, ... }: -{ +{pkgs, ...}: { home.packages = with pkgs; [ - (nerdfonts.override { fonts = [ "FiraCode" ]; }) + (nerdfonts.override {fonts = ["FiraCode"];}) bluez ]; xdg.configFile."waybar" = { diff --git a/home/desktop/xfce.nix b/home/desktop/xfce.nix index b08eea21..2c165700 100644 --- a/home/desktop/xfce.nix +++ b/home/desktop/xfce.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }: -{ +{pkgs, ...}: { imports = [ ./gtk.nix ./bspwm.nix diff --git a/home/desktop/xresources.nix b/home/desktop/xresources.nix index 1218d453..c9409465 100644 --- a/home/desktop/xresources.nix +++ b/home/desktop/xresources.nix @@ -1,21 +1,25 @@ -{ pkgs, ... }: -{ - xresources.extraConfig = builtins.readFile +{pkgs, ...}: { + xresources.extraConfig = + builtins.readFile ( pkgs.fetchFromGitHub - { - owner = "catppuccin"; - repo = "xresources"; - rev = "d82c02323e05158ad35f302771e3695affafab78"; - sha256 = "irRQPjvcTH6AUC07Sm2l77CkrZQNHNJXxBDBSIhl1Fg="; - } + "/macchiato.Xresources" - ) + "\n" + builtins.readFile ( - pkgs.fetchFromGitHub + { + owner = "catppuccin"; + repo = "xresources"; + rev = "d82c02323e05158ad35f302771e3695affafab78"; + sha256 = "irRQPjvcTH6AUC07Sm2l77CkrZQNHNJXxBDBSIhl1Fg="; + } + + "/macchiato.Xresources" + ) + + "\n" + + builtins.readFile ( + pkgs.fetchFromGitHub { owner = "catppuccin"; repo = "urxvt"; rev = "ccd8eb763edd0a382b5e9bbfbd9697c4d4129edf"; sha256 = "YFlSGJzWWB57eSXiUY4l/mSBbOY0an+qej6//YLSiuE="; - } + "/macchiato.Xresources" - ); + } + + "/macchiato.Xresources" + ); } diff --git a/home/env/bash.nix b/home/env/bash.nix index 6de6f2a3..1ba208cd 100644 --- a/home/env/bash.nix +++ b/home/env/bash.nix @@ -1,6 +1,4 @@ -{ ... }: - -{ +{...}: { programs.bash = { enable = true; shellAliases = { diff --git a/home/env/bat.nix b/home/env/bat.nix index 28eb0838..bc8f41c9 100644 --- a/home/env/bat.nix +++ b/home/env/bat.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }: -{ +{pkgs, ...}: { programs.bat = { enable = true; config = { @@ -12,7 +11,8 @@ repo = "bat"; rev = "ba4d16880d63e656acced2b7d4e034e4a93f74b1"; sha256 = "6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw="; - } + "/Catppuccin-macchiato.tmTheme"); + } + + "/Catppuccin-macchiato.tmTheme"); }; }; } diff --git a/home/env/default.nix b/home/env/default.nix index f20a6b4c..ad44baf5 100644 --- a/home/env/default.nix +++ b/home/env/default.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }: -{ +{pkgs, ...}: { imports = [ ./bash.nix ./bat.nix @@ -11,5 +10,5 @@ ./starship.nix ./zsh.nix ]; - home.packages = with pkgs; [ dig file gnumake silver-searcher ]; + home.packages = with pkgs; [dig file gnumake silver-searcher]; } diff --git a/home/env/direnv.nix b/home/env/direnv.nix index 3288fcc3..dd836e9c 100644 --- a/home/env/direnv.nix +++ b/home/env/direnv.nix @@ -1,4 +1,3 @@ -{ ... }: -{ +{...}: { programs.direnv.enable = true; } diff --git a/home/env/fish.nix b/home/env/fish.nix index e094312c..c758d1f9 100644 --- a/home/env/fish.nix +++ b/home/env/fish.nix @@ -1,6 +1,4 @@ -{ ... }: - -{ +{...}: { programs.fish = { enable = true; shellAbbrs = { diff --git a/home/env/keychain.nix b/home/env/keychain.nix index 5d1cd661..2428d440 100644 --- a/home/env/keychain.nix +++ b/home/env/keychain.nix @@ -1,9 +1,8 @@ -{ ... }: -{ +{...}: { programs.keychain = { enable = true; - extraFlags = [ "--quiet" "--noask" "--ignore-missing" ]; - keys = [ "id_rsa" "id_ed25519" ]; + extraFlags = ["--quiet" "--noask" "--ignore-missing"]; + keys = ["id_rsa" "id_ed25519"]; enableXsessionIntegration = true; }; } diff --git a/home/env/nix-index.nix b/home/env/nix-index.nix index 3cbafd76..367b8819 100644 --- a/home/env/nix-index.nix +++ b/home/env/nix-index.nix @@ -1,4 +1,3 @@ -{ ... }: -{ +{...}: { programs.nix-index.enable = true; } diff --git a/home/env/readline.nix b/home/env/readline.nix index 4c93ad19..0936390e 100644 --- a/home/env/readline.nix +++ b/home/env/readline.nix @@ -1,5 +1,4 @@ -{ ... }: -{ +{...}: { programs.readline = { enable = true; includeSystemConfig = true; diff --git a/home/env/starship.nix b/home/env/starship.nix index 2c36d8f5..2119b956 100644 --- a/home/env/starship.nix +++ b/home/env/starship.nix @@ -1,6 +1,5 @@ -{ pkgs, ... }: -{ - home.packages = with pkgs; [ (nerdfonts.override { fonts = [ "FiraCode" ]; }) ]; +{pkgs, ...}: { + home.packages = with pkgs; [(nerdfonts.override {fonts = ["FiraCode"];})]; xdg.configFile."starship.toml".source = ./config/starship.toml; programs.starship.enable = true; } diff --git a/home/env/zsh.nix b/home/env/zsh.nix index 46c752dc..cd94ea9d 100644 --- a/home/env/zsh.nix +++ b/home/env/zsh.nix @@ -1,6 +1,4 @@ -{ config, ... }: - -{ +{config, ...}: { programs.zsh = { enable = true; shellAliases = { diff --git a/home/git/common.nix b/home/git/common.nix index 4cecf758..c3ba232f 100644 --- a/home/git/common.nix +++ b/home/git/common.nix @@ -1,5 +1,4 @@ -{ ... }: -{ +{...}: { programs.git = { enable = true; userName = "Evie Litherland-Smith"; diff --git a/home/git/personal.nix b/home/git/personal.nix index d856ccaf..f09b769b 100644 --- a/home/git/personal.nix +++ b/home/git/personal.nix @@ -1,5 +1,4 @@ -{ ... }: -{ - imports = [ ./common.nix ]; +{...}: { + imports = [./common.nix]; programs.git.userEmail = "evie@xenia.me.uk"; } diff --git a/home/git/work.nix b/home/git/work.nix index 1f000e6e..2e6803a4 100644 --- a/home/git/work.nix +++ b/home/git/work.nix @@ -1,5 +1,4 @@ -{ ... }: -{ - imports = [ ./common.nix ]; +{...}: { + imports = [./common.nix]; programs.git.userEmail = "evie.litherland-smith@ukaea.uk"; } diff --git a/home/gui/default.nix b/home/gui/default.nix index d5f12dd2..f0f3a98d 100644 --- a/home/gui/default.nix +++ b/home/gui/default.nix @@ -1,6 +1,5 @@ -{ pkgs, ... }: -{ - imports = [ ./wezterm.nix ]; +{pkgs, ...}: { + imports = [./wezterm.nix]; programs.firefox.enable = true; programs.librewolf.enable = true; home.packages = with pkgs; [ diff --git a/home/gui/foot.nix b/home/gui/foot.nix index 601bc262..1697ccec 100644 --- a/home/gui/foot.nix +++ b/home/gui/foot.nix @@ -1,6 +1,5 @@ -{ pkgs, ... }: -{ - home.packages = with pkgs; [ (nerdfonts.override { fonts = [ "FiraCode" ]; }) ]; +{pkgs, ...}: { + home.packages = with pkgs; [(nerdfonts.override {fonts = ["FiraCode"];})]; programs.foot = { enable = true; settings = { diff --git a/home/gui/kitty.nix b/home/gui/kitty.nix index 82af5255..b7fccee9 100644 --- a/home/gui/kitty.nix +++ b/home/gui/kitty.nix @@ -1,10 +1,8 @@ -{ pkgs, ... }: - -{ +{pkgs, ...}: { programs.kitty = { enable = true; font = { - package = with pkgs; (nerdfonts.override { fonts = [ "FiraCode" ]; }); + package = with pkgs; (nerdfonts.override {fonts = ["FiraCode"];}); name = "Fira Code Nerd Font"; size = 14; }; diff --git a/home/gui/urxvt.nix b/home/gui/urxvt.nix index fe480bea..d9ae8505 100644 --- a/home/gui/urxvt.nix +++ b/home/gui/urxvt.nix @@ -1,8 +1,7 @@ -{ pkgs, ... }: -{ - home.packages = with pkgs; [ (nerdfonts.override { fonts = [ "FiraCode" ]; }) ]; +{pkgs, ...}: { + home.packages = with pkgs; [(nerdfonts.override {fonts = ["FiraCode"];})]; programs.urxvt = { enable = true; - fonts = [ "xft:FiraCode Nerd Font Mono:pixelsize=16" ]; + fonts = ["xft:FiraCode Nerd Font Mono:pixelsize=16"]; }; } diff --git a/home/gui/wezterm.nix b/home/gui/wezterm.nix index f15f2238..44e3b3d3 100644 --- a/home/gui/wezterm.nix +++ b/home/gui/wezterm.nix @@ -1,5 +1,4 @@ -{ ... }: -{ +{...}: { programs.wezterm = { enable = true; extraConfig = '' diff --git a/home/personal.nix b/home/personal.nix index 07923256..0a68586f 100644 --- a/home/personal.nix +++ b/home/personal.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }: -{ +{pkgs, ...}: { imports = [ ./env ./gui diff --git a/home/ssh/common.nix b/home/ssh/common.nix index 9d2f527b..7a88ed38 100644 --- a/home/ssh/common.nix +++ b/home/ssh/common.nix @@ -1,5 +1,4 @@ -{ ... }: -{ +{...}: { programs.ssh = { enable = true; forwardAgent = true; @@ -7,6 +6,6 @@ serverAliveCountMax = 3; controlMaster = "auto"; controlPersist = "1s"; - matchBlocks = { "git.*".user = "git"; }; + matchBlocks = {"git.*".user = "git";}; }; } diff --git a/home/ssh/personal.nix b/home/ssh/personal.nix index 6fc8acbd..9ceb8e87 100644 --- a/home/ssh/personal.nix +++ b/home/ssh/personal.nix @@ -1,10 +1,9 @@ -{ lib, ... }: -{ - imports = [ ./common.nix ]; +{lib, ...}: { + imports = [./common.nix]; programs.ssh.matchBlocks = { - "vanguard" = { user = "xenia"; }; - "git.xenia.me.uk" = lib.hm.dag.entryBefore [ "git.*" ] { user = "gitea"; }; - "vanguard *xenia.me.uk" = lib.hm.dag.entryAfter [ "vanguard" ] { + "vanguard" = {user = "xenia";}; + "git.xenia.me.uk" = lib.hm.dag.entryBefore ["git.*"] {user = "gitea";}; + "vanguard *xenia.me.uk" = lib.hm.dag.entryAfter ["vanguard"] { hostname = "192.168.1.166"; port = 2222; }; diff --git a/home/ssh/work.nix b/home/ssh/work.nix index 1ae13f3d..98fce961 100644 --- a/home/ssh/work.nix +++ b/home/ssh/work.nix @@ -1,7 +1,10 @@ -{ pkgs, lib, ... }: { - imports = [ ./common.nix ]; - home.packages = with pkgs; [ sshfs ]; + pkgs, + lib, + ... +}: { + imports = [./common.nix]; + home.packages = with pkgs; [sshfs]; programs.ssh.matchBlocks = { "batch" = { user = "cxsbatch"; @@ -20,10 +23,10 @@ "freia" = { hostname = "freia022.hpc.l"; }; - "freia???" = lib.hm.dag.entryAfter [ "freia" ] { + "freia???" = lib.hm.dag.entryAfter ["freia"] { hostname = "%h.hpc.l"; }; - "freia* jupyter" = lib.hm.dag.entryAfter [ "freia" "freia???" "jupyter" ] { + "freia* jupyter" = lib.hm.dag.entryAfter ["freia" "freia???" "jupyter"] { user = "elitherl"; }; }; diff --git a/home/tui/config/lazygit.nix b/home/tui/config/lazygit.nix index fd5f1e77..b6bdfe7c 100644 --- a/home/tui/config/lazygit.nix +++ b/home/tui/config/lazygit.nix @@ -5,14 +5,14 @@ showIcons = true; theme = { lightTheme = false; - activeBorderColor = [ "#a6da95" "bold" ]; - inactiveBorderColor = [ "#cad3f5" ]; - optionsTextColor = [ "#8aadf4" ]; - selectedLineBgColor = [ "#363a4f" ]; - selectedRangeBgColor = [ "#363a4f" ]; - cherryPickedCommitBgColor = [ "#8bd5ca" ]; - cherryPickedCommitFgColor = [ "#8aadf4" ]; - unstagedChangesColor = [ "red" ]; + activeBorderColor = ["#a6da95" "bold"]; + inactiveBorderColor = ["#cad3f5"]; + optionsTextColor = ["#8aadf4"]; + selectedLineBgColor = ["#363a4f"]; + selectedRangeBgColor = ["#363a4f"]; + cherryPickedCommitBgColor = ["#8bd5ca"]; + cherryPickedCommitFgColor = ["#8aadf4"]; + unstagedChangesColor = ["red"]; }; }; update.method = "never"; diff --git a/home/tui/default.nix b/home/tui/default.nix index 0d66df78..767c5ea1 100644 --- a/home/tui/default.nix +++ b/home/tui/default.nix @@ -1,5 +1,4 @@ -{ ... }: -{ +{...}: { imports = [ ./neovim.nix ./lazygit.nix diff --git a/home/tui/lazygit.nix b/home/tui/lazygit.nix index 3747bb17..064fd119 100644 --- a/home/tui/lazygit.nix +++ b/home/tui/lazygit.nix @@ -1,6 +1,4 @@ -{ ... }: - -{ +{...}: { programs.lazygit = { enable = true; settings = import ./config/lazygit.nix; diff --git a/home/tui/tmux.nix b/home/tui/tmux.nix index 2e68cc55..42b6c0e3 100644 --- a/home/tui/tmux.nix +++ b/home/tui/tmux.nix @@ -1,17 +1,20 @@ -{ pkgs, ... }: -{ - imports = [ ./common.nix ]; +{pkgs, ...}: { + imports = [./common.nix]; programs.tmux = { enable = true; clock24 = true; - extraConfig = builtins.readFile (./config/tmux.conf) + "\n" + builtins.readFile ( - pkgs.fetchFromGitHub + extraConfig = + builtins.readFile ./config/tmux.conf + + "\n" + + builtins.readFile ( + pkgs.fetchFromGitHub { owner = "catppuccin"; repo = "tmux"; rev = "4e48b09a76829edc7b55fbb15467cf0411f07931"; sha256 = "bXEsxt4ozl3cAzV3ZyvbPsnmy0RAdpLxHwN82gvjLdU="; - } + "/catppuccin-macchiato.tmuxtheme" - ); + } + + "/catppuccin-macchiato.tmuxtheme" + ); }; } diff --git a/home/work.nix b/home/work.nix index c8e6f930..0d17b060 100644 --- a/home/work.nix +++ b/home/work.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }: -{ +{pkgs, ...}: { imports = [ ./env ./gui diff --git a/locales/en_GB.nix b/locales/en_GB.nix index 79d716b4..3ab3785f 100644 --- a/locales/en_GB.nix +++ b/locales/en_GB.nix @@ -1,5 +1,8 @@ -{ config, pkgs, ... }: { + config, + pkgs, + ... +}: { # Set your time zone. time.timeZone = "Europe/London"; diff --git a/server/adguardhome.nix b/server/adguardhome.nix index b6eef2db..dcb532a1 100644 --- a/server/adguardhome.nix +++ b/server/adguardhome.nix @@ -1,6 +1,5 @@ -{ ... }: -{ - imports = [ ./traefik.nix ]; +{...}: { + imports = [./traefik.nix]; services.adguardhome = { enable = true; mutableSettings = true; @@ -8,11 +7,15 @@ openFirewall = true; }; networking.firewall = { - allowedTCPPorts = [ 53 ]; - allowedUDPPorts = [ 53 ]; + allowedTCPPorts = [53]; + allowedUDPPorts = [53]; }; services.traefik.dynamicConfigOptions.http = { - routers.adguard = { rule = "Host(`guard.xenia.me.uk`)"; service = "adguard-webinterface"; tls = { certResolver = "default"; }; }; - services.adguard-webinterface.loadBalancer.servers = [{ url = "http://localhost:3001"; }]; + routers.adguard = { + rule = "Host(`guard.xenia.me.uk`)"; + service = "adguard-webinterface"; + tls = {certResolver = "default";}; + }; + services.adguard-webinterface.loadBalancer.servers = [{url = "http://localhost:3001";}]; }; } diff --git a/server/fail2ban.nix b/server/fail2ban.nix index 78536c70..d7f8fcd7 100644 --- a/server/fail2ban.nix +++ b/server/fail2ban.nix @@ -1,8 +1,7 @@ -{ ... }: -{ +{...}: { services.fail2ban = { enable = true; - ignoreIP = [ "127.0.0.1/8" "::1" "192.168.1.0/16" ]; - bantime-increment = { enable = true; }; + ignoreIP = ["127.0.0.1/8" "::1" "192.168.1.0/16"]; + bantime-increment = {enable = true;}; }; } diff --git a/server/gitea.nix b/server/gitea.nix index 150a6e0f..9e255d79 100644 --- a/server/gitea.nix +++ b/server/gitea.nix @@ -1,6 +1,5 @@ -{ ... }: -{ - imports = [ ./traefik.nix ./fail2ban.nix ]; +{...}: { + imports = [./traefik.nix ./fail2ban.nix]; services.gitea = { enable = true; settings = { @@ -13,10 +12,14 @@ }; appName = "Gitea"; }; - networking.firewall.allowedTCPPorts = [ 80 443 2222 ]; + networking.firewall.allowedTCPPorts = [80 443 2222]; services.traefik.dynamicConfigOptions.http = { - routers.gitea = { rule = "Host(`git.xenia.me.uk`)"; service = "gitea-websecure"; tls = { certResolver = "default"; }; }; - services.gitea-websecure.loadBalancer.servers = [{ url = "http://localhost:3000"; }]; + routers.gitea = { + rule = "Host(`git.xenia.me.uk`)"; + service = "gitea-websecure"; + tls = {certResolver = "default";}; + }; + services.gitea-websecure.loadBalancer.servers = [{url = "http://localhost:3000";}]; }; services.fail2ban.jails.gitea = '' enabled = true diff --git a/server/nextcloud.nix b/server/nextcloud.nix index e54da9a3..6c0206ca 100644 --- a/server/nextcloud.nix +++ b/server/nextcloud.nix @@ -1,6 +1,9 @@ -{ pkgs, config, ... }: { - imports = [ ./traefik.nix ./fail2ban.nix ]; + pkgs, + config, + ... +}: { + imports = [./traefik.nix ./fail2ban.nix]; services.nextcloud = { enable = true; package = pkgs.nextcloud26; @@ -10,13 +13,18 @@ adminpassFile = "/secrets/nextcloud_admin.txt"; }; }; - services.nginx.virtualHosts.${config.services.nextcloud.hostName}.listen = [{ addr = "localhost"; port = 8000; }]; + services.nginx.virtualHosts.${config.services.nextcloud.hostName}.listen = [ + { + addr = "localhost"; + port = 8000; + } + ]; services.traefik.dynamicConfigOptions.http = { routers.nextcloud = { rule = "Host(`cloud.xenia.me.uk`)"; service = "nextcloud-webinterface"; - tls = { certResolver = "default"; }; + tls = {certResolver = "default";}; }; - services.nextcloud-webinterface.loadBalancer.servers = [{ url = "http://localhost:8000"; }]; + services.nextcloud-webinterface.loadBalancer.servers = [{url = "http://localhost:8000";}]; }; } diff --git a/server/sshd.nix b/server/sshd.nix index fad15efd..511a07f7 100644 --- a/server/sshd.nix +++ b/server/sshd.nix @@ -1,8 +1,7 @@ -{ ... }: -{ +{...}: { services.openssh = { enable = true; - ports = [ 2222 ]; + ports = [2222]; settings = { UseDns = true; PermitRootLogin = "no"; diff --git a/server/traefik.nix b/server/traefik.nix index 26179ad3..97fee21f 100644 --- a/server/traefik.nix +++ b/server/traefik.nix @@ -1,30 +1,36 @@ -{ ... }: -{ - imports = [ ./fail2ban.nix ]; +{...}: { + imports = [./fail2ban.nix]; services.traefik = { enable = true; staticConfigOptions = { - api = { insecure = true; }; + api = {insecure = true;}; entryPoints = { - http = { address = ":80"; }; - https = { address = ":443"; }; + http = {address = ":80";}; + https = {address = ":443";}; }; certificatesResolvers = { default = { acme = { email = "evie@xenia.me.uk"; storage = "/var/lib/traefik/acme.json"; - httpChallenge = { entryPoint = "http"; }; + httpChallenge = {entryPoint = "http";}; }; }; }; }; dynamicConfigOptions.http = { - routers.traefik = { rule = "Host(`traefik.xenia.me.uk`)"; service = "traefik-webinterface"; tls = { certResolver = "default"; }; }; - services.traefik-webinterface.loadBalancer.servers = [{ url = "http://localhost:8080"; }]; + routers.traefik = { + rule = "Host(`traefik.xenia.me.uk`)"; + service = "traefik-webinterface"; + tls = {certResolver = "default";}; + }; + services.traefik-webinterface.loadBalancer.servers = [{url = "http://localhost:8080";}]; }; }; - networking.firewall = { enable = true; allowedTCPPorts = [ 80 443 8080 ]; }; + networking.firewall = { + enable = true; + allowedTCPPorts = [80 443 8080]; + }; services.fail2ban.jails.traefik = '' enabled = true filter = traefik-auth diff --git a/syncthing/H0615.nix b/syncthing/H0615.nix index 7f4358cb..b814bbae 100644 --- a/syncthing/H0615.nix +++ b/syncthing/H0615.nix @@ -1,6 +1,5 @@ -{ ... }: -{ - imports = [ ./default.nix ./devices/ion.nix ]; +{...}: { + imports = [./default.nix ./devices/ion.nix]; services.syncthing = { user = "elitherl"; group = "users"; @@ -10,7 +9,7 @@ path = "/home/elitherl/Sync"; label = "UKAEA"; id = "fwzht-j7hrc"; - devices = [ "ion" ]; + devices = ["ion"]; ignorePerms = true; enable = true; }; diff --git a/syncthing/Vanguard.nix b/syncthing/Vanguard.nix index 59e548f8..86d86fe5 100644 --- a/syncthing/Vanguard.nix +++ b/syncthing/Vanguard.nix @@ -1,5 +1,4 @@ -{ ... }: -{ +{...}: { imports = [ ./default.nix ./devices/ion.nix @@ -14,42 +13,42 @@ folders = { "Archive" = { path = "/mnt/secondary/syncthing/archive"; - devices = [ "ion" "monarch" "northstar" ]; + devices = ["ion" "monarch" "northstar"]; enable = true; }; "Books" = { path = "/mnt/secondary/syncthing/books"; - devices = [ "monarch" "northstar" "remarkable" ]; + devices = ["monarch" "northstar" "remarkable"]; enable = true; }; "Camera" = { path = "/mnt/secondary/syncthing/camera"; - devices = [ "ion" ]; + devices = ["ion"]; enable = true; }; "Documents" = { path = "/mnt/secondary/syncthing/documents"; - devices = [ "monarch" "northstar" ]; + devices = ["monarch" "northstar"]; enable = true; }; "Exports" = { path = "/mnt/secondary/syncthing/exports"; - devices = [ "monarch"]; + devices = ["monarch"]; enable = true; }; "Movies" = { path = "/mnt/secondary/syncthing/movies"; - devices = [ "ion" "monarch" "northstar" ]; + devices = ["ion" "monarch" "northstar"]; enable = true; }; "Pictures" = { path = "/mnt/secondary/syncthing/pictures"; - devices = [ "ion" "monarch" "northstar" ]; + devices = ["ion" "monarch" "northstar"]; enable = true; }; "Xochitl" = { path = "/mnt/secondary/syncthing/xochitl"; - devices = [ "remarkable" ]; + devices = ["remarkable"]; enable = true; }; }; diff --git a/syncthing/default.nix b/syncthing/default.nix index be1dfa26..7fe8adf5 100644 --- a/syncthing/default.nix +++ b/syncthing/default.nix @@ -1,6 +1,5 @@ -{ lib, ... }: -{ - imports = [ ./folders ]; +{lib, ...}: { + imports = [./folders]; services.syncthing = { enable = true; systemService = true; diff --git a/syncthing/devices/H0615.nix b/syncthing/devices/H0615.nix index 6ca02a1f..7e83bc20 100644 --- a/syncthing/devices/H0615.nix +++ b/syncthing/devices/H0615.nix @@ -1,4 +1,3 @@ -{ ... }: -{ - services.syncthing.devices."H0615" = { id = "VVKKUT6-DMNEJ6J-ZI2QREG-SOLG7S5-V2V6WN3-UCQH2EN-6S2XXLS-FKN6KQF"; }; +{...}: { + services.syncthing.devices."H0615" = {id = "VVKKUT6-DMNEJ6J-ZI2QREG-SOLG7S5-V2V6WN3-UCQH2EN-6S2XXLS-FKN6KQF";}; } diff --git a/syncthing/devices/ion.nix b/syncthing/devices/ion.nix index 462be82e..b3083bd1 100644 --- a/syncthing/devices/ion.nix +++ b/syncthing/devices/ion.nix @@ -1,4 +1,3 @@ -{ ... }: -{ - services.syncthing.devices."ion" = { id = "7DD4NPH-6T2ET5A-4FCLFWW-CS6UR2W-IO5XQXC-DM5B2Q4-6X7DGU2-UKKVEAB"; }; +{...}: { + services.syncthing.devices."ion" = {id = "7DD4NPH-6T2ET5A-4FCLFWW-CS6UR2W-IO5XQXC-DM5B2Q4-6X7DGU2-UKKVEAB";}; } diff --git a/syncthing/devices/monarch.nix b/syncthing/devices/monarch.nix index 4db1adc8..210f0a12 100644 --- a/syncthing/devices/monarch.nix +++ b/syncthing/devices/monarch.nix @@ -1,4 +1,3 @@ -{ ... }: -{ - services.syncthing.devices."monarch" = { id = "CJSUZQY-67XBLEZ-VKVHQHI-BLEUZNF-G4237AV-AW44CGH-F3JDKXU-CWT3RQZ"; }; +{...}: { + services.syncthing.devices."monarch" = {id = "CJSUZQY-67XBLEZ-VKVHQHI-BLEUZNF-G4237AV-AW44CGH-F3JDKXU-CWT3RQZ";}; } diff --git a/syncthing/devices/northstar.nix b/syncthing/devices/northstar.nix index 7d0a34c9..b3390d65 100644 --- a/syncthing/devices/northstar.nix +++ b/syncthing/devices/northstar.nix @@ -1,4 +1,3 @@ -{ ... }: -{ - services.syncthing.devices."northstar" = { id = "DMQZNMB-BM3SSE4-5XV2GHE-IDRNFTS-QNZSICS-6JWHUCV-O3NHMWY-2OBC2QD"; }; +{...}: { + services.syncthing.devices."northstar" = {id = "DMQZNMB-BM3SSE4-5XV2GHE-IDRNFTS-QNZSICS-6JWHUCV-O3NHMWY-2OBC2QD";}; } diff --git a/syncthing/devices/remarkable.nix b/syncthing/devices/remarkable.nix index 45995167..92161962 100644 --- a/syncthing/devices/remarkable.nix +++ b/syncthing/devices/remarkable.nix @@ -1,4 +1,3 @@ -{ ... }: -{ - services.syncthing.devices."remarkable" = { id = "GHB6JKS-JOA3HHP-TYHB3IJ-GLV26QW-RWRZAMG-XYFGFB6-QLUHDSH-GNPZVAO"; }; +{...}: { + services.syncthing.devices."remarkable" = {id = "GHB6JKS-JOA3HHP-TYHB3IJ-GLV26QW-RWRZAMG-XYFGFB6-QLUHDSH-GNPZVAO";}; } diff --git a/syncthing/devices/vanguard.nix b/syncthing/devices/vanguard.nix index ec4d4bdc..fc9a7cbb 100644 --- a/syncthing/devices/vanguard.nix +++ b/syncthing/devices/vanguard.nix @@ -1,4 +1,3 @@ -{ ... }: -{ - services.syncthing.devices."vanguard" = { id = "YNGBLJP-TWY6Y3C-DPPYAWL-3ZQFNQH-RDPIU5T-L54UI62-FPPA3JQ-WYXBZQZ"; }; +{...}: { + services.syncthing.devices."vanguard" = {id = "YNGBLJP-TWY6Y3C-DPPYAWL-3ZQFNQH-RDPIU5T-L54UI62-FPPA3JQ-WYXBZQZ";}; } diff --git a/syncthing/folders/default.nix b/syncthing/folders/default.nix index d6cb1618..2794106d 100644 --- a/syncthing/folders/default.nix +++ b/syncthing/folders/default.nix @@ -1,5 +1,4 @@ -{ lib, ... }: -{ +{lib, ...}: { services.syncthing = { folders = { "Archive" = { diff --git a/systemd/nixos-pull.nix b/systemd/nixos-pull.nix index 02a8abd4..b8ed325f 100644 --- a/systemd/nixos-pull.nix +++ b/systemd/nixos-pull.nix @@ -1,7 +1,6 @@ -{ pkgs, ... }: -{ +{pkgs, ...}: { systemd.timers."nixos-pull-config" = { - wantedBy = [ "timers.target" ]; + wantedBy = ["timers.target"]; description = "Timer to update /etc/nixos/config/ repository"; timerConfig = { OnBootSec = "5m"; diff --git a/templates/poetry.nix b/templates/poetry.nix deleted file mode 100644 index 400aed9f..00000000 --- a/templates/poetry.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ pkgs ? import { } }: -let - myAppEnv = pkgs.poetry2nix.mkPoetryEnv { - projectDir = ./.; - editablePackageSources = { - my-app = ./src; - }; - }; -in -myAppEnv.env diff --git a/templates/venv.nix b/templates/venv.nix index 8400cb2a..5eda5735 100644 --- a/templates/venv.nix +++ b/templates/venv.nix @@ -1,6 +1,10 @@ -{ pkgs ? import { }, python ? pkgs.python39, ... }: +{ + pkgs ? import {}, + python ? pkgs.python39, + ... +}: pkgs.mkShell { - nativeBuildInputs = with pkgs; [ (python.withPackages (ps: with ps; [ pip wheel ])) poetry git ]; + nativeBuildInputs = with pkgs; [(python.withPackages (ps: with ps; [pip wheel])) poetry git]; shellHook = '' [ -d .venv ] || python -m venv .venv source .venv/bin/activate