From d363711695ad4a23825d4a243904dd2e43a9e176 Mon Sep 17 00:00:00 2001
From: Daniel Langbein <daniel@systemli.org>
Date: Mon, 9 Oct 2023 13:06:17 +0200
Subject: [PATCH] refactor

---
 modules/android.nix                  | 1 -
 modules/autostart.nix                | 1 -
 modules/base.nix                     | 1 -
 modules/btrbk/default.nix            | 1 -
 modules/digikam-rawtherapee.nix      | 1 -
 modules/docker-pushrm.nix            | 1 -
 modules/docker.nix                   | 1 -
 modules/fde-ssh-unlock.nix           | 1 -
 modules/firefox.nix                  | 1 -
 modules/fwupd-gnome.nix              | 1 -
 modules/ghostwriter.nix              | 1 -
 modules/git.nix                      | 1 -
 modules/gnome-base.nix               | 1 -
 modules/gnome-config.nix             | 1 -
 modules/gnome-extensions.nix         | 1 -
 modules/gnome-fractional-scaling.nix | 1 -
 modules/headless.nix                 | 1 -
 modules/journalwatch.nix             | 1 -
 modules/lid-switch-handling.nix      | 1 -
 modules/nextcloud-integration.nix    | 1 -
 modules/nitrokey-gpg-smartcard.nix   | 1 -
 modules/ntfs.nix                     | 1 -
 modules/nur.nix                      | 1 -
 modules/pmbootstrap.nix              | 1 -
 modules/podman.nix                   | 1 -
 modules/print-and-scan.nix           | 1 -
 modules/programs.nix                 | 1 -
 modules/sendmail-mta.nix             | 1 -
 modules/ssh-client.nix               | 1 -
 modules/ssh-server.nix               | 1 -
 modules/thunderbird.nix              | 1 -
 modules/veracrypt.nix                | 1 -
 modules/wallpaper.nix                | 1 -
 modules/waydroid.nix                 | 1 -
 modules/zsh.nix                      | 1 -
 35 files changed, 35 deletions(-)

diff --git a/modules/android.nix b/modules/android.nix
index 263d2f9..02b4174 100644
--- a/modules/android.nix
+++ b/modules/android.nix
@@ -1,5 +1,4 @@
 { config, pkgs, ... }:
