From 63c3e235f64d857e803fe1f7de823d7a5141a132 Mon Sep 17 00:00:00 2001 From: Erwin Boskma Date: Wed, 5 Oct 2022 11:32:13 +0200 Subject: [PATCH] Run `statix fix` --- flake.nix | 2 +- home-manager/modules/rclone/default.nix | 4 ++-- home-manager/modules/sway/default.nix | 2 +- modules/libvirtd/default.nix | 2 +- modules/nix-serve/default.nix | 2 +- modules/tablet/default.nix | 2 +- modules/wireguard/default.nix | 2 +- users/builder/default.nix | 2 +- users/erwin/default.nix | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/flake.nix b/flake.nix index 2cf7354..96ca673 100644 --- a/flake.nix +++ b/flake.nix @@ -11,7 +11,7 @@ flake-utils.url = "github:numtide/flake-utils"; - nixos-hardware.url = github:NixOS/nixos-hardware; + nixos-hardware.url = "github:NixOS/nixos-hardware"; nixos-generators = { url = "github:nix-community/nixos-generators"; diff --git a/home-manager/modules/rclone/default.nix b/home-manager/modules/rclone/default.nix index d7e4a9b..1b4ba93 100644 --- a/home-manager/modules/rclone/default.nix +++ b/home-manager/modules/rclone/default.nix @@ -41,7 +41,7 @@ in }; }; - config = mkIf (cfg.enable) { + config = mkIf cfg.enable { home.packages = [ pkgs.rclone ]; systemd.user.services = builtins.listToAttrs (builtins.map @@ -56,7 +56,7 @@ in Unit = { Description = "rclone mount ${unitName}"; After = [ "network.target" ]; - AssertPathIsDirectory = (toString mount.local); + AssertPathIsDirectory = toString mount.local; }; Service = { diff --git a/home-manager/modules/sway/default.nix b/home-manager/modules/sway/default.nix index da71f88..7dc0950 100644 --- a/home-manager/modules/sway/default.nix +++ b/home-manager/modules/sway/default.nix @@ -189,7 +189,7 @@ in "${mod}+l" = "exec ${swaylockcmd}"; "${mod}+p" = "mode resize"; - "${mod}+c" = mkIf (config.eboskma.programs.emacs.enable) "exec ${config.eboskma.programs.emacs.package}/bin/emacsclient -c"; + "${mod}+c" = mkIf config.eboskma.programs.emacs.enable "exec ${config.eboskma.programs.emacs.package}/bin/emacsclient -c"; "${mod}+Print" = "exec ${pkgs.grim}/bin/grim -o $(${pkgs.sway}/bin/swaymsg -t get_outputs | ${pkgs.jq}/bin/jq -r '.[] | select(.focused) | .name')"; "${mod}+Shift+Print" = "exec ${pkgs.grim}/bin/grim -o $(${pkgs.sway}/bin/swaymsg -t get_outputs | ${pkgs.jq}/bin/jq -r '.[] | select(.focused) | .name') - | ${pkgs.wl-clipboard}/bin/wl-copy -t \"image/png\" -f"; diff --git a/modules/libvirtd/default.nix b/modules/libvirtd/default.nix index f09ff9c..de2710b 100644 --- a/modules/libvirtd/default.nix +++ b/modules/libvirtd/default.nix @@ -6,7 +6,7 @@ in { options.eboskma.libvirtd = { enable = mkEnableOption "libvirtd"; }; - config = mkIf (cfg.enable) { + config = mkIf cfg.enable { virtualisation.libvirtd = { enable = true; allowedBridges = [ "br0" ]; diff --git a/modules/nix-serve/default.nix b/modules/nix-serve/default.nix index 3178dc8..e03f8cc 100644 --- a/modules/nix-serve/default.nix +++ b/modules/nix-serve/default.nix @@ -6,7 +6,7 @@ in { options.eboskma.nix-serve = { enable = mkEnableOption "nix-serve"; }; - config = mkIf (cfg.enable) { + config = mkIf cfg.enable { services.nix-serve = { enable = true; secretKeyFile = "/var/cache-priv-key.pem"; diff --git a/modules/tablet/default.nix b/modules/tablet/default.nix index 862b4e0..b5f23f1 100644 --- a/modules/tablet/default.nix +++ b/modules/tablet/default.nix @@ -6,7 +6,7 @@ in { options.eboskma.tablet = { enable = mkEnableOption "tablet"; }; - config = mkIf (cfg.enable) { + config = mkIf cfg.enable { hardware.opentabletdriver = { enable = true; daemon.enable = true; diff --git a/modules/wireguard/default.nix b/modules/wireguard/default.nix index 1078b60..969b20a 100644 --- a/modules/wireguard/default.nix +++ b/modules/wireguard/default.nix @@ -67,7 +67,7 @@ in }; }; - config = mkIf (cfg.enable) { + config = mkIf cfg.enable { networking = { nat = { enable = true; diff --git a/users/builder/default.nix b/users/builder/default.nix index 9947157..6248a7f 100644 --- a/users/builder/default.nix +++ b/users/builder/default.nix @@ -8,7 +8,7 @@ in { options.eboskma.users.builder = { enable = mkEnableOption "builder"; }; - config = mkIf (cfg.enable) { + config = mkIf cfg.enable { users.users.builder = { isSystemUser = true; group = "builder"; diff --git a/users/erwin/default.nix b/users/erwin/default.nix index 184b124..2ef2099 100644 --- a/users/erwin/default.nix +++ b/users/erwin/default.nix @@ -8,7 +8,7 @@ in imports = [ ./desktop.nix ]; - config = mkIf (cfg.enable) { + config = mkIf cfg.enable { users.users.erwin = { isNormalUser = true;