From ce88b0319851c70bc86557b09acf42d39e4574e0 Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Fri, 2 Feb 2024 13:45:05 +0100 Subject: [PATCH] Switch to nixfmt-rfc-style --- flake.lock | 18 +++--- flake.nix | 31 +++++++--- home-manager/modules/common/default.nix | 20 ++++-- home-manager/modules/default.nix | 3 +- .../modules/programs/alacritty/default.nix | 9 +-- .../modules/programs/ansible/default.nix | 13 +++- .../modules/programs/calibre/default.nix | 13 +++- .../modules/programs/czkawka/default.nix | 13 +++- .../modules/programs/emacs/default.nix | 21 +++++-- .../modules/programs/email/default.nix | 29 ++++++--- .../modules/programs/evince/default.nix | 13 +++- home-manager/modules/programs/git/default.nix | 33 ++++++---- .../modules/programs/hunspell/default.nix | 13 +++- .../modules/programs/keeweb/default.nix | 17 ++++-- home-manager/modules/programs/mpv/default.nix | 51 ++++++++++------ .../modules/programs/open-port/default.nix | 9 +-- .../rapid-photo-downloader/default.nix | 16 +++-- .../modules/programs/signal/default.nix | 27 +++++--- home-manager/modules/programs/ssh/default.nix | 10 ++- .../modules/programs/telegram/default.nix | 13 +++- .../modules/programs/tmux/default.nix | 11 ++-- .../modules/programs/vagrant-wsl/default.nix | 16 +++-- .../modules/programs/work-desktop/default.nix | 24 +++++--- .../modules/programs/yt-dlp/default.nix | 10 ++- .../modules/services/desktop-base/default.nix | 30 +++++---- .../modules/services/dunst/default.nix | 10 ++- .../modules/services/espanso/default.nix | 35 +++++++---- .../modules/services/grobi/default.nix | 21 +++++-- home-manager/profiles/desktop.nix | 11 ++-- home-manager/profiles/headless.nix | 3 +- home-manager/profiles/management.nix | 6 +- home-manager/profiles/ubuntu.nix | 3 +- home-manager/profiles/work-vm.nix | 12 ++-- home-manager/profiles/work-wsl.nix | 30 ++++++--- lib/mk_computer.nix | 24 ++++++-- lib/mk_raspi.nix | 48 +++++++++------ modules/default.nix | 3 +- modules/hardware/bluetooth/default.nix | 7 ++- modules/hardware/dvd/default.nix | 17 ++++-- modules/hardware/nvidia/default.nix | 12 +++- modules/hardware/raspi4/default.nix | 9 ++- modules/hardware/raspi4/init_config.nix | 56 +++++++++-------- modules/hardware/raspi4/raspi-base.nix | 33 +++++++--- modules/hardware/raspi4/raspi-ethernet.nix | 17 +++--- modules/hardware/raspi4/raspi-usb.nix | 28 ++++++--- modules/misc/common/default.nix | 45 +++++++++++--- modules/misc/initrd-ssh/default.nix | 6 +- modules/misc/username/default.nix | 3 +- modules/profiles/desktop/default.nix | 26 ++++++-- modules/programs/distrobox/default.nix | 21 +++++-- modules/programs/eog/default.nix | 14 +++-- modules/programs/libimobiledevice/default.nix | 16 +++-- modules/programs/lockscreen/default.nix | 14 +++-- modules/programs/makemkv/default.nix | 17 ++++-- modules/programs/nautilus/default.nix | 13 +++- modules/programs/nix-direnv/default.nix | 7 ++- .../programs/restic-management/default.nix | 29 +++++---- modules/programs/scripts/default.nix | 21 ++++--- modules/programs/steam/default.nix | 13 ++-- modules/services/common-x86/default.nix | 13 ++-- modules/services/data-share/default.nix | 10 +-- .../services/docker-mailserver/default.nix | 55 +++++++++++------ modules/services/docker/default.nix | 17 ++++-- modules/services/freshrss/default.nix | 34 ++++++++--- modules/services/gitea/default.nix | 25 ++++++-- modules/services/grav/default.nix | 17 ++++-- modules/services/haproxy/default.nix | 12 +++- modules/services/heimdall/default.nix | 19 +++--- modules/services/log-to-ram/default.nix | 11 +++- modules/services/logs-share/default.nix | 13 +++- .../mariadb-for-containers/default.nix | 25 +++++--- modules/services/media-share/default.nix | 15 +++-- modules/services/nextcloud/default.nix | 56 +++++++++++------ modules/services/nginx-acme-base/default.nix | 14 +++-- modules/services/nginx-fpm/default.nix | 17 ++++-- modules/services/nginx-proxy/default.nix | 6 +- modules/services/pipewire/default.nix | 6 +- modules/services/plex/default.nix | 21 ++++--- modules/services/postgresql/default.nix | 19 +++--- modules/services/qtile/default.nix | 13 ++-- modules/services/rdp/default.nix | 17 ++++-- .../restic-client-desktop/default.nix | 14 +++-- .../restic-client-server-mysql/default.nix | 22 +++++-- .../restic-client-server-postgres/default.nix | 18 ++++-- .../services/restic-client-server/default.nix | 18 ++++-- modules/services/restic-server/default.nix | 20 ++++-- modules/services/rss-bridge/default.nix | 6 +- modules/services/syslog/default.nix | 11 ++-- .../telegram-notifications/default.nix | 21 ++++--- modules/services/tlp/default.nix | 10 ++- modules/services/virtualbox-guest/default.nix | 14 +++-- scrts/secrets.nix | 61 +++++++++---------- setup-shell.nix | 13 ++-- shell.nix | 13 ++-- systems/desktop-vm/default.nix | 18 ++++-- systems/git/default.nix | 6 +- systems/gwyn/default.nix | 28 +++++++-- systems/loki-test/default.nix | 3 +- systems/mail/default.nix | 4 +- systems/management/default.nix | 4 +- systems/mobile/default.nix | 12 +++- systems/nextcloud/default.nix | 3 +- systems/plex/default.nix | 3 +- systems/proxy/default.nix | 27 ++++---- systems/restic-server/default.nix | 7 ++- systems/staubfinger/default.nix | 29 ++++++--- systems/test-raspi/default.nix | 7 ++- systems/ttrss/default.nix | 8 ++- 108 files changed, 1301 insertions(+), 627 deletions(-) diff --git a/flake.lock b/flake.lock index d13c55a..92eb0c2 100644 --- a/flake.lock +++ b/flake.lock @@ -89,11 +89,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1706182238, - "narHash": "sha256-Ti7CerGydU7xyrP/ow85lHsOpf+XMx98kQnPoQCSi1g=", + "lastModified": 1706834982, + "narHash": "sha256-3CfxA7gZ+DVv/N9Pvw61bV5Oe/mWfxYPyVQGqp9TMJA=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "f84eaffc35d1a655e84749228cde19922fcf55f1", + "rev": "83e571bb291161682b9c3ccd48318f115143a550", "type": "github" }, "original": { @@ -104,11 +104,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1706098335, - "narHash": "sha256-r3dWjT8P9/Ah5m5ul4WqIWD8muj5F+/gbCdjiNVBKmU=", + "lastModified": 1706718339, + "narHash": "sha256-S+S97c/HzkO2A/YsU7ZmNF9w2s7Xk6P8dzmfDdckzLs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a77ab169a83a4175169d78684ddd2e54486ac651", + "rev": "53fbe41cf76b6a685004194e38e889bc8857e8c2", "type": "github" }, "original": { @@ -120,11 +120,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1706191920, - "narHash": "sha256-eLihrZAPZX0R6RyM5fYAWeKVNuQPYjAkCUBr+JNvtdE=", + "lastModified": 1706550542, + "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ae5c332cbb5827f6b1f02572496b141021de335f", + "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index dbcb05a..2f5282b 100644 --- a/flake.nix +++ b/flake.nix @@ -19,16 +19,22 @@ }; }; - outputs = inputs@{ self, agenix, nixpkgs, nixpkgs-unstable, nixos-hardware - , home-manager }: + outputs = + inputs@{ + self, + agenix, + nixpkgs, + nixpkgs-unstable, + nixos-hardware, + home-manager, + }: let mkComputer = import "${inputs.self}/lib/mk_computer.nix"; mkRaspi = import "${inputs.self}/lib/mk_raspi.nix"; - mksdImage = host: + mksdImage = + host: (self.nixosConfigurations.${host}.extendModules { - modules = [ - "${nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix" - ]; + modules = [ "${nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix" ]; }).config.system.build.sdImage; # required for home-manager only setup { overlay-unstable = final: prev: { @@ -39,11 +45,14 @@ }; pkgs = import inputs.nixpkgs { system = "x86_64-linux"; - config = { allowUnfree = true; }; + config = { + allowUnfree = true; + }; overlays = [ overlay-unstable ]; }; - # } - in { + in + # } + { images = { git = mksdImage "git"; loki-test = mksdImage "loki-test"; @@ -131,7 +140,9 @@ ]; extraSpecialArgs = { inherit inputs; - nixosConfig = { az-username = "zweili"; }; + nixosConfig = { + az-username = "zweili"; + }; }; }; }; diff --git a/home-manager/modules/common/default.nix b/home-manager/modules/common/default.nix index 99f95bb..dbb61da 100644 --- a/home-manager/modules/common/default.nix +++ b/home-manager/modules/common/default.nix @@ -1,4 +1,11 @@ -{ config, lib, nixosConfig, pkgs, ... }: { +{ + config, + lib, + nixosConfig, + pkgs, + ... +}: +{ # Home Manager needs a bit of information about you and the # paths it should manage. programs = { @@ -23,7 +30,9 @@ "$git_status" "$character" ]; - python = { format = "[\${symbol}($virtualenv) ]($style)"; }; + python = { + format = "[\${symbol}($virtualenv) ]($style)"; + }; }; enable = true; }; @@ -74,9 +83,8 @@ }; shellAliases = { - format-modules = "nixfmt **/*.nix"; - nix-generations = - "sudo nix-env --list-generations --profile /nix/var/nix/profiles/system"; + format-modules = "unstable.nixfmt-rfc-style **/*.nix"; + nix-generations = "sudo nix-env --list-generations --profile /nix/var/nix/profiles/system"; rebuild = '' nixos-rebuild -j auto switch --use-remote-sudo ''; @@ -93,7 +101,7 @@ highlight killall ncdu - nixfmt + unstable.nixfmt-rfc-style nmon tree unzip diff --git a/home-manager/modules/default.nix b/home-manager/modules/default.nix index f83e9e1..0d5bd62 100644 --- a/home-manager/modules/default.nix +++ b/home-manager/modules/default.nix @@ -1,4 +1,5 @@ -{ ... }: { +{ ... }: +{ imports = [ ./common ./programs/alacritty diff --git a/home-manager/modules/programs/alacritty/default.nix b/home-manager/modules/programs/alacritty/default.nix index 77e1b70..716bcc3 100644 --- a/home-manager/modules/programs/alacritty/default.nix +++ b/home-manager/modules/programs/alacritty/default.nix @@ -1,9 +1,10 @@ { config, lib, ... }: -let cfg = config.programs.az-alacritty; -in { +let + cfg = config.programs.az-alacritty; +in +{ options = { - programs.az-alacritty.enable = - lib.mkEnableOption "Enable alacritty terminal."; + programs.az-alacritty.enable = lib.mkEnableOption "Enable alacritty terminal."; }; config = lib.mkIf cfg.enable { diff --git a/home-manager/modules/programs/ansible/default.nix b/home-manager/modules/programs/ansible/default.nix index 4c7ffb9..a98c2de 100644 --- a/home-manager/modules/programs/ansible/default.nix +++ b/home-manager/modules/programs/ansible/default.nix @@ -1,6 +1,13 @@ -{ config, lib, pkgs, ... }: -let cfg = config.programs.az-ansible; -in { +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.programs.az-ansible; +in +{ options = { programs.az-ansible.enable = lib.mkEnableOption "Enable ansible."; }; diff --git a/home-manager/modules/programs/calibre/default.nix b/home-manager/modules/programs/calibre/default.nix index eb94129..44d5426 100644 --- a/home-manager/modules/programs/calibre/default.nix +++ b/home-manager/modules/programs/calibre/default.nix @@ -1,6 +1,13 @@ -{ config, lib, pkgs, ... }: -let cfg = config.programs.az-calibre; -in { +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.programs.az-calibre; +in +{ options = { programs.az-calibre.enable = lib.mkEnableOption "Enable calibre."; }; diff --git a/home-manager/modules/programs/czkawka/default.nix b/home-manager/modules/programs/czkawka/default.nix index 23ba894..46ccdd7 100644 --- a/home-manager/modules/programs/czkawka/default.nix +++ b/home-manager/modules/programs/czkawka/default.nix @@ -1,6 +1,13 @@ -{ config, lib, pkgs, ... }: -let cfg = config.programs.az-czkawka; -in { +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.programs.az-czkawka; +in +{ options = { programs.az-czkawka.enable = lib.mkEnableOption "Enable czkawka."; }; diff --git a/home-manager/modules/programs/emacs/default.nix b/home-manager/modules/programs/emacs/default.nix index 43ce133..efd40b3 100644 --- a/home-manager/modules/programs/emacs/default.nix +++ b/home-manager/modules/programs/emacs/default.nix @@ -1,7 +1,16 @@ -{ config, lib, pkgs, ... }: -let cfg = config.programs.az-emacs; -in { - options = { programs.az-emacs.enable = lib.mkEnableOption "Enable emacs."; }; +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.programs.az-emacs; +in +{ + options = { + programs.az-emacs.enable = lib.mkEnableOption "Enable emacs."; + }; config = lib.mkIf cfg.enable { home.packages = with pkgs; [ @@ -25,8 +34,8 @@ in { languagetool-console-command "${pkgs.languagetool}/share/languagetool-commandline.jar" languagetool-server-command "${pkgs.languagetool}/share/languagetool-server.jar") ''; - extraPackages = epkgs: - with pkgs; [ + extraPackages = + epkgs: with pkgs; [ epkgs.ag epkgs.amx epkgs.annotate diff --git a/home-manager/modules/programs/email/default.nix b/home-manager/modules/programs/email/default.nix index d507c43..2fb377b 100644 --- a/home-manager/modules/programs/email/default.nix +++ b/home-manager/modules/programs/email/default.nix @@ -1,9 +1,15 @@ -{ config, inputs, lib, ... }: -let cfg = config.programs.az-email; -in { +{ + config, + inputs, + lib, + ... +}: +let + cfg = config.programs.az-email; +in +{ options = { - programs.az-email.enable = - lib.mkEnableOption "Configure everything required for sending emails."; + programs.az-email.enable = lib.mkEnableOption "Configure everything required for sending emails."; }; config = lib.mkIf cfg.enable { @@ -18,14 +24,21 @@ in { userName = "andreas@zweili.ch"; primary = true; passwordCommand = "cat /run/user/1000/agenix/personalEmailKey"; - aliases = [ "andreas.zweili@gmail.com" "andreas@2li.ch" ]; + aliases = [ + "andreas.zweili@gmail.com" + "andreas@2li.ch" + ]; msmtp.enable = true; mu.enable = true; offlineimap = { enable = true; extraConfig = { - account = { autorefresh = 15; }; - local = { sync_deletes = true; }; + account = { + autorefresh = 15; + }; + local = { + sync_deletes = true; + }; }; }; imap = { diff --git a/home-manager/modules/programs/evince/default.nix b/home-manager/modules/programs/evince/default.nix index 827fcd2..889e7e7 100644 --- a/home-manager/modules/programs/evince/default.nix +++ b/home-manager/modules/programs/evince/default.nix @@ -1,6 +1,13 @@ -{ config, lib, pkgs, ... }: -let cfg = config.programs.az-evince; -in { +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.programs.az-evince; +in +{ options = { programs.az-evince.enable = lib.mkEnableOption "Enable evince."; }; diff --git a/home-manager/modules/programs/git/default.nix b/home-manager/modules/programs/git/default.nix index b701f28..e3b088a 100644 --- a/home-manager/modules/programs/git/default.nix +++ b/home-manager/modules/programs/git/default.nix @@ -1,6 +1,8 @@ { config, lib, ... }: -let cfg = config.programs.az-git; -in { +let + cfg = config.programs.az-git; +in +{ options = { programs.az-git = { enable = lib.mkEnableOption "Enable git."; @@ -25,15 +27,25 @@ in { syntax-theme = "GitHub"; }; }; - includes = [{ - path = "~/.config/git/workconfig"; - condition = "gitdir:~/git_repos/work/"; - }]; + includes = [ + { + path = "~/.config/git/workconfig"; + condition = "gitdir:~/git_repos/work/"; + } + ]; extraConfig = { - core = { hooksPath = "~/.config/git/hooks/"; }; - safe = { directory = "*"; }; - pull = { rebase = false; }; - push = { autoSetupRemote = true; }; + core = { + hooksPath = "~/.config/git/hooks/"; + }; + safe = { + directory = "*"; + }; + pull = { + rebase = false; + }; + push = { + autoSetupRemote = true; + }; merge.conflictStyle = "diff3"; rerere.enabled = true; }; @@ -122,7 +134,6 @@ in { # ignore pycache" "__pycache__/" - ]; }; # raw files diff --git a/home-manager/modules/programs/hunspell/default.nix b/home-manager/modules/programs/hunspell/default.nix index bff926e..1daccbc 100644 --- a/home-manager/modules/programs/hunspell/default.nix +++ b/home-manager/modules/programs/hunspell/default.nix @@ -1,6 +1,13 @@ -{ config, lib, pkgs, ... }: -let cfg = config.programs.az-hunspell; -in { +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.programs.az-hunspell; +in +{ options = { programs.az-hunspell.enable = lib.mkEnableOption "Add dictionaries"; }; diff --git a/home-manager/modules/programs/keeweb/default.nix b/home-manager/modules/programs/keeweb/default.nix index 01d3bb8..daaf27d 100644 --- a/home-manager/modules/programs/keeweb/default.nix +++ b/home-manager/modules/programs/keeweb/default.nix @@ -1,6 +1,13 @@ -{ config, lib, pkgs, ... }: -let cfg = config.programs.az-keeweb; -in { +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.programs.az-keeweb; +in +{ options = { programs.az-keeweb.enable = lib.mkEnableOption "Enable keeweb."; }; @@ -17,7 +24,9 @@ in { Environment = "QT_SCALE_FACTOR=1.25"; ExecStart = "${pkgs.keeweb}/bin/keeweb --no-sandbox"; }; - Install = { WantedBy = [ "graphical-session.target" ]; }; + Install = { + WantedBy = [ "graphical-session.target" ]; + }; }; }; } diff --git a/home-manager/modules/programs/mpv/default.nix b/home-manager/modules/programs/mpv/default.nix index 31a7ca2..f38341a 100644 --- a/home-manager/modules/programs/mpv/default.nix +++ b/home-manager/modules/programs/mpv/default.nix @@ -1,22 +1,31 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: let cfg = config.programs.az-mpv; - delete-file = (pkgs.stdenvNoCC.mkDerivation rec { - name = "mpv-delete-file"; - src = pkgs.fetchurl { - url = - "https://git.2li.ch/various/mpv-scripts/raw/commit/19ea069abcb794d1bf8fac2f59b50d71ab992130/delete_file.lua"; - sha256 = "sha256-1FX23t+O1aFZnbuvl+9zDT8OcKEziWNGj5cAMSvRIas="; - }; - dontBuild = true; - dontUnpack = true; - installPhase = '' - install -Dm644 ${src} $out/share/mpv/scripts/delete_file.lua - ''; - passthru.scriptName = "delete_file.lua"; - }); -in { - options = { programs.az-mpv.enable = lib.mkEnableOption "Enable MPV."; }; + delete-file = ( + pkgs.stdenvNoCC.mkDerivation rec { + name = "mpv-delete-file"; + src = pkgs.fetchurl { + url = "https://git.2li.ch/various/mpv-scripts/raw/commit/19ea069abcb794d1bf8fac2f59b50d71ab992130/delete_file.lua"; + sha256 = "sha256-1FX23t+O1aFZnbuvl+9zDT8OcKEziWNGj5cAMSvRIas="; + }; + dontBuild = true; + dontUnpack = true; + installPhase = '' + install -Dm644 ${src} $out/share/mpv/scripts/delete_file.lua + ''; + passthru.scriptName = "delete_file.lua"; + } + ); +in +{ + options = { + programs.az-mpv.enable = lib.mkEnableOption "Enable MPV."; + }; config = lib.mkIf cfg.enable { programs.mpv = { @@ -25,13 +34,17 @@ in { s = "playlist-shuffle"; r = "cycle_values video-rotate 90 180 270 0"; }; - config = { "keepaspect-window" = "no"; }; + config = { + "keepaspect-window" = "no"; + }; scripts = [ delete-file ]; }; xdg.mimeApps = { enable = true; - associations.added = { "inode/directory" = [ "mpv.desktop" ]; }; + associations.added = { + "inode/directory" = [ "mpv.desktop" ]; + }; defaultApplications = { "application/mxf" = "mpv.desktop"; "application/sdp" = "mpv.desktop"; diff --git a/home-manager/modules/programs/open-port/default.nix b/home-manager/modules/programs/open-port/default.nix index 30c2735..8094446 100644 --- a/home-manager/modules/programs/open-port/default.nix +++ b/home-manager/modules/programs/open-port/default.nix @@ -1,9 +1,10 @@ { config, lib, ... }: -let cfg = config.programs.az-open-port; -in { +let + cfg = config.programs.az-open-port; +in +{ options = { - programs.az-open-port.enable = - lib.mkEnableOption "Two functions to quickly open a port in iptables."; + programs.az-open-port.enable = lib.mkEnableOption "Two functions to quickly open a port in iptables."; }; config = lib.mkIf cfg.enable { diff --git a/home-manager/modules/programs/rapid-photo-downloader/default.nix b/home-manager/modules/programs/rapid-photo-downloader/default.nix index 0e6f76a..f560eda 100644 --- a/home-manager/modules/programs/rapid-photo-downloader/default.nix +++ b/home-manager/modules/programs/rapid-photo-downloader/default.nix @@ -1,9 +1,15 @@ -{ config, lib, pkgs, ... }: -let cfg = config.programs.az-rapid-photo-downloader; -in { +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.programs.az-rapid-photo-downloader; +in +{ options = { - programs.az-rapid-photo-downloader.enable = - lib.mkEnableOption "Enable Rapid Photo Downloader."; + programs.az-rapid-photo-downloader.enable = lib.mkEnableOption "Enable Rapid Photo Downloader."; }; config = lib.mkIf cfg.enable { diff --git a/home-manager/modules/programs/signal/default.nix b/home-manager/modules/programs/signal/default.nix index 6795cbd..48e4c02 100644 --- a/home-manager/modules/programs/signal/default.nix +++ b/home-manager/modules/programs/signal/default.nix @@ -1,6 +1,13 @@ -{ config, lib, pkgs, ... }: -let cfg = config.programs.az-signal; -in { +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.programs.az-signal; +in +{ options = { programs.az-signal.enable = lib.mkEnableOption "Enable Signal."; }; @@ -12,14 +19,20 @@ in { xdg.desktopEntries = { signal = { name = "Signal with tray icon"; - exec = - "${pkgs.unstable.signal-desktop}/bin/signal-desktop --use-tray-icon --no-sandbox %U"; + exec = "${pkgs.unstable.signal-desktop}/bin/signal-desktop --use-tray-icon --no-sandbox %U"; terminal = false; type = "Application"; icon = "signal-desktop"; comment = "Private messaging from your desktop"; - mimeType = [ "x-scheme-handler/sgnl" "x-scheme-handler/signalcaptcha" ]; - categories = [ "Network" "InstantMessaging" "Chat" ]; + mimeType = [ + "x-scheme-handler/sgnl" + "x-scheme-handler/signalcaptcha" + ]; + categories = [ + "Network" + "InstantMessaging" + "Chat" + ]; }; }; }; diff --git a/home-manager/modules/programs/ssh/default.nix b/home-manager/modules/programs/ssh/default.nix index b7ea57e..1a09d3c 100644 --- a/home-manager/modules/programs/ssh/default.nix +++ b/home-manager/modules/programs/ssh/default.nix @@ -1,7 +1,11 @@ { config, lib, ... }: -let cfg = config.programs.az-ssh; -in { - options = { programs.az-ssh.enable = lib.mkEnableOption "Enable SSH host."; }; +let + cfg = config.programs.az-ssh; +in +{ + options = { + programs.az-ssh.enable = lib.mkEnableOption "Enable SSH host."; + }; config = lib.mkIf cfg.enable { programs.ssh = { diff --git a/home-manager/modules/programs/telegram/default.nix b/home-manager/modules/programs/telegram/default.nix index 0356d86..df1a5fd 100644 --- a/home-manager/modules/programs/telegram/default.nix +++ b/home-manager/modules/programs/telegram/default.nix @@ -1,6 +1,13 @@ -{ config, lib, pkgs, ... }: -let cfg = config.programs.az-telegram; -in { +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.programs.az-telegram; +in +{ options = { programs.az-telegram.enable = lib.mkEnableOption "Enable Telegram."; }; diff --git a/home-manager/modules/programs/tmux/default.nix b/home-manager/modules/programs/tmux/default.nix index 6514878..96fefd4 100644 --- a/home-manager/modules/programs/tmux/default.nix +++ b/home-manager/modules/programs/tmux/default.nix @@ -1,7 +1,11 @@ { config, lib, ... }: -let cfg = config.programs.az-tmux; -in { - options = { programs.az-tmux.enable = lib.mkEnableOption "Enable tmux"; }; +let + cfg = config.programs.az-tmux; +in +{ + options = { + programs.az-tmux.enable = lib.mkEnableOption "Enable tmux"; + }; config = lib.mkIf cfg.enable { programs.tmux = { @@ -70,4 +74,3 @@ in { }; }; } - diff --git a/home-manager/modules/programs/vagrant-wsl/default.nix b/home-manager/modules/programs/vagrant-wsl/default.nix index 4fe3ac3..fd8e9f5 100644 --- a/home-manager/modules/programs/vagrant-wsl/default.nix +++ b/home-manager/modules/programs/vagrant-wsl/default.nix @@ -1,9 +1,15 @@ -{ config, lib, pkgs, ... }: -let cfg = config.programs.az-vagrant-wsl; -in { +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.programs.az-vagrant-wsl; +in +{ options = { - programs.az-vagrant-wsl.enable = - lib.mkEnableOption "Enable Vagrant in WSL."; + programs.az-vagrant-wsl.enable = lib.mkEnableOption "Enable Vagrant in WSL."; }; config = lib.mkIf cfg.enable { diff --git a/home-manager/modules/programs/work-desktop/default.nix b/home-manager/modules/programs/work-desktop/default.nix index 11c24ae..2646e08 100644 --- a/home-manager/modules/programs/work-desktop/default.nix +++ b/home-manager/modules/programs/work-desktop/default.nix @@ -1,11 +1,21 @@ -{ config, lib, pkgs, ... }: -let cfg = config.programs.az-work-desktop; -in { +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.programs.az-work-desktop; +in +{ options = { - programs.az-work-desktop.enable = - lib.mkEnableOption "Applications and config required for work."; + programs.az-work-desktop.enable = lib.mkEnableOption "Applications and config required for work."; }; - config = - lib.mkIf cfg.enable { home.packages = with pkgs; [ dbeaver vagrant ]; }; + config = lib.mkIf cfg.enable { + home.packages = with pkgs; [ + dbeaver + vagrant + ]; + }; } diff --git a/home-manager/modules/programs/yt-dlp/default.nix b/home-manager/modules/programs/yt-dlp/default.nix index 43ffc60..1a059f8 100644 --- a/home-manager/modules/programs/yt-dlp/default.nix +++ b/home-manager/modules/programs/yt-dlp/default.nix @@ -1,6 +1,8 @@ { config, lib, ... }: -let cfg = config.programs.az-yt-dlp; -in { +let + cfg = config.programs.az-yt-dlp; +in +{ options = { programs.az-yt-dlp.enable = lib.mkEnableOption "Enable yt-dlp."; }; @@ -11,7 +13,9 @@ in { extraConfig = '' -S "+codec:h264" ''; - settings = { remux-video = "mkv"; }; + settings = { + remux-video = "mkv"; + }; }; }; } diff --git a/home-manager/modules/services/desktop-base/default.nix b/home-manager/modules/services/desktop-base/default.nix index 91f2e1a..a125eda 100644 --- a/home-manager/modules/services/desktop-base/default.nix +++ b/home-manager/modules/services/desktop-base/default.nix @@ -1,9 +1,15 @@ -{ config, lib, pkgs, ... }: -let cfg = config.services.az-desktop-base; -in { +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.services.az-desktop-base; +in +{ options = { - services.az-desktop-base.enable = - lib.mkEnableOption "Base configuration for a destkop."; + services.az-desktop-base.enable = lib.mkEnableOption "Base configuration for a destkop."; }; config = lib.mkIf cfg.enable { @@ -23,10 +29,8 @@ in { az-tmux.enable = true; bash = { shellAliases = { - management-server = - "mosh ${config.home.username}@10.7.89.150 -- tmux new -A -s 0"; - work-management = - "mosh --ssh='ssh -i ~/.ssh/zweili.key' zweili@10.49.0.100 -- tmux new -A -s 0"; + management-server = "mosh ${config.home.username}@10.7.89.150 -- tmux new -A -s 0"; + work-management = "mosh --ssh='ssh -i ~/.ssh/zweili.key' zweili@10.49.0.100 -- tmux new -A -s 0"; }; }; }; @@ -40,8 +44,7 @@ in { remmina ]; # raw config files - home.file.".config/qtile/autostart.d/xdg-portal-add-path.sh".source = - ./xdg-portal-add-path.sh; + home.file.".config/qtile/autostart.d/xdg-portal-add-path.sh".source = ./xdg-portal-add-path.sh; gtk.theme.name = "Arc-Darker"; @@ -94,7 +97,9 @@ in { configFile."mimeapps.list".force = true; }; - xsession = { numlock.enable = true; }; + xsession = { + numlock.enable = true; + }; services = { az-dunst.enable = true; @@ -109,4 +114,3 @@ in { systemd.user.startServices = "sd-switch"; }; } - diff --git a/home-manager/modules/services/dunst/default.nix b/home-manager/modules/services/dunst/default.nix index e46938b..73a556a 100644 --- a/home-manager/modules/services/dunst/default.nix +++ b/home-manager/modules/services/dunst/default.nix @@ -1,7 +1,11 @@ { config, lib, ... }: -let cfg = config.services.az-dunst; -in { - options = { services.az-dunst.enable = lib.mkEnableOption "Enable dunst."; }; +let + cfg = config.services.az-dunst; +in +{ + options = { + services.az-dunst.enable = lib.mkEnableOption "Enable dunst."; + }; config = lib.mkIf cfg.enable { services.dunst = { diff --git a/home-manager/modules/services/espanso/default.nix b/home-manager/modules/services/espanso/default.nix index 4ea5f62..88f51cc 100644 --- a/home-manager/modules/services/espanso/default.nix +++ b/home-manager/modules/services/espanso/default.nix @@ -1,6 +1,8 @@ { config, lib, ... }: -let cfg = config.services.az-espanso; -in { +let + cfg = config.services.az-espanso; +in +{ options = { services.az-espanso.enable = lib.mkEnableOption "Enable espanso."; }; @@ -16,23 +18,30 @@ in { { trigger = " { } }: +{ + pkgs ? import { }, +}: pkgs.mkShell { name = "nixosbuildshell"; nativeBuildInputs = with pkgs; [ nixFlakes ]; shellHook = '' - PATH=${ - pkgs.writeShellScriptBin "nix" '' - ${pkgs.nixFlakes}/bin/nix --experimental-features "nix-command flakes" "$@" - '' - }/bin:$PATH + PATH=${pkgs.writeShellScriptBin "nix" '' + ${pkgs.nixFlakes}/bin/nix --experimental-features "nix-command flakes" "$@" + ''}/bin:$PATH ''; } - diff --git a/shell.nix b/shell.nix index b2890fd..5c0e663 100644 --- a/shell.nix +++ b/shell.nix @@ -1,4 +1,6 @@ -{ pkgs ? import { } }: +{ + pkgs ? import { }, +}: pkgs.mkShell { name = "nixosbuildshell"; nativeBuildInputs = with pkgs; [ @@ -14,11 +16,8 @@ pkgs.mkShell { ]; shellHook = '' - PATH=${ - pkgs.writeShellScriptBin "nix" '' - ${pkgs.nixFlakes}/bin/nix --experimental-features "nix-command flakes" "$@" - '' - }/bin:$PATH + PATH=${pkgs.writeShellScriptBin "nix" '' + ${pkgs.nixFlakes}/bin/nix --experimental-features "nix-command flakes" "$@" + ''}/bin:$PATH ''; } - diff --git a/systems/desktop-vm/default.nix b/systems/desktop-vm/default.nix index c5f81a2..1e5b468 100644 --- a/systems/desktop-vm/default.nix +++ b/systems/desktop-vm/default.nix @@ -1,7 +1,12 @@ { hostname }: -{ config, inputs, ... }: { - boot.initrd.availableKernelModules = - [ "ata_piix" "ohci_pci" "sd_mod" "sr_mod" ]; +{ config, inputs, ... }: +{ + boot.initrd.availableKernelModules = [ + "ata_piix" + "ohci_pci" + "sd_mod" + "sr_mod" + ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ ]; boot.extraModulePackages = [ ]; @@ -22,7 +27,7 @@ interfaces.enp0s3.useDHCP = true; }; - swapDevices = [{ device = "/dev/disk/by-label/swap"; }]; + swapDevices = [ { device = "/dev/disk/by-label/swap"; } ]; users.users.${config.az-username} = { openssh.authorizedKeys.keys = [ @@ -30,10 +35,11 @@ ]; }; profiles.az-desktop.enable = true; - programs = { az-distrobox.enable = true; }; + programs = { + az-distrobox.enable = true; + }; services = { az-virtualbox-guest.enable = true; az-x86.enable = true; }; } - diff --git a/systems/git/default.nix b/systems/git/default.nix index df9cd0f..caa9d32 100644 --- a/systems/git/default.nix +++ b/systems/git/default.nix @@ -1,7 +1,9 @@ { hostname }: { inputs, pkgs, ... }: -let domain = "git.2li.ch"; -in { +let + domain = "git.2li.ch"; +in +{ hardware = { az-raspi4-ethernet = { enable = true; diff --git a/systems/gwyn/default.nix b/systems/gwyn/default.nix index 89f1e70..ad7eec5 100644 --- a/systems/gwyn/default.nix +++ b/systems/gwyn/default.nix @@ -1,5 +1,11 @@ { hostname }: -{ inputs, lib, pkgs, ... }: { +{ + inputs, + lib, + pkgs, + ... +}: +{ imports = [ inputs.nixos-hardware.nixosModules.dell-precision-5530 inputs.nixos-hardware.nixosModules.common-gpu-nvidia @@ -19,7 +25,10 @@ ]; boot.initrd.kernelModules = [ "dm-snapshot" ]; - boot.kernelModules = [ "kvm-intel" "sg" ]; + boot.kernelModules = [ + "kvm-intel" + "sg" + ]; boot.extraModulePackages = [ ]; boot.kernelParams = [ "ip=dhcp" # required for ssh at initrd @@ -32,8 +41,16 @@ # Required to build aarch64 packages boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; - boot.supportedFilesystems = - [ "apfs" "exfat" "ext4" "nfs" "nfs4" "ntfs" "cifs" "f2fs" ]; + boot.supportedFilesystems = [ + "apfs" + "exfat" + "ext4" + "nfs" + "nfs4" + "ntfs" + "cifs" + "f2fs" + ]; fileSystems."/" = { device = "/dev/disk/by-label/nixos"; @@ -46,7 +63,7 @@ networking.hostName = hostname; - swapDevices = [{ device = "/dev/disk/by-label/swap"; }]; + swapDevices = [ { device = "/dev/disk/by-label/swap"; } ]; hardware = { az-bluetooth.enable = true; @@ -75,4 +92,3 @@ virtualisation.virtualbox.host.enable = true; } - diff --git a/systems/loki-test/default.nix b/systems/loki-test/default.nix index b02b2a6..dcd3988 100644 --- a/systems/loki-test/default.nix +++ b/systems/loki-test/default.nix @@ -1,5 +1,6 @@ { hostname }: -{ inputs, pkgs, ... }: { +{ inputs, pkgs, ... }: +{ hardware = { az-raspi4-ethernet = { enable = true; diff --git a/systems/mail/default.nix b/systems/mail/default.nix index 095f7f8..199ce3c 100644 --- a/systems/mail/default.nix +++ b/systems/mail/default.nix @@ -1,5 +1,6 @@ { hostname }: -{ inputs, pkgs, ... }: { +{ inputs, pkgs, ... }: +{ hardware = { az-raspi4-ethernet = { enable = true; @@ -22,4 +23,3 @@ }; }; } - diff --git a/systems/management/default.nix b/systems/management/default.nix index 5788e10..ae7cd36 100644 --- a/systems/management/default.nix +++ b/systems/management/default.nix @@ -1,5 +1,6 @@ { hostname }: -{ inputs, ... }: { +{ inputs, ... }: +{ hardware = { az-raspi4-ethernet = { enable = true; @@ -24,5 +25,4 @@ az-nix-direnv.enable = true; az-restic-management.enable = true; }; - } diff --git a/systems/mobile/default.nix b/systems/mobile/default.nix index b9a0d36..4eae65f 100644 --- a/systems/mobile/default.nix +++ b/systems/mobile/default.nix @@ -1,5 +1,11 @@ { hostname }: -{ inputs, lib, pkgs, ... }: { +{ + inputs, + lib, + pkgs, + ... +}: +{ hardware = { az-raspi4-usb = { enable = true; @@ -8,5 +14,7 @@ }; }; - programs = { az-nix-direnv.enable = true; }; + programs = { + az-nix-direnv.enable = true; + }; } diff --git a/systems/nextcloud/default.nix b/systems/nextcloud/default.nix index fb71fcc..b18bf67 100644 --- a/systems/nextcloud/default.nix +++ b/systems/nextcloud/default.nix @@ -1,5 +1,6 @@ { hostname }: -{ inputs, pkgs, ... }: { +{ inputs, pkgs, ... }: +{ hardware = { az-raspi4-ethernet = { enable = true; diff --git a/systems/plex/default.nix b/systems/plex/default.nix index cf409c8..14a8b1c 100644 --- a/systems/plex/default.nix +++ b/systems/plex/default.nix @@ -1,5 +1,6 @@ { hostname }: -{ inputs, pkgs, ... }: { +{ inputs, pkgs, ... }: +{ hardware = { az-raspi4-ethernet = { enable = true; diff --git a/systems/proxy/default.nix b/systems/proxy/default.nix index 90bbe6e..3e2f2e0 100644 --- a/systems/proxy/default.nix +++ b/systems/proxy/default.nix @@ -1,5 +1,6 @@ { hostname }: -{ inputs, pkgs, ... }: { +{ inputs, pkgs, ... }: +{ hardware = { az-raspi4-ethernet = { enable = true; @@ -48,11 +49,13 @@ serverAliases = [ "www.2li.ch" ]; enableACME = true; forceSSL = true; - listen = [{ - port = 4433; - addr = "127.0.0.1"; - ssl = true; - }]; + listen = [ + { + port = 4433; + addr = "127.0.0.1"; + ssl = true; + } + ]; locations."/" = { proxyPass = "http://127.0.0.1:8080"; proxyWebsockets = true; # needed if you need to use WebSocket @@ -61,11 +64,13 @@ "heimdall.2li.ch" = { enableACME = true; forceSSL = true; - listen = [{ - port = 4433; - addr = "127.0.0.1"; - ssl = true; - }]; + listen = [ + { + port = 4433; + addr = "127.0.0.1"; + ssl = true; + } + ]; locations."/" = { proxyPass = "http://127.0.0.1:8081"; proxyWebsockets = true; # needed if you need to use WebSocket diff --git a/systems/restic-server/default.nix b/systems/restic-server/default.nix index 033c071..994437b 100644 --- a/systems/restic-server/default.nix +++ b/systems/restic-server/default.nix @@ -1,5 +1,6 @@ { hostname }: -{ inputs, pkgs, ... }: { +{ inputs, pkgs, ... }: +{ hardware = { az-raspi4-ethernet = { enable = true; @@ -7,5 +8,7 @@ ip = "10.7.89.30"; }; }; - services = { az-restic-server.enable = true; }; + services = { + az-restic-server.enable = true; + }; } diff --git a/systems/staubfinger/default.nix b/systems/staubfinger/default.nix index 617e9be..33afdb0 100644 --- a/systems/staubfinger/default.nix +++ b/systems/staubfinger/default.nix @@ -1,12 +1,19 @@ { hostname }: -{ inputs, ... }: { +{ inputs, ... }: +{ imports = [ inputs.nixos-hardware.nixosModules.common-gpu-intel inputs.nixos-hardware.nixosModules.common-pc-laptop inputs.nixos-hardware.nixosModules.common-pc-laptop-ssd ]; - boot.initrd.availableKernelModules = - [ "aesni_intel" "ahci" "cryptd" "sd_mod" "usb_storage" "xhci_pci" ]; + boot.initrd.availableKernelModules = [ + "aesni_intel" + "ahci" + "cryptd" + "sd_mod" + "usb_storage" + "xhci_pci" + ]; boot.initrd.kernelModules = [ "dm-snapshot" ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; @@ -24,8 +31,16 @@ ]; boot.loader.efi.efiSysMountPoint = "/boot/efi"; - boot.supportedFilesystems = - [ "apfs" "exfat" "ext4" "nfs" "nfs4" "ntfs" "cifs" "f2fs" ]; + boot.supportedFilesystems = [ + "apfs" + "exfat" + "ext4" + "nfs" + "nfs4" + "ntfs" + "cifs" + "f2fs" + ]; fileSystems."/" = { device = "/dev/disk/by-uuid/5d2e0ae2-8604-4921-b8b7-731358220a0f"; @@ -38,8 +53,7 @@ networking.hostName = hostname; - swapDevices = - [{ device = "/dev/disk/by-uuid/17a8bd01-095b-41ae-8b90-ecc70ab7b7eb"; }]; + swapDevices = [ { device = "/dev/disk/by-uuid/17a8bd01-095b-41ae-8b90-ecc70ab7b7eb"; } ]; hardware = { az-bluetooth.enable = true; @@ -60,4 +74,3 @@ }; virtualisation.virtualbox.host.enable = true; } - diff --git a/systems/test-raspi/default.nix b/systems/test-raspi/default.nix index cc6acc2..f670e11 100644 --- a/systems/test-raspi/default.nix +++ b/systems/test-raspi/default.nix @@ -1,5 +1,6 @@ { hostname }: -{ inputs, pkgs, ... }: { +{ inputs, pkgs, ... }: +{ hardware = { az-raspi4-ethernet = { enable = true; @@ -9,5 +10,7 @@ }; services.az-docker.enable = true; - programs = { az-nix-direnv.enable = true; }; + programs = { + az-nix-direnv.enable = true; + }; } diff --git a/systems/ttrss/default.nix b/systems/ttrss/default.nix index 6c20de0..829387a 100644 --- a/systems/ttrss/default.nix +++ b/systems/ttrss/default.nix @@ -1,5 +1,11 @@ { hostname }: -{ config, inputs, pkgs, ... }: { +{ + config, + inputs, + pkgs, + ... +}: +{ hardware = { az-raspi4-ethernet = { enable = true;