-
 {
   # adb and fastboot
 
diff --git a/modules/autostart.nix b/modules/autostart.nix
index cb0da7a..cde4419 100644
--- a/modules/autostart.nix
+++ b/modules/autostart.nix
@@ -1,5 +1,4 @@
 { config, pkgs, lib, ... }:
-
 {
   # See also:
   #   Temporary workaround until https://github.com/nix-community/home-manager/issues/3447 is merged.
diff --git a/modules/base.nix b/modules/base.nix
index dcb74cf..292d2b7 100644
--- a/modules/base.nix
+++ b/modules/base.nix
@@ -1,5 +1,4 @@
 { config, pkgs, ... }:
-
 {
   # Firmware.
   #
diff --git a/modules/btrbk/default.nix b/modules/btrbk/default.nix
index 66a8fad..4bd2c9c 100644
--- a/modules/btrbk/default.nix
+++ b/modules/btrbk/default.nix
@@ -1,5 +1,4 @@
 { config, pkgs, ... }:
-
 {
   # For each instance, a service and timer will be created:
   #   systemctl list-unit-files | grep btrbk
diff --git a/modules/digikam-rawtherapee.nix b/modules/digikam-rawtherapee.nix
index 8a614a0..ac027f8 100644
--- a/modules/digikam-rawtherapee.nix
+++ b/modules/digikam-rawtherapee.nix
@@ -1,5 +1,4 @@
 { config, pkgs, ... }:
-
 {
   users.users.yoda = {
     packages = with pkgs; [
diff --git a/modules/docker-pushrm.nix b/modules/docker-pushrm.nix
index 903b363..6ed14cd 100644
--- a/modules/docker-pushrm.nix
+++ b/modules/docker-pushrm.nix
@@ -1,5 +1,4 @@
 { config, pkgs, lib, ... }:
-
 {
   lib.maintainers = {
     langbeindaniel = {
diff --git a/modules/docker.nix b/modules/docker.nix
index 337b259..b0da037 100644
--- a/modules/docker.nix
+++ b/modules/docker.nix
@@ -1,5 +1,4 @@
 { config, pkgs, ... }:
-
 {
   # https://nixos.wiki/wiki/Docker#Installation
 
diff --git a/modules/fde-ssh-unlock.nix b/modules/fde-ssh-unlock.nix
index 0f54230..ad7310f 100644
--- a/modules/fde-ssh-unlock.nix
+++ b/modules/fde-ssh-unlock.nix
@@ -1,5 +1,4 @@
 { config, pkgs, ... }:
-
 {
   # Unlock encrypted root partition remotely with SSH.
   # TODO: Some manual steps are required, see https://nixos.wiki/wiki/Remote_LUKS_Unlocking#Prepare_SSH_host_keys
diff --git a/modules/firefox.nix b/modules/firefox.nix
index 737e723..21988d3 100644
--- a/modules/firefox.nix
+++ b/modules/firefox.nix
@@ -1,5 +1,4 @@
 { config, pkgs, ... }:
-
 {
   users.users.yoda = {
     packages = with pkgs; [
diff --git a/modules/fwupd-gnome.nix b/modules/fwupd-gnome.nix
index 3ed0736..2fa4909 100644
--- a/modules/fwupd-gnome.nix
+++ b/modules/fwupd-gnome.nix
@@ -1,5 +1,4 @@
 { config, pkgs, ... }:
-
 {
   # Enable firmware update daemon
   services.fwupd.enable = true;
diff --git a/modules/ghostwriter.nix b/modules/ghostwriter.nix
index 0ac5d4a..6e76c01 100644
--- a/modules/ghostwriter.nix
+++ b/modules/ghostwriter.nix
@@ -1,5 +1,4 @@
 { config, pkgs, ... }:
-
 {
   users.users.yoda = {
     packages = with pkgs; [
diff --git a/modules/git.nix b/modules/git.nix
index 795cb5e..0501fe9 100644
--- a/modules/git.nix
+++ b/modules/git.nix
@@ -1,5 +1,4 @@
 { config, pkgs, ... }:
-
 {
   users.users.yoda = {
     packages = with pkgs; [
diff --git a/modules/gnome-base.nix b/modules/gnome-base.nix
index f311f01..011eab5 100644
--- a/modules/gnome-base.nix
+++ b/modules/gnome-base.nix
@@ -1,5 +1,4 @@
 { config, pkgs, ... }:
-
 {
   # Don't install all programs of the GNOME desktop.
   # https://nixos.wiki/wiki/GNOME#Excluding_some_GNOME_applications_from_the_default_install
diff --git a/modules/gnome-config.nix b/modules/gnome-config.nix
index 9968fa6..1e4aa5d 100644
--- a/modules/gnome-config.nix
+++ b/modules/gnome-config.nix
@@ -1,5 +1,4 @@
 { config, pkgs, ... }:
-
 {
   # https://github.com/danieldk/nix-home/blob/master/home/cfg/desktop.nix
   # https://github.com/Martins3/My-Linux-Config/blob/master/nixpkgs/home/app/gnome.nix
diff --git a/modules/gnome-extensions.nix b/modules/gnome-extensions.nix
index 1642339..0d82721 100644
--- a/modules/gnome-extensions.nix
+++ b/modules/gnome-extensions.nix
@@ -1,5 +1,4 @@
 { config, pkgs, lib, ... }:
-
 {
   # Example: https://github.com/nix-community/home-manager/issues/284#issuecomment-1321199263
   # https://the-empire.systems/nixos-gnome-settings-and-keyboard-shortcuts
diff --git a/modules/gnome-fractional-scaling.nix b/modules/gnome-fractional-scaling.nix
index ce4f8ff..54768ad 100644
--- a/modules/gnome-fractional-scaling.nix
+++ b/modules/gnome-fractional-scaling.nix
@@ -1,5 +1,4 @@
 { config, pkgs, lib, ... }:
-
 {
   # https://wiki.archlinux.org/title/HiDPI#Wayland
   # Results in blurry font in non-Wayland applications :/
diff --git a/modules/headless.nix b/modules/headless.nix
index 16f613c..1efdbfd 100644
--- a/modules/headless.nix
+++ b/modules/headless.nix
@@ -1,5 +1,4 @@
 { config, pkgs, ... }:
-
 {
   users.users.yoda = {
     packages = with pkgs; [
diff --git a/modules/journalwatch.nix b/modules/journalwatch.nix
index aadf2c1..3063f00 100644
--- a/modules/journalwatch.nix
+++ b/modules/journalwatch.nix
@@ -1,5 +1,4 @@
 { config, pkgs, ... }:
-
 {
   # Systemd Journal Monitoring.
   # Alternative:
diff --git a/modules/lid-switch-handling.nix b/modules/lid-switch-handling.nix
index e356bcc..819d842 100644
--- a/modules/lid-switch-handling.nix
+++ b/modules/lid-switch-handling.nix
@@ -1,5 +1,4 @@
 { config, pkgs, ... }:
-
 {
     # Don't suspend if laptop lid is closed while plugged in.
     # https://unix.stackexchange.com/a/307498
diff --git a/modules/nextcloud-integration.nix b/modules/nextcloud-integration.nix
index 51df2c8..e8eb7ae 100644
--- a/modules/nextcloud-integration.nix
+++ b/modules/nextcloud-integration.nix
@@ -1,5 +1,4 @@
 { config, pkgs, ... }:
-
 {
   environment.systemPackages = with pkgs; [
     # Nextcloud sync client
diff --git a/modules/nitrokey-gpg-smartcard.nix b/modules/nitrokey-gpg-smartcard.nix
index 8c61535..d365a23 100644
--- a/modules/nitrokey-gpg-smartcard.nix
+++ b/modules/nitrokey-gpg-smartcard.nix
@@ -1,5 +1,4 @@
 { config, pkgs, ... }:
-
 {
   # Use NitroKey USB smartcard with SSH.
   # https://nixos.wiki/wiki/Nitrokey
diff --git a/modules/ntfs.nix b/modules/ntfs.nix
index f201528..731888f 100644
--- a/modules/ntfs.nix
+++ b/modules/ntfs.nix
@@ -1,5 +1,4 @@
 { config, pkgs, ... }:
-
 {
   # https://nixos.wiki/wiki/NTFS
   boot.supportedFilesystems = [ "ntfs" ];
diff --git a/modules/nur.nix b/modules/nur.nix
index 35ac12c..598aca1 100644
--- a/modules/nur.nix
+++ b/modules/nur.nix
@@ -1,5 +1,4 @@
 { config, pkgs, ... }:
-
 {
   # Import NUR.
   #nixpkgs.config.packageOverrides = pkgs: {
diff --git a/modules/pmbootstrap.nix b/modules/pmbootstrap.nix
index 470233d..91c683a 100644
--- a/modules/pmbootstrap.nix
+++ b/modules/pmbootstrap.nix
@@ -1,5 +1,4 @@
 { config, pkgs, ... }:
-
 {
   users.users.yoda = {
     packages = with pkgs; [
diff --git a/modules/podman.nix b/modules/podman.nix
index a265d91..e7582dd 100644
--- a/modules/podman.nix
+++ b/modules/podman.nix
@@ -1,5 +1,4 @@
 { config, pkgs, ... }:
-
 {
   # https://nixos.wiki/wiki/Podman#Install_and_configure_podman_with_NixOS_service_configuration
   # https://search.nixos.org/options?channel=23.05&query=virtualisation.podman
diff --git a/modules/print-and-scan.nix b/modules/print-and-scan.nix
index 2a77376..a8af7bf 100644
--- a/modules/print-and-scan.nix
+++ b/modules/print-and-scan.nix
@@ -1,5 +1,4 @@
 { config, pkgs, ... }:
-
 {
   # Printing with IPP everywhere capable printers
   # https://nixos.wiki/wiki/Printing
diff --git a/modules/programs.nix b/modules/programs.nix
index 73d9014..5a912a1 100644
--- a/modules/programs.nix
+++ b/modules/programs.nix
@@ -1,5 +1,4 @@
 { config, pkgs, ... }:
-
 {
   users.users.yoda = {
     packages = with pkgs; [
diff --git a/modules/sendmail-mta.nix b/modules/sendmail-mta.nix
index 94cb2d8..0d0fd54 100644
--- a/modules/sendmail-mta.nix
+++ b/modules/sendmail-mta.nix
@@ -1,5 +1,4 @@
 { config, pkgs, ... }:
-
 {
   # Many programs use the `sendmail` command to send email.
   # Nullmailer and OpenSMTP create a symlink from `sendmail` to their binary - they are (to a certain degree) sendmail compatible.
diff --git a/modules/ssh-client.nix b/modules/ssh-client.nix
index 9b38893..d55d410 100644
--- a/modules/ssh-client.nix
+++ b/modules/ssh-client.nix
@@ -1,5 +1,4 @@
 { config, pkgs, ... }:
-
 {
   home-manager.users.yoda = { osConfig, config, pkgs, ... }: {
 
diff --git a/modules/ssh-server.nix b/modules/ssh-server.nix
index 9522412..8fc9a33 100644
--- a/modules/ssh-server.nix
+++ b/modules/ssh-server.nix
@@ -1,5 +1,4 @@
 { config, pkgs, ... }:
-
 {
   # Enable SSH server.
   services.openssh = {
diff --git a/modules/thunderbird.nix b/modules/thunderbird.nix
index 315c9f0..c23730a 100644
--- a/modules/thunderbird.nix
+++ b/modules/thunderbird.nix
@@ -1,5 +1,4 @@
 { config, pkgs, ... }:
-
 {
   # https://github.com/NotAShelf/nyx/blob/main/homes/notashelf/graphical/apps/thunderbird/default.nix
   # https://github.com/dr460nf1r3/dr460nixed/blob/main/home-manager/email.nix
diff --git a/modules/veracrypt.nix b/modules/veracrypt.nix
index 80ca52e..9e7607b 100644
--- a/modules/veracrypt.nix
+++ b/modules/veracrypt.nix
@@ -1,5 +1,4 @@
 { config, pkgs, ... }:
-
 {
   # Looks as if TrueCrypt is unfree software
   #   https://github.com/NixOS/nixpkgs/blob/5d017a8822e0907fb96f7700a319f9fe2434de02/pkgs/applications/misc/veracrypt/default.nix#L59
diff --git a/modules/wallpaper.nix b/modules/wallpaper.nix
index 35e0024..e85b96a 100644
--- a/modules/wallpaper.nix
+++ b/modules/wallpaper.nix
@@ -1,5 +1,4 @@
 { config, pkgs, ... }:
-
 {
   # https://discourse.nixos.org/t/how-to-set-gnome-a-k-a-gdm-greeter-a-k-a-lockscreen-login-background-a-k-a-wallpaper/14289?u=langfingaz
 
diff --git a/modules/waydroid.nix b/modules/waydroid.nix
index 7ed2fe4..7525823 100644
--- a/modules/waydroid.nix
+++ b/modules/waydroid.nix
@@ -1,5 +1,4 @@
 { config, pkgs, ... }:
-
 {
   # Installation and Usage. https://nixos.wiki/wiki/WayDroid
   #
diff --git a/modules/zsh.nix b/modules/zsh.nix
index 2fba842..99a9222 100644
--- a/modules/zsh.nix
+++ b/modules/zsh.nix
@@ -1,5 +1,4 @@
 { config, pkgs, ... }:
-
 {
   # https://nixos.wiki/wiki/Command_Shell
   # https://nixos.wiki/wiki/Zsh