From 98e01cdbfa047a32c1beb73438c5b93ca0592978 Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Fri, 10 Jun 2022 11:42:32 -0700 Subject: fix(fmt): correct formatting for all nix files This was done by running `nixpkgs-fmt .'. Change-Id: I4ea6c1e759bf468d08074be2111cbc7af72df295 Reviewed-on: https://cl.fcuny.net/c/world/+/404 Tested-by: CI Reviewed-by: Franck Cuny --- home/beets/default.nix | 3 ++- home/bluetooth/default.nix | 3 ++- home/direnv/default.nix | 3 ++- home/drone-cli/default.nix | 3 ++- home/element/default.nix | 3 ++- home/emacs/default.nix | 3 ++- home/eog/default.nix | 3 ++- home/evince/default.nix | 3 ++- home/feh/default.nix | 3 ++- home/firefox/default.nix | 3 ++- home/fish/default.nix | 3 ++- home/flac/default.nix | 3 ++- home/gcloud/default.nix | 3 ++- home/git/default.nix | 3 ++- home/go/default.nix | 3 ++- home/gpg/default.nix | 3 ++- home/gtk/default.nix | 3 ++- home/mail/accounts/default.nix | 3 ++- home/mail/default.nix | 3 ++- home/mpv/default.nix | 3 ++- home/packages/default.nix | 3 ++- home/pass/default.nix | 3 ++- home/pcmanfm/default.nix | 3 ++- home/python/default.nix | 3 ++- home/scanner/default.nix | 3 ++- home/scripts/perf-flamegraph.nix | 3 ++- home/seahorse/default.nix | 3 ++- home/ssh/default.nix | 3 ++- home/sublime-music/default.nix | 3 ++- home/terminal/alacritty/default.nix | 3 ++- home/terminal/default.nix | 3 ++- home/tmux/default.nix | 3 ++- home/transmission-remote/default.nix | 3 ++- home/vlc/default.nix | 3 ++- home/wm/default.nix | 6 ++++-- home/wm/gammastep/default.nix | 3 ++- home/wm/mako/default.nix | 3 ++- home/wm/sway/default.nix | 3 ++- home/wm/swaylock/default.nix | 3 ++- home/wm/waybar/default.nix | 3 ++- home/wm/wofi/default.nix | 3 ++- home/xdg/default.nix | 3 ++- home/yt-dlp/default.nix | 3 ++- home/zsh/default.nix | 3 ++- 44 files changed, 90 insertions(+), 45 deletions(-) (limited to 'home') diff --git a/home/beets/default.nix b/home/beets/default.nix index 617ff62..c88fd85 100644 --- a/home/beets/default.nix +++ b/home/beets/default.nix @@ -1,6 +1,7 @@ { config, lib, pkgs, ... }: let cfg = config.my.home.beets; -in { +in +{ options.my.home.beets = with lib; { enable = mkEnableOption "beets configuration"; musicDirectory = mkOption { diff --git a/home/bluetooth/default.nix b/home/bluetooth/default.nix index 51ecc4a..d0febca 100644 --- a/home/bluetooth/default.nix +++ b/home/bluetooth/default.nix @@ -1,6 +1,7 @@ { config, lib, ... }: let cfg = config.my.home.bluetooth; -in { +in +{ options.my.home.bluetooth = with lib; { enable = mkEnableOption "bluetooth configuration"; }; diff --git a/home/direnv/default.nix b/home/direnv/default.nix index 26e99f2..f36a66c 100644 --- a/home/direnv/default.nix +++ b/home/direnv/default.nix @@ -2,7 +2,8 @@ let cfg = config.my.home.direnv; fishEnabled = config.my.home.fish.enable; -in { +in +{ options.my.home.direnv = with lib; { enable = mkEnableOption "direnv configuration"; }; diff --git a/home/drone-cli/default.nix b/home/drone-cli/default.nix index 9eeb2e1..948e88a 100644 --- a/home/drone-cli/default.nix +++ b/home/drone-cli/default.nix @@ -1,6 +1,7 @@ { config, lib, pkgs, ... }: let cfg = config.my.home.drone-cli; -in { +in +{ options.my.home.drone-cli = with lib; { enable = mkEnableOption "drone-cli configuration"; }; diff --git a/home/element/default.nix b/home/element/default.nix index 3fcb50e..30021e1 100644 --- a/home/element/default.nix +++ b/home/element/default.nix @@ -1,6 +1,7 @@ { lib, config, pkgs, ... }: let cfg = config.my.home.element; -in { +in +{ options.my.home.element = with lib; { enable = mkEnableOption "element configuration"; }; diff --git a/home/emacs/default.nix b/home/emacs/default.nix index faac80d..4ea337e 100644 --- a/home/emacs/default.nix +++ b/home/emacs/default.nix @@ -1,6 +1,7 @@ { lib, config, pkgs, ... }: let cfg = config.my.home.emacs; -in { +in +{ options.my.home.emacs = with lib; { enable = mkEnableOption "emacs configuration"; }; diff --git a/home/eog/default.nix b/home/eog/default.nix index c7f784b..1fa1108 100644 --- a/home/eog/default.nix +++ b/home/eog/default.nix @@ -1,6 +1,7 @@ { lib, config, pkgs, ... }: let cfg = config.my.home.eog; -in { +in +{ options.my.home.eog = with lib; { enable = mkEnableOption "eog configuration"; }; diff --git a/home/evince/default.nix b/home/evince/default.nix index 16abc57..36dc1dd 100644 --- a/home/evince/default.nix +++ b/home/evince/default.nix @@ -1,6 +1,7 @@ { lib, config, pkgs, ... }: let cfg = config.my.home.evince; -in { +in +{ options.my.home.evince = with lib; { enable = mkEnableOption "evince configuration"; }; diff --git a/home/feh/default.nix b/home/feh/default.nix index 0032252..eda4466 100644 --- a/home/feh/default.nix +++ b/home/feh/default.nix @@ -1,6 +1,7 @@ { config, lib, ... }: let cfg = config.my.home.feh; -in { +in +{ options.my.home.feh = with lib; { enable = mkEnableOption "feh configuration"; }; diff --git a/home/firefox/default.nix b/home/firefox/default.nix index 7b6485d..15677b8 100644 --- a/home/firefox/default.nix +++ b/home/firefox/default.nix @@ -1,6 +1,7 @@ { config, lib, pkgs, ... }: let cfg = config.my.home.firefox; -in { +in +{ options.my.home.firefox = with lib; { enable = mkEnableOption "firefox configuration"; }; diff --git a/home/fish/default.nix b/home/fish/default.nix index 85ff30d..7ff4bbe 100644 --- a/home/fish/default.nix +++ b/home/fish/default.nix @@ -2,7 +2,8 @@ let cfg = config.my.home.fish; swayEnabled = config.my.home.wm.windowManager == "sway"; -in { +in +{ options.my.home.fish = with lib; { enable = mkEnableOption "fish configuration"; }; diff --git a/home/flac/default.nix b/home/flac/default.nix index 137d353..42500af 100644 --- a/home/flac/default.nix +++ b/home/flac/default.nix @@ -1,6 +1,7 @@ { config, lib, pkgs, ... }: let cfg = config.my.home.flac; -in { +in +{ options.my.home.flac = with lib; { enable = mkEnableOption "flac configuration"; }; diff --git a/home/gcloud/default.nix b/home/gcloud/default.nix index 0f6262b..f886586 100644 --- a/home/gcloud/default.nix +++ b/home/gcloud/default.nix @@ -1,6 +1,7 @@ { config, lib, pkgs, ... }: let cfg = config.my.home.gcloud; -in { +in +{ options.my.home.gcloud = with lib; { enable = mkEnableOption "google cloud sdk"; }; diff --git a/home/git/default.nix b/home/git/default.nix index 0d99e69..8043b7b 100644 --- a/home/git/default.nix +++ b/home/git/default.nix @@ -1,7 +1,8 @@ { lib, config, ... }: let cfg = config.my.home.git; -in { +in +{ options.my.home.git = with lib; { enable = mkEnableOption "git configuration"; }; diff --git a/home/go/default.nix b/home/go/default.nix index 24748d0..4cc15ef 100644 --- a/home/go/default.nix +++ b/home/go/default.nix @@ -1,6 +1,7 @@ { lib, config, ... }: let cfg = config.my.home.go; -in { +in +{ options.my.home.go = with lib; { enable = mkEnableOption "go configuration"; }; diff --git a/home/gpg/default.nix b/home/gpg/default.nix index d96c3aa..c3bcd50 100644 --- a/home/gpg/default.nix +++ b/home/gpg/default.nix @@ -1,6 +1,7 @@ { config, lib, ... }: let cfg = config.my.home.gpg; -in { +in +{ options.my.home.gpg = with lib; { enable = mkEnableOption "gpg configuration"; pinentry = mkOption { diff --git a/home/gtk/default.nix b/home/gtk/default.nix index 0dd62cb..4c55f0c 100644 --- a/home/gtk/default.nix +++ b/home/gtk/default.nix @@ -1,6 +1,7 @@ { config, lib, pkgs, ... }: let cfg = config.my.home.gtk; -in { +in +{ options.my.home.gtk = with lib; { enable = mkEnableOption "GTK configuration"; }; diff --git a/home/mail/accounts/default.nix b/home/mail/accounts/default.nix index 1bc1c37..83358f0 100644 --- a/home/mail/accounts/default.nix +++ b/home/mail/accounts/default.nix @@ -1,6 +1,7 @@ { config, lib, pkgs, ... }: let cfg = config.my.home.mail; -in { +in +{ config = lib.mkIf cfg.enable { accounts.email = { accounts = { diff --git a/home/mail/default.nix b/home/mail/default.nix index 4f36e87..88cae37 100644 --- a/home/mail/default.nix +++ b/home/mail/default.nix @@ -2,7 +2,8 @@ let cfg = config.my.home.mail; mkRelatedOption = desc: lib.mkEnableOption desc // { default = cfg.enable; }; -in { +in +{ imports = [ ./accounts ]; options.my.home.mail = with lib; { enable = mkEnableOption "email configuration"; diff --git a/home/mpv/default.nix b/home/mpv/default.nix index b6c2c60..380ce69 100644 --- a/home/mpv/default.nix +++ b/home/mpv/default.nix @@ -1,6 +1,7 @@ { lib, config, pkgs, ... }: let cfg = config.my.home.mpv; -in { +in +{ options.my.home.mpv = with lib; { enable = mkEnableOption "mpv configuration"; }; diff --git a/home/packages/default.nix b/home/packages/default.nix index 806ce31..e6dac4c 100644 --- a/home/packages/default.nix +++ b/home/packages/default.nix @@ -1,6 +1,7 @@ { config, lib, pkgs, ... }: let cfg = config.my.home.packages; -in { +in +{ options.my.home.packages = with lib; { enable = mkEnableOption "user packages"; additionalPackages = mkOption { diff --git a/home/pass/default.nix b/home/pass/default.nix index 3ea7892..d79d486 100644 --- a/home/pass/default.nix +++ b/home/pass/default.nix @@ -1,6 +1,7 @@ { config, lib, pkgs, ... }: let cfg = config.my.home.pass; -in { +in +{ options.my.home.pass = with lib; { enable = mkEnableOption "pass configuration"; }; diff --git a/home/pcmanfm/default.nix b/home/pcmanfm/default.nix index cca8f9a..2babf0c 100644 --- a/home/pcmanfm/default.nix +++ b/home/pcmanfm/default.nix @@ -1,6 +1,7 @@ { lib, config, pkgs, ... }: let cfg = config.my.home.pcmanfm; -in { +in +{ options.my.home.pcmanfm = with lib; { enable = mkEnableOption "pcmanfm configuration"; }; diff --git a/home/python/default.nix b/home/python/default.nix index b34f978..9e72569 100644 --- a/home/python/default.nix +++ b/home/python/default.nix @@ -1,6 +1,7 @@ { config, pkgs, lib, ... }: let cfg = config.my.home.python; -in { +in +{ options.my.home.python = with lib; { enable = mkEnableOption "python configuration"; }; diff --git a/home/scanner/default.nix b/home/scanner/default.nix index aa3da7c..fefbd54 100644 --- a/home/scanner/default.nix +++ b/home/scanner/default.nix @@ -1,6 +1,7 @@ { config, lib, pkgs, ... }: let cfg = config.my.home.scanner; -in { +in +{ options.my.home.scanner = with lib; { enable = mkEnableOption "scanner configuration"; }; diff --git a/home/scripts/perf-flamegraph.nix b/home/scripts/perf-flamegraph.nix index f379591..b974e6b 100644 --- a/home/scripts/perf-flamegraph.nix +++ b/home/scripts/perf-flamegraph.nix @@ -14,7 +14,8 @@ let | ${pkgs.flamegraph}/bin/stackcollapse-perf.pl \ | ${pkgs.flamegraph}/bin/flamegraph.pl > "''${OUT_SVG}" ''; -in { +in +{ config = { home.packages = with pkgs; [ flamegraph perf-flamegraph-process ]; }; diff --git a/home/seahorse/default.nix b/home/seahorse/default.nix index 54688a1..d37395e 100644 --- a/home/seahorse/default.nix +++ b/home/seahorse/default.nix @@ -1,6 +1,7 @@ { lib, config, pkgs, ... }: let cfg = config.my.home.seahorse; -in { +in +{ options.my.home.seahorse = with lib; { enable = mkEnableOption "seahorse configuration"; }; diff --git a/home/ssh/default.nix b/home/ssh/default.nix index 1088e80..eecca99 100644 --- a/home/ssh/default.nix +++ b/home/ssh/default.nix @@ -1,6 +1,7 @@ { config, lib, ... }: let cfg = config.my.home.ssh; -in { +in +{ options.my.home.ssh = with lib; { enable = mkEnableOption "ssh configuration"; }; diff --git a/home/sublime-music/default.nix b/home/sublime-music/default.nix index fad10ac..aa44520 100644 --- a/home/sublime-music/default.nix +++ b/home/sublime-music/default.nix @@ -1,6 +1,7 @@ { lib, config, pkgs, ... }: let cfg = config.my.home.sublime-music; -in { +in +{ options.my.home.sublime-music = with lib; { enable = mkEnableOption "sublime-music configuration"; }; diff --git a/home/terminal/alacritty/default.nix b/home/terminal/alacritty/default.nix index 2bcd041..85d8e4a 100644 --- a/home/terminal/alacritty/default.nix +++ b/home/terminal/alacritty/default.nix @@ -1,6 +1,7 @@ { config, lib, pkgs, ... }: let cfg = config.my.home.terminal; -in { +in +{ config = lib.mkIf (cfg.program == "alacritty") { programs.alacritty = { enable = true; diff --git a/home/terminal/default.nix b/home/terminal/default.nix index e1ff0d7..68dcf4b 100644 --- a/home/terminal/default.nix +++ b/home/terminal/default.nix @@ -1,6 +1,7 @@ { config, lib, ... }: let cfg = config.my.home.terminal; -in { +in +{ imports = [ ./alacritty ]; options.my.home = with lib; { terminal = { diff --git a/home/tmux/default.nix b/home/tmux/default.nix index 499a64b..a30bd28 100644 --- a/home/tmux/default.nix +++ b/home/tmux/default.nix @@ -1,6 +1,7 @@ { config, lib, pkgs, ... }: let cfg = config.my.home.tmux; -in { +in +{ options.my.home.tmux = with lib; { enable = mkEnableOption "tmux terminal multiplexer"; }; diff --git a/home/transmission-remote/default.nix b/home/transmission-remote/default.nix index 29c070b..629e382 100644 --- a/home/transmission-remote/default.nix +++ b/home/transmission-remote/default.nix @@ -1,6 +1,7 @@ { lib, config, pkgs, ... }: let cfg = config.my.home.transmission-remote; -in { +in +{ options.my.home.transmission-remote = with lib; { enable = mkEnableOption "transmission-remote configuration"; }; diff --git a/home/vlc/default.nix b/home/vlc/default.nix index f7ad141..c06994b 100644 --- a/home/vlc/default.nix +++ b/home/vlc/default.nix @@ -1,6 +1,7 @@ { lib, config, pkgs, ... }: let cfg = config.my.home.vlc; -in { +in +{ options.my.home.vlc = with lib; { enable = mkEnableOption "vlc configuration"; }; diff --git a/home/wm/default.nix b/home/wm/default.nix index 27a8bf4..0125dd1 100644 --- a/home/wm/default.nix +++ b/home/wm/default.nix @@ -2,10 +2,12 @@ let mkRelatedOption = description: relatedWMs: let isActivatedWm = wm: config.my.home.wm.windowManager == wm; - in (lib.mkEnableOption description) // { + in + (lib.mkEnableOption description) // { default = builtins.any isActivatedWm relatedWMs; }; -in { +in +{ imports = [ ./sway ./waybar ./mako ./swaylock ./wofi ./gammastep ]; options.my.home.wm = with lib; { windowManager = mkOption { diff --git a/home/wm/gammastep/default.nix b/home/wm/gammastep/default.nix index 0a9c684..4530126 100644 --- a/home/wm/gammastep/default.nix +++ b/home/wm/gammastep/default.nix @@ -1,6 +1,7 @@ { config, lib, pkgs, ... }: let isEnabled = config.my.home.wm.windowManager == "sway"; -in { +in +{ config = lib.mkIf isEnabled { services.gammastep = { enable = true; diff --git a/home/wm/mako/default.nix b/home/wm/mako/default.nix index 3a13620..665707d 100644 --- a/home/wm/mako/default.nix +++ b/home/wm/mako/default.nix @@ -1,6 +1,7 @@ { config, lib, pkgs, ... }: let isEnabled = config.my.home.wm.windowManager == "sway"; -in { +in +{ config = lib.mkIf isEnabled { home.packages = [ pkgs.libnotify # to send notifications diff --git a/home/wm/sway/default.nix b/home/wm/sway/default.nix index ba70992..d3b758d 100644 --- a/home/wm/sway/default.nix +++ b/home/wm/sway/default.nix @@ -3,7 +3,8 @@ let isEnabled = config.my.home.wm.windowManager == "sway"; terminal = config.my.home.terminal.program; modifier = "Mod4"; # `Super` key -in { +in +{ config = lib.mkIf isEnabled { home.packages = with pkgs; [ wlogout diff --git a/home/wm/swaylock/default.nix b/home/wm/swaylock/default.nix index 3df802a..803a7c3 100644 --- a/home/wm/swaylock/default.nix +++ b/home/wm/swaylock/default.nix @@ -1,6 +1,7 @@ { config, lib, pkgs, ... }: let isEnabled = config.my.home.wm.windowManager == "sway"; -in { +in +{ config = lib.mkIf isEnabled { xdg.configFile."swaylock/config" = { source = ./config; }; diff --git a/home/wm/waybar/default.nix b/home/wm/waybar/default.nix index c1bf601..1aab182 100644 --- a/home/wm/waybar/default.nix +++ b/home/wm/waybar/default.nix @@ -1,6 +1,7 @@ { config, lib, pkgs, ... }: let isEnabled = config.my.home.wm.windowManager == "sway"; -in { +in +{ config = lib.mkIf isEnabled { programs.waybar = { enable = true; diff --git a/home/wm/wofi/default.nix b/home/wm/wofi/default.nix index ad3c759..7f8a92b 100644 --- a/home/wm/wofi/default.nix +++ b/home/wm/wofi/default.nix @@ -1,6 +1,7 @@ { config, lib, pkgs, ... }: let isEnabled = config.my.home.wm.windowManager == "sway"; -in { +in +{ config = lib.mkIf isEnabled { home.packages = with pkgs; [ wofi ]; xdg.configFile."wofi/config".source = ./config; diff --git a/home/xdg/default.nix b/home/xdg/default.nix index 133b0ad..eda2211 100644 --- a/home/xdg/default.nix +++ b/home/xdg/default.nix @@ -1,6 +1,7 @@ { config, lib, pkgs, ... }: let cfg = config.my.home.xdg; -in { +in +{ options.my.home.xdg = with lib; { enable = mkEnableOption "XDG configuration"; }; diff --git a/home/yt-dlp/default.nix b/home/yt-dlp/default.nix index 4e9cdf4..4ac1fb9 100644 --- a/home/yt-dlp/default.nix +++ b/home/yt-dlp/default.nix @@ -1,6 +1,7 @@ { config, lib, pkgs, ... }: let cfg = config.my.home.yt-dlp; -in { +in +{ options.my.home.yt-dlp = with lib; { enable = mkEnableOption "yt-dlp configuration"; }; diff --git a/home/zsh/default.nix b/home/zsh/default.nix index 086c17e..21dbedd 100644 --- a/home/zsh/default.nix +++ b/home/zsh/default.nix @@ -1,6 +1,7 @@ { config, pkgs, lib, ... }: let cfg = config.my.home.zsh; -in { +in +{ options.my.home.zsh = with lib; { enable = mkEnableOption "zsh configuration"; }; -- cgit 1.4.1