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/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 ++- 7 files changed, 16 insertions(+), 8 deletions(-) (limited to 'home/wm') 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; -- cgit 1.4.